You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/02/24 13:22:29 UTC

cxf git commit: Minor updates to the default UserInfo creation code

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 <sb...@gmail.com>
Authored: Wed Feb 24 12:22:15 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
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;
     }