Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1D1C200C41 for ; Fri, 24 Mar 2017 16:24:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B0475160B93; Fri, 24 Mar 2017 15:24:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2BC2160B82 for ; Fri, 24 Mar 2017 16:24:50 +0100 (CET) Received: (qmail 98985 invoked by uid 500); 24 Mar 2017 15:24:50 -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 98972 invoked by uid 99); 24 Mar 2017 15:24:50 -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; Fri, 24 Mar 2017 15:24:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E86DEDFF5A; Fri, 24 Mar 2017 15:24:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <8f0aa5c88e1749818b18f6b12dfa4ee3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf-fediz git commit: FEDIZ-195: propagate URI fragment on auth Date: Fri, 24 Mar 2017 15:24:49 +0000 (UTC) archived-at: Fri, 24 Mar 2017 15:24:51 -0000 Repository: cxf-fediz Updated Branches: refs/heads/master 4fee9ae12 -> 3c0a4c56d FEDIZ-195: propagate URI fragment on auth Updated OIDC and IDP JSP pages to propagate URI fragment on form POST. Signed-off-by: Colm O hEigeartaigh Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3c0a4c56 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3c0a4c56 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3c0a4c56 Branch: refs/heads/master Commit: 3c0a4c56dd92d92e9cc76a5e7e896097db1c8f84 Parents: 4fee9ae Author: gonzalad Authored: Thu Mar 23 18:58:39 2017 +0100 Committer: Colm O hEigeartaigh Committed: Fri Mar 24 15:10:47 2017 +0000 ---------------------------------------------------------------------- .../WEB-INF/views/samlsigninresponseform.jsp | 41 ++++++++++++++---- .../main/webapp/WEB-INF/views/signinform.jsp | 31 +++++++++++++- .../webapp/WEB-INF/views/signinresponseform.jsp | 45 +++++++++++++++----- .../WEB-INF/views/oAuthAuthorizationData.jsp | 24 ++++++++++- 4 files changed, 120 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp b/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp index 3e7dc36..fdb4eec 100644 --- a/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp +++ b/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp @@ -6,15 +6,40 @@ IDP SignIn Response Form - - + +

- - - + + + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp b/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp index bcd7916..37785e0 100644 --- a/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp +++ b/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp @@ -43,7 +43,7 @@ } - + Apache Logo @@ -56,7 +56,7 @@

Fediz IDP Login

- +
@@ -69,4 +69,31 @@
+ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/idp/src/main/webapp/WEB-INF/views/signinresponseform.jsp ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/views/signinresponseform.jsp b/services/idp/src/main/webapp/WEB-INF/views/signinresponseform.jsp index 7a98789..afa703e 100644 --- a/services/idp/src/main/webapp/WEB-INF/views/signinresponseform.jsp +++ b/services/idp/src/main/webapp/WEB-INF/views/signinresponseform.jsp @@ -6,20 +6,45 @@ IDP SignIn Response Form - - + +

<% String wctx = (String)request.getAttribute("fedWCtx"); if (wctx != null && !wctx.isEmpty()) { %> -
- <% } %> +
+ <% } %>
- - - + + + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp index e498248..5218bea 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp @@ -24,7 +24,7 @@ -
+ @@ -131,4 +131,26 @@ +