cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Making ClientTokenContextManager available on the current message and having OIDC authorization service keeping the super path in case the actual /login is managed by another endpoint
Date Fri, 20 Nov 2015 21:46:34 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c8f54d8c3 -> 60f95e5c0


Making ClientTokenContextManager available on the current message and having OIDC authorization
service keeping the super path in case the actual /login is managed by another endpoint


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

Branch: refs/heads/3.1.x-fixes
Commit: 60f95e5c0d928fd0b518bac1b89e20b9a12e09b3
Parents: c8f54d8
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Fri Nov 20 21:36:49 2015 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Fri Nov 20 21:46:15 2015 +0000

----------------------------------------------------------------------
 .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java   | 1 +
 .../cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java   | 3 ---
 .../org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/60f95e5c/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index f712ab6..b52e92b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -195,6 +195,7 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter
{
         ClientTokenContext tokenContext = initializeClientTokenContext(rc, at, state);
         if (at != null && clientTokenContextManager != null) {
             clientTokenContextManager.setClientTokenContext(mc, tokenContext);
+            JAXRSUtils.getCurrentMessage().setContent(ClientTokenContextManager.class, clientTokenContextManager);
         }
         setClientCodeRequest(tokenContext);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/60f95e5c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
index e1e7c3f..99fda9f 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
@@ -20,13 +20,10 @@ package org.apache.cxf.rs.security.oidc.idp;
 
 import java.util.List;
 
-import javax.ws.rs.Path;
-
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
 import org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
 
-@Path("/login")
 public class OidcAuthorizationCodeService extends AuthorizationCodeGrantService {
     private static final String OPEN_ID_CONNECT_SCOPE = "openid";
     private boolean skipAuthorizationWithOidcScope;

http://git-wip-us.apache.org/repos/asf/cxf/blob/60f95e5c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
index c6638e3..66e5e8b 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcImplicitService.java
@@ -22,13 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
-import javax.ws.rs.Path;
-
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
 import org.apache.cxf.rs.security.oauth2.services.ImplicitGrantService;
 
-@Path("/login")
+
 public class OidcImplicitService extends ImplicitGrantService {
     private static final String OPEN_ID_CONNECT_SCOPE = "openid";
     private static final String ID_TOKEN_RESPONSE_TYPE = "id_token";


Mime
View raw message