Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D51B11832A for ; Wed, 24 Feb 2016 12:22:35 +0000 (UTC) Received: (qmail 85759 invoked by uid 500); 24 Feb 2016 12:22:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85697 invoked by uid 500); 24 Feb 2016 12:22:29 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 85688 invoked by uid 99); 24 Feb 2016 12:22:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2016 12:22:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53872E8EAF; Wed, 24 Feb 2016 12:22:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <48e1f88cd0594021b5064e74a4a5228d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Minor updates to the default UserInfo creation code Date: Wed, 24 Feb 2016 12:22:29 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 7044013ed -> 68808549f Minor updates to the default UserInfo creation code Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/68808549 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68808549 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68808549 Branch: refs/heads/master Commit: 68808549f2cd66868e7ea3d31583800bd332cb73 Parents: 7044013 Author: Sergey Beryozkin Authored: Wed Feb 24 12:22:15 2016 +0000 Committer: Sergey Beryozkin Committed: Wed Feb 24 12:22:15 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/oidc/idp/UserInfoService.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/68808549/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java index 5edf228..7c4ec07 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java @@ -83,6 +83,9 @@ public class UserInfoService extends OAuthServerJoseJwtProducer { userInfo.setIssuer(idToken.getIssuer()); userInfo.setAudience(idToken.getAudience()); } + if (idToken.getPreferredUserName() != null) { + userInfo.setPreferredUserName(idToken.getPreferredUserName()); + } if (idToken.getName() != null) { userInfo.setName(idToken.getName()); } @@ -95,6 +98,9 @@ public class UserInfoService extends OAuthServerJoseJwtProducer { if (idToken.getEmail() != null) { userInfo.setEmail(idToken.getEmail()); } + if (idToken.getNickName() != null) { + userInfo.setNickName(idToken.getNickName()); + } //etc return userInfo; }