[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/views/logout/propagate.vm idp-conf/src/...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  3 21:23:22 2015
New Revision: 7928

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7928&view=rev
Log:
IDP-224 - Localize jquery, add license, and split apart propagation template.

Added:
    trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm   (with props)
    trunk/idp-distribution/src/main/resources/doc/JQUERY-LICENSE.txt   (with props)
    trunk/idp-war/src/main/webapp/js/
    trunk/idp-war/src/main/webapp/js/jquery-2.1.4.min.js   (with props)
Modified:
    trunk/idp-conf/src/main/resources/views/logout-propagate.vm

Modified: trunk/idp-conf/src/main/resources/views/logout-propagate.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/logout-propagate.vm?rev=7928&r1=7927&r2=7928&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/logout-propagate.vm	(original)
+++ trunk/idp-conf/src/main/resources/views/logout-propagate.vm	Tue Nov  3 21:23:22 2015
@@ -34,58 +34,7 @@
         <div class="content">
           <div class="column one">
               <p>#springMessageText("idp.logout.attempt", "Attempting to log out of the following services:")</p>
-
-              #if ($logoutContext and !$logoutContext.getSessionMap().isEmpty())
-                  <ol>
-                      #foreach ($sp in $logoutContext.getSessionMap().keySet())
-                          #set ($rpCtx = $multiRPContext.getRelyingPartyContextById($sp))
-                          #if ($rpCtx)
-                              #set ($rpUIContext = $rpCtx.getSubcontext("net.shibboleth.idp.ui.context.RelyingPartyUIContext"))
-                          #end
-                          #if ($rpUIContext and $rpUIContext.getServiceName())
-                              <li id="result_$codecUtil.hex($sp.getBytes())" title="Logout pending">$htmlEncoder.encodeForHTML($rpUIContext.getServiceName())</li>
-                          #else
-                              <li id="result_$codecUtil.hex($sp.getBytes())" title="Logout pending">$htmlEncoder.encodeForHTML($sp)</li>
-                          #end
-                      #end
-                  </ol>
-                  <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
-                  <script>
-                      function onLoad(src, target, sessionKey) {
-                          try {
-                              var content = src.contents().text();
-                              target.removeClass("success failure");
-                              if (content && jQuery.parseJSON(content).result == "Success") {
-                                  target.addClass("success");
-                                  target.prop("title", "Successful logout")
-                              } else {
-                                  target.addClass("failure");
-                                  target.prop("title", "Failed logout")
-                              }
-                          } catch (e) {
-                              target.addClass("failure");
-                              target.prop("title", "Failed logout")
-                          }
-                          if (typeof(Storage) !== "undefined" ) {
-                              var url = sessionStorage.getItem(sessionKey);
-                              if (url != null) {
-                                  sessionStorage.removeItem(sessionKey);
-                                  setTimeout(function() { src.prop("src", url) }, 1500);
-                              }
-                          }
-                      }
-                  </script>
-                  #foreach ($sp in $logoutContext.getSessionMap().keySet())
-                      #foreach ($session in $logoutContext.getSessions($sp))
-                          #set ($skey = $session.getSPSessionKey())
-                          #if ($flowSelector.apply($session))
-                              <iframe id="sender_$codecUtil.hex($skey.getBytes())"
-                                      src="$request.contextPath/profile/PropagateLogout?SessionKey=$urlEncoder.encode($skey)"
-                                      style="display:none" onload="onLoad($(this), $('#result_$codecUtil.hex($sp.getBytes())'), '$skey')"></iframe>
-                          #end
-                      #end
-                  #end
-              #end
+              #parse("logout/propagate.vm")
           </div>
           <div class="column two">
             <ul class="list list-help">
@@ -96,11 +45,6 @@
         </div>
       </div>
 
-      <!-- If SAML logout, complete the flow by adding a hidden iframe. -->
-      #if ( $profileRequestContext.getProfileId().contains("saml2/logout") )
-          <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>