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

[noreply at shibboleth.net]

Author: serac
Date: Fri Nov  6 15:22:32 2015
New Revision: 7958

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7958&view=rev
Log:
IDP-645 Refactor related to session key changes.

Modified:
    trunk/idp-conf/src/main/resources/system/views/cas/logoutService.vm
    trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm

Modified: trunk/idp-conf/src/main/resources/system/views/cas/logoutService.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/cas/logoutService.vm?rev=7958&r1=7957&r2=7958&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/cas/logoutService.vm	(original)
+++ trunk/idp-conf/src/main/resources/system/views/cas/logoutService.vm	Fri Nov  6 15:22:32 2015
@@ -15,7 +15,7 @@
 </form>
 <script>
     if (typeof(Storage) !== "undefined") {
-        sessionStorage.setItem("$logoutPropCtx.session.getSPSessionKey()", "$flowExecutionUrl&_eventId=proceed");
+        sessionStorage.setItem("$logoutPropCtx.sessionKey", "$flowExecutionUrl&_eventId=proceed");
     }
 </script>
 </body>

Modified: trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm?rev=7958&r1=7957&r2=7958&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm	(original)
+++ trunk/idp-conf/src/main/resources/system/views/logout/propagate.vm	Fri Nov  6 15:22:32 2015
@@ -61,7 +61,6 @@
         function onLoad(src, target, trackerId, sessionKey) {
             try {
                 var content = src.contents().text();
-                target.removeClass("success failure");
                 if (content && jQuery.parseJSON(content).result == "Success") {
                     sessionTracker[trackerId]['_' + sessionKey] = true;
                 } else {
@@ -70,6 +69,7 @@
             } catch (e) {
                 sessionTracker[trackerId]['_' + sessionKey] = false;
             }
+            target.removeClass("success failure");
             if (sessionTracker[trackerId].status()) {
                 target.addClass("success");
                 target.prop("title", "Successful logout");