[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: messages/authn-messages.properties views/logou...

Wed Oct 28 16:46:53 EDT 2015

Author: scantor
Date: Wed Oct 28 16:46:52 2015
New Revision: 7898

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7898&view=rev
Log:
IDP-224 - Eventual meta-refresh selection of logout choice so SAML flow actually completes.

Modified:
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/views/logout.vm

Modified: trunk/idp-conf/src/main/resources/messages/authn-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/authn-messages.properties?rev=7898&r1=7897&r2=7898&view=diff
==============================================================================

--- trunk/idp-conf/src/main/resources/messages/authn-messages.properties	(original)
+++ trunk/idp-conf/src/main/resources/messages/authn-messages.properties	Wed Oct 28 16:46:52 2015
@@ -59,7 +59,9 @@
 
 # Logout-related messages
 
-idp.logout.ask = Would you like to attempt to log out of all services accessed during your session?
+idp.logout.ask = Would you like to attempt to log out of all services accessed during your session? \
+                    Please select <strong>Yes</strong> or <strong>No</strong> to ensure the logout \
+                    operation completes, or wait a few seconds for Yes.
 idp.logout.contactServices = If you proceed, the system will attempt to contact the following services:
 idp.logout.complete = The logout operation is complete, and no other services appear to have been accessed during this session.
 idp.logout.local = You elected not to log out of all the applications accessed during your session.

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=7898&r1=7897&r2=7898&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/logout.vm	(original)
+++ trunk/idp-conf/src/main/resources/views/logout.vm	Wed Oct 28 16:46:52 2015
@@ -18,6 +18,7 @@
 <html>
   	<head>
         <meta charset="utf-8">
+        <meta http-equiv="refresh" content="10;url=$flowExecutionUrl&_eventId=propagate">
         <title>#springMessageText("idp.title", "Web Login Service")</title>
         <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
   	</head>
@@ -34,11 +35,10 @@
             <p>This page is displayed when a logout operation at the Identity Provider completes. This page is an example
             and should be customized. It is not fully internationalized because the presentation will be a highly localized
             decision, and we don't have a good suggestion for a default.</p>
-
-            <p></p>
+            <br>
     
             #if ( $logoutContext and !$logoutContext.getSessionMap().isEmpty() )
-                <p>#springMessageText("idp.logout.ask", "Would you like to attempt to log out of all services accessed during your session?")</p>
+                <p>#springMessageText("idp.logout.ask", "Would you like to attempt to log out of all services accessed during your session? Please select <strong>Yes</strong> or <strong>No</strong> to ensure the logout operation completes, or wait a few seconds for Yes.")</p>
                 <br>
 
                 <form id="propagate_form" method="POST" action="$flowExecutionUrl">
@@ -63,6 +63,10 @@
                 </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
             #end
 
           </div>
@@ -75,11 +79,6 @@
         </div>
       </div>
 
-      <!-- If SAML logout with no extra work to do, complete the flow by adding a hidden iframe. -->
-      #if ( $profileRequestContext.getProfileId().contains("saml2/logout") and (!$logoutContext or $logoutContext.getSessionMap().isEmpty()) )
-          <iframe style="display:none" src="$flowExecutionUrl&_eventId=proceed">
-      #end
-
       <footer>
         <div class="container container-footer">
           <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>

