Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74C80188F6 for ; Wed, 16 Dec 2015 12:48:15 +0000 (UTC) Received: (qmail 64152 invoked by uid 500); 16 Dec 2015 12:48:15 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64087 invoked by uid 500); 16 Dec 2015 12:48:15 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 64078 invoked by uid 99); 16 Dec 2015 12:48:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2015 12:48:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06D7EE0498; Wed, 16 Dec 2015 12:48:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <9c98cdd8ff08425694cbf593b48fd81b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fixing OIDC RP endpoint and basic_oidc demo Date: Wed, 16 Dec 2015 12:48:14 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 33cff6267 -> 01926cb73 Fixing OIDC RP endpoint and basic_oidc demo Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01926cb7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01926cb7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01926cb7 Branch: refs/heads/master Commit: 01926cb7347eb87dc08c0589b78d2199010037b7 Parents: 33cff62 Author: Sergey Beryozkin Authored: Wed Dec 16 12:47:57 2015 +0000 Committer: Sergey Beryozkin Committed: Wed Dec 16 12:47:57 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/demo/jaxrs/server/IdTokenService.java | 10 +++++----- .../jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp | 8 ++++---- .../rs/security/oidc/rp/OidcRpAuthenticationService.java | 5 ++--- 3 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/01926cb7/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java index 2f1a313..785689d 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java +++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java @@ -25,21 +25,21 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.cxf.rs.security.oidc.common.IdToken; +import org.apache.cxf.rs.security.oidc.rp.IdTokenContext; @Path("/") public class IdTokenService { @POST @Path("/token") @Produces("text/html") - public Response getIdTokenFromForm(@Context IdToken idToken) { - return getIdToken(idToken); + public Response getIdTokenFromForm(@Context IdTokenContext idTokenContext) { + return getIdToken(idTokenContext); } @GET @Path("/token") @Produces("text/html") - public Response getIdToken(@Context IdToken idToken) { - return Response.ok(idToken).build(); + public Response getIdToken(@Context IdTokenContext idTokenContext) { + return Response.ok(idTokenContext.getIdToken()).build(); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/01926cb7/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp index 3791563..a3f9fe5 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp +++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/forms/idToken.jsp @@ -1,4 +1,4 @@ -<%@ page import="javax.servlet.http.HttpServletRequest, java.util.Map, org.apache.cxf.rs.security.oidc.common.IdToken" %> +<%@ page import="javax.servlet.http.HttpServletRequest, org.apache.cxf.rs.security.oidc.common.IdToken" %> <% IdToken token = (IdToken) request.getAttribute("data"); @@ -23,11 +23,11 @@ <% - for (Map.Entry entry : token.asMap().entrySet()) { + for (String key : token.asMap().keySet()) { %> - - + + <% } http://git-wip-us.apache.org/repos/asf/cxf/blob/01926cb7/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java index 93fdd1c..39c7b7b 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java @@ -32,7 +32,6 @@ import javax.ws.rs.core.UriBuilder; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.rs.security.oauth2.client.ClientTokenContextManager; -import org.apache.cxf.rs.security.oidc.common.IdToken; @Path("rp") public class OidcRpAuthenticationService { @@ -44,9 +43,9 @@ public class OidcRpAuthenticationService { @POST @Path("signin") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - public Response completeScriptAuthentication(@Context IdToken idToken) { + public Response completeScriptAuthentication(@Context IdTokenContext idTokenContext) { OidcClientTokenContextImpl ctx = new OidcClientTokenContextImpl(); - ctx.setIdToken(idToken); + ctx.setIdToken(idTokenContext.getIdToken()); return completeAuthentication(ctx); }
PropertyValue
<%= entry.getKey() %><%= entry.getValue().toString() %><%= key %><%= token.asMap().get(key).toString() %>