[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/system/flows/local-storage/local-storage-read-...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun  8 16:14:01 2015
New Revision: 7548

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7548&view=rev
Log:
IDP-594 Add version to read and write flow.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-write.js
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-write.vm
    trunk/idp-conf/src/test/resources/flows/test/local-storage/read/local-storage-read-test-flow.xml
    trunk/idp-conf/src/test/resources/flows/test/local-storage/write/local-storage-write-test-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml?rev=7548&r1=7547&r2=7548&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml	Mon Jun  8 16:14:01 2015
@@ -7,6 +7,9 @@
 
     <!-- The key of the item read from local storage. -->
     <input name="localStorageKey" type="string" required="true" />
+
+    <!-- The 'version' of the item written to local storage. -->
+    <input name="localStorageVersion" type="string" required="true" />
 
     <view-state id="LocalStorageRead" view="/local-storage/local-storage-read">
         <transition to="proceed" />

Modified: trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml?rev=7548&r1=7547&r2=7548&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml	Mon Jun  8 16:14:01 2015
@@ -9,6 +9,9 @@
     <input name="localStorageKey" type="string" required="true" />
     <input name="localStorageValue" type="string" required="true" />
 
+    <!-- The 'version' of the item written to local storage. -->
+    <input name="localStorageVersion" type="string" required="true" />
+
     <view-state id="LocalStorageWrite" view="/local-storage/local-storage-write">
         <transition on="formSubmitted" to="proceed" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js?rev=7548&r1=7547&r2=7548&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js	(original)
+++ trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js	Mon Jun  8 16:14:01 2015
@@ -1,10 +1,19 @@
-function readLocalStorageAndSubmit(key) {
+function readLocalStorageAndSubmit(key, version) {
     var localStorageSupported = isLocalStorageSupported();
     document.form1["shib_idp_ls_supported"].value = localStorageSupported;
     if (localStorageSupported) {
         var success;
         try {
-            document.form1["shib_idp_ls_value"].value = localStorage.getItem(key);
+            var clientVersion = localStorage.getItem("shib_idp_ls_version");
+            if (clientVersion != null) {
+                document.form1["shib_idp_ls_version"].value = clientVersion;
+                if (clientVersion > version) {
+                    var value = localStorage.getItem(key);
+                    if (value != null) {
+                        document.form1["shib_idp_ls_value"].value = value;
+                    }
+                }
+            }
             success = "true";
         } catch (e) {
             success = "false";

Modified: trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm?rev=7548&r1=7547&r2=7548&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm	(original)
+++ trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm	Mon Jun  8 16:14:01 2015
@@ -9,7 +9,7 @@

[... 108 lines stripped ...]