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 2015/12/07 13:41:02 UTC

cxf git commit: Adding subject copy constructors

Repository: cxf
Updated Branches:
  refs/heads/master ccca5534b -> ca69e7b43


Adding subject copy constructors


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ca69e7b4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca69e7b4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca69e7b4

Branch: refs/heads/master
Commit: ca69e7b437d1c30805377a94f771cf29743e5f57
Parents: ccca553
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Dec 7 12:40:42 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Dec 7 12:40:42 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/rs/security/oauth2/common/UserSubject.java   | 7 +++++++
 .../apache/cxf/rs/security/oidc/idp/OidcUserSubject.java    | 9 +++++++++
 2 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca69e7b4/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
index b3990c3..ec4f4b6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
@@ -64,6 +64,13 @@ public class UserSubject implements Serializable {
         this.roles = roles;
     }
     
+    public UserSubject(UserSubject sub) {
+        this(sub.getLogin(), sub.getId(), sub.getRoles());
+        this.properties = sub.getProperties();
+        this.am = sub.getAuthenticationMethod();
+        
+    }
+    
     /**
      * Return the user login name
      * @return the login name

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca69e7b4/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
index 6c9690b..d9dd955 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.java
@@ -25,6 +25,15 @@ public class OidcUserSubject extends UserSubject {
     
     private static final long serialVersionUID = 8806727177012442229L;
     private IdToken idToken;
+    
+    public OidcUserSubject() {
+        
+    }
+    
+    public OidcUserSubject(UserSubject sub) {
+        super(sub);
+    }
+    
     public IdToken getIdToken() {
         return idToken;
     }