Repository: cxf-fediz Updated Branches: refs/heads/master a671407ad -> 7387d9a34
Get initial redirect to the IdP working Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/cbff9ea7 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/cbff9ea7 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/cbff9ea7 Branch: refs/heads/master Commit: cbff9ea7adfd956ac92eeafe36178def0577fd94 Parents: a671407 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Feb 7 14:52:31 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Feb 7 14:52:31 2017 +0000 ---------------------------------------------------------------------- .../apache/cxf/fediz/service/oidc/logout/LogoutService.java | 5 +++++ services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 6 ++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cbff9ea7/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java index f342ca0..5c6a10a 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java @@ -127,6 +127,11 @@ public class LogoutService { // 1. "/finalize" URI for the IDP to redirect to this service again // or // 2. may be let IDP redirect straight to getClientLogoutUri(client) ? + + UriBuilder ub2 = mc.getUriInfo().getAbsolutePathBuilder(); + ub2.path("finalize"); + ub.queryParam("wreply", ub2.build()); + return ub.build(); } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cbff9ea7/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml index 51bb044..6b308d3 100644 --- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml +++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml @@ -70,8 +70,14 @@ <property name="services" ref="oidcServices"/> </bean> + <bean id="tokenCleanupHandler" class="org.apache.cxf.fediz.service.oidc.logout.TokenCleanupHandler"> + <property name="dataProvider" ref="oauthProvider"/> + </bean> + <bean id="logoutService" class="org.apache.cxf.fediz.service.oidc.logout.LogoutService"> <property name="dataProvider" ref="oauthProvider"/> + <property name="relativeIdpLogoutUri" value="../../secure/logout"/> + <property name="logoutHandlers" ref="tokenCleanupHandler"/> </bean> <!-- Service supporting all OIDC Core flows -->
