cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-5607] Another minor fix
Date Thu, 25 Jun 2015 16:16:20 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 17f181fbd -> e681dda5b


[CXF-5607] Another minor fix


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

Branch: refs/heads/master
Commit: e681dda5bfd7d68ebf340a459ecf612e8a926290
Parents: 17f181f
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Jun 25 17:16:00 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Jun 25 17:16:00 2015 +0100

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/applicationContext.xml        | 10 ++++++++++
 .../cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e681dda5/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
index 9da7e37..b6498c6 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
@@ -137,8 +137,14 @@
            <ref bean="oidcRpService"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
+           <!--
            <ref bean="rpOidcRequestFilter"/>
+           -->
+           <ref bean="rpOidcTokenFilter"/>
+           <!--
            <bean class="org.apache.cxf.rs.security.oauth2.client.ClientTokenContextProvider"/>
+           -->
+           <bean class="org.apache.cxf.rs.security.oidc.rp.OidcIdTokenProvider"/>
         </jaxrs:providers>
         <jaxrs:features>
            <ref bean="loggingFeature"/>
@@ -156,6 +162,10 @@
          <property name="startUri" value="rp"/>
          <property name="completeUri" value="rp/complete"/>
      </bean>
+     <bean id="rpOidcTokenFilter" class="org.apache.cxf.rs.security.oidc.rp.OidcIdTokenRequestFilter">
+         <property name="idTokenValidator" ref="userInfoClient"/>
+         <property name="consumer" ref="consumer"/>
+     </bean>
           
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e681dda5/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
index 922a3d0..e7a6e64 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
@@ -29,7 +29,6 @@ import javax.ws.rs.core.Response;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.utils.FormUtils;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.rs.security.oauth2.client.ClientTokenContext;
 import org.apache.cxf.rs.security.oauth2.client.Consumer;
 import org.apache.cxf.rs.security.oidc.common.IdToken;
 
@@ -48,7 +47,7 @@ public class OidcIdTokenRequestFilter implements ContainerRequestFilter
{
         }
         
         IdToken idToken = idTokenValidator.getIdToken(idTokenParamValue, consumer.getKey());
-        JAXRSUtils.getCurrentMessage().setContent(ClientTokenContext.class, idToken);
+        JAXRSUtils.getCurrentMessage().setContent(IdToken.class, idToken);
         requestContext.setSecurityContext(new OidcSecurityContext(idToken));
         
     }


Mime
View raw message