cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf git commit: Fixing merge
Date Thu, 10 Dec 2015 17:07:24 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: b1fc5e49b0f1aa90e529ec473591e6ed735c44da
Parents: 808558f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Dec 10 17:07:07 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Dec 10 17:07:07 2015 +0000

----------------------------------------------------------------------
 .../rs/security/oidc/idp/IdTokenResponseFilter.java    | 13 ++-----------
 .../apache/cxf/rs/security/oidc/utils/OidcUtils.java   |  1 +
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b1fc5e49/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index 8f2ef01..2f4e371 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
@@ -33,21 +33,12 @@ public class IdTokenResponseFilter extends AbstractOAuthServerJoseJwtProducer
im
     private String issuer;
     @Override
     public void process(ClientAccessToken ct, ServerAccessToken st) {
-<<<<<<< HEAD
-        // This may also be done directly inside a data provider code creating the server
token
-=======
         // Only add an IdToken if the client has the "openid" scope
         if (ct.getApprovedScope() == null || !ct.getApprovedScope().contains(OidcUtils.OPENID_SCOPE))
{
             return;
         }
-        String idToken = getProcessedIdToken(st);
-        if (idToken != null) {
-            ct.getParameters().put(OidcUtils.ID_TOKEN, idToken);
-        } 
-        
-    }
-    private String getProcessedIdToken(ServerAccessToken st) {
->>>>>>> dc1a867... Only issue an IdToken if the client has the correct
scope (for OpenId)
+
+        // This may also be done directly inside a data provider code creating the server
token
         if (userInfoProvider != null) {
             IdToken token = 
                 userInfoProvider.getIdToken(st.getClient().getClientId(), st.getSubject(),
st.getScopes());

http://git-wip-us.apache.org/repos/asf/cxf/blob/b1fc5e49/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index 7ced717..7aa06a1 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -33,6 +33,7 @@ import org.apache.cxf.rt.security.crypto.MessageDigestUtils;
 
 public final class OidcUtils {
     public static final String ID_TOKEN = "id_token";
+    public static final String OPENID_SCOPE = "openid";
     public static final String OIDC_SCOPE = "oidc";
     public static final String PROFILE_SCOPE = "profile";
     public static final String EMAIL_SCOPE = "email";


Mime
View raw message