erp5_officejs: fix in jio local gadget 401 redirect

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_local_jio_js.js

@@ -3,16 +3,7 @@
 (function (window, rJS, jIO, RSVP, UriTemplate, console) {
   "use strict";
 
-  // jIO call wrapper for redirection to authentication page if needed
-  function wrapJioCall(gadget, method_name, argument_list) {
-    var storage = gadget.state_parameter_dict.jio_storage;
-    if (storage === undefined) {
-      return gadget.redirect({command: 'display',
-                              options: {page: 'ojs_configurator'}});
-    }
-    return storage[method_name].apply(storage, argument_list)
-      .push(undefined, function (error) {
-        if ((error.target !== undefined) && (error.target.status === 401)) {
+  function redirectToLogin(gadget, error) {
     var regexp,
       site,
       login_page;
@@ -59,6 +50,19 @@
                                 options: {page: 'ojs_configurator'}});
       });
   }
+
+  // jIO call wrapper for redirection to authentication page if needed
+  function wrapJioCall(gadget, method_name, argument_list) {
+    var storage = gadget.state_parameter_dict.jio_storage;
+    if (storage === undefined) {
+      return gadget.redirect({command: 'display',
+                              options: {page: 'ojs_configurator'}});
+    }
+    return storage[method_name].apply(storage, argument_list)
+      .push(undefined, function (error) {
+        if ((error.target !== undefined) && (error.target.status === 401)) {
+          return redirectToLogin(gadget, error);
+        }
         throw error;
       });
   }
@@ -188,6 +192,7 @@
           }
           if (result_list[0] === undefined) { return; }
           if (result_list[1] === undefined) { return; }
+          gadget.state_parameter_dict.jio_storage_name = result_list[1];
           appcache_storage = jIO.createJIO(jio_appchache_options);
         })
         .push(function () {
@@ -200,14 +205,11 @@
           }
         })
         .push(undefined, function (error) {
-          console.log("Error while appcache-local " +
-                      "storage synchronization");
+          console.log("Error while appcache-local storage synchronization");
           if (error && error.currentTarget &&
               error.currentTarget.status === 401) {
-            console.log("Unauthorized access to storage," +
-                        "sync cancelled");
-            gadget.state_parameter_dict.jio_storage_name = "ERP5";
-            return;
+            console.log("Unauthorized access to storage, sync cancelled");
+            return redirectToLogin(gadget, error);
           }
           console.log(error);
           throw error;