[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/flows/logout/logout-flow.xml views/logo...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan  6 13:55:47 2016
New Revision: 8068

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8068&view=rev
Log:
IDP-892 - global logout view - Uncaught Exception

Fix a bug preventing flow completion when SLO is not in play.

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

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=8068&r1=8067&r2=8068&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	Wed Jan  6 13:55:47 2016
@@ -83,8 +83,9 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
         </on-entry>
+        <transition on="proceed" to="LogoutCompleteView" />
+        <transition on="end" to="LogoutCompleteView" />
         <transition on="propagate" to="LogoutPropagateView" />
-        <transition on="end" to="LogoutCompleteView" />
     </view-state>
 
     <!-- Terminus -->

Modified: trunk/idp-conf/src/main/resources/views/logout.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/logout.vm?rev=8068&r1=8067&r2=8068&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/logout.vm	(original)
+++ trunk/idp-conf/src/main/resources/views/logout.vm	Wed Jan  6 13:55:47 2016
@@ -65,10 +65,8 @@
                 </ol>
             #else
                 <p><strong>#springMessageText("idp.logout.complete", "The logout operation is complete, and no other services appear to have been accessed during this session.")</strong></p>
-                <!-- If SAML logout with no extra work to do, complete the flow by adding a hidden iframe. -->
-                #if ( $profileRequestContext.getProfileId().contains("saml2/logout") )
-                    <iframe style="display:none" src="$flowExecutionUrl&_eventId=proceed">
-                #end
+                <!-- Complete the flow by adding a hidden iframe. -->
+                <iframe style="display:none" src="$flowExecutionUrl&_eventId=proceed">
             #end
 
           </div>