[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/webflow-config.xml flows/client-st...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 24 16:46:44 2015
New Revision: 7704

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7704&view=rev
Log:
IDP-594 - Wire client storage load/save into relevant SAML and logout flows

Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=7704&r1=7703&r2=7704&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml	Mon Aug 24 16:46:44 2015
@@ -134,6 +134,7 @@
 
         <!-- Client storage flows. -->
         <webflow:flow-location id="client-storage/read" path="../system/flows/client-storage/client-storage-read-flow.xml" />
+        <webflow:flow-location id="client-storage/write" path="../system/flows/client-storage/client-storage-write-flow.xml" />
     </webflow:flow-registry>
 
     <webflow:flow-executor id="flowExecutor">

Modified: trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml?rev=7704&r1=7703&r2=7704&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml	Mon Aug 24 16:46:44 2015
@@ -4,9 +4,10 @@
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />
-    
-    <decision-state id="UseLocalStorage">
-        <if test="UseLocalStorage" then="LocalStorageRead" else="LoadClientStorageServices" />
+        
+    <decision-state id="CheckLocalStorage">
+        <if test="UseLocalStorage and opensamlProfileRequestContext.isBrowserProfile()"
+            then="LocalStorageRead" else="LoadClientStorageServices" />
     </decision-state>
 
     <view-state id="LocalStorageRead" view="/client-storage/client-storage-read">

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml?rev=7704&r1=7703&r2=7704&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	Mon Aug 24 16:46:44 2015
@@ -27,12 +27,22 @@
         p:loggingId="%{idp.service.logging.logout:Logout}"
         p:browserProfile="true" />
 
+    <bean id="PopulateClientStorageLoadContext"
+        class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"
+        p:storageServices-ref="#{ getObject('shibboleth.ClientStorageServices') != null
+            ? 'shibboleth.ClientStorageServices' : 'shibboleth.DefaultClientStorageServices' }" />
+
     <bean id="ProcessLogout"
         class="net.shibboleth.idp.session.impl.ProcessLogout" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:sessionManager-ref="shibboleth.SessionManager"
         p:sessionResolver-ref="shibboleth.SessionManager" />
+    
+    <bean id="PopulateClientStorageSaveContext"
+        class="org.opensaml.storage.impl.client.PopulateClientStorageSaveContext" scope="prototype"
+        p:storageServices-ref="#{ getObject('shibboleth.ClientStorageServices') != null
+            ? 'shibboleth.ClientStorageServices' : 'shibboleth.DefaultClientStorageServices' }" />
     
     <bean id="LogoutPopulateAuditContext"
         class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml

[... 327 lines stripped ...]