Removing unnecessary wauth flow code
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/94cafcf3 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/94cafcf3 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/94cafcf3 Branch: refs/heads/master Commit: 94cafcf361695a40a98e33428203da8e5512106f Parents: a3477b2 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Dec 13 14:51:52 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Dec 13 14:51:52 2016 +0000 ---------------------------------------------------------------------- .../webapp/WEB-INF/flows/federation-signin-request.xml | 11 +++-------- .../main/webapp/WEB-INF/flows/saml-signin-request.xml | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/94cafcf3/services/idp/src/main/webapp/WEB-INF/flows/federation-signin-request.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/flows/federation-signin-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/federation-signin-request.xml index 5ba8f28..e202c57 100644 --- a/services/idp/src/main/webapp/WEB-INF/flows/federation-signin-request.xml +++ b/services/idp/src/main/webapp/WEB-INF/flows/federation-signin-request.xml @@ -51,7 +51,7 @@ </decision-state> <decision-state id="checkDefaultToThisIDP"> - <if test="flowScope.idpConfig.isUseCurrentIdp()" then="checkWauthTypeSupported" + <if test="flowScope.idpConfig.isUseCurrentIdp()" then="homeRealmSignInEntryPoint" else="viewBadRequest" /> </decision-state> @@ -77,7 +77,7 @@ <!-- Home Realm is known then we can store it in cookie --> <decision-state id="checkIsThisIDP"> <if test="flowScope.idpConfig.realm.equals(flowScope.home_realm)" - then="checkWauthTypeSupported" else="checkRemoteIdpToken" /> + then="homeRealmSignInEntryPoint" else="checkRemoteIdpToken" /> </decision-state> <!-- ===== Realm independent ===== --> @@ -109,19 +109,14 @@ <!-- ===== Home Realm == this realm ===== --> - <decision-state id="checkWauthTypeSupported"> + <decision-state id="homeRealmSignInEntryPoint"> <on-entry> <!-- Here, home realm is guaranteed to be THIS realm --> <set name="flowScope.home_realm" value="flowScope.idpConfig.realm" /> </on-entry> <if test="flowScope.idpConfig.getAuthenticationURIs() == null" then="viewBadRequest" /> - <if - test="flowScope.idpConfig.getAuthenticationURIs().get(flowScope.wauth) != null" - then="checkIdpTokenWauth" else="viewBadRequest" /> - </decision-state> - <decision-state id="checkIdpTokenWauth"> <!-- check presence of cached IDP token for THIS realm --> <if test="externalContext.sessionMap[flowScope.home_realm] == null" then="cacheSecurityToken" else="checkLocalIdPTokenExpiry" /> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/94cafcf3/services/idp/src/main/webapp/WEB-INF/flows/saml-signin-request.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/flows/saml-signin-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/saml-signin-request.xml index 899cd31..f79b331 100644 --- a/services/idp/src/main/webapp/WEB-INF/flows/saml-signin-request.xml +++ b/services/idp/src/main/webapp/WEB-INF/flows/saml-signin-request.xml @@ -115,6 +115,7 @@ </on-entry> <if test="flowScope.idpConfig.getAuthenticationURIs() == null" then="viewBadRequest" /> + <!-- check presence of cached IDP token for THIS realm --> <if test="externalContext.sessionMap[flowScope.home_realm] == null" then="cacheSecurityToken" else="checkLocalIdPTokenExpiry" />
