Finishing centralization of BrowserStore

2 files changed, 34 insertions, 7 deletions

diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx
index dd9b09c9f..770f7a289 100644
--- a/web/react/stores/browser_store.jsx
+++ b/web/react/stores/browser_store.jsx
@@ -28,6 +28,18 @@ module.exports.removeItem = function(name) {
 	localStorage.removeItem(user_id + "_" + name);
 };
 
+module.exports.setGlobalItem = function(name, value) {
+	localStorage.setItem(name, value);
+};
+
+module.exports.getGlobalItem = function(name) {
+	return localStorage.getItem(name);
+};
+
+module.exports.removeGlobalItem = function(name) {
+	localStorage.removeItem(name);
+};
+
 module.exports.clear = function() {
 	localStorage.clear();
 	sessionStorage.clear();
@@ -46,3 +58,18 @@ module.exports.actionOnItemsWithPrefix = function (prefix, action) {
         }
     }
 };
+
+module.exports.isLocalStorageSupported = function() {
+    try {
+        sessionStorage.setItem("testSession", '1');
+        sessionStorage.removeItem("testSession");
+
+        localStorage.setItem("testLocal", '1');
+        localStorage.removeItem("testLocal", '1');
+
+        return true;
+    } 
+    catch (e) {
+        return false;
+    }
+}
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index 01f0c8c8c..e832b34c7 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -65,12 +65,12 @@ var UserStore = assign({}, EventEmitter.prototype, {
   },
   setCurrentId: function(id) {
     if (id == null)
-      localStorage.removeItem("current_user_id");
+      BrowserStore.removeGlobalItem("current_user_id");
     else
-      localStorage.setItem("current_user_id", id);
+      BrowserStore.setGlobalItem("current_user_id", id);
   },
   getCurrentId: function(skipFetch) {
-    var current_id = localStorage.getItem("current_user_id");
+    var current_id = BrowserStore.getGlobalItem("current_user_id");
 
     // this is a speical case to force fetch the
     // current user if it's missing
@@ -153,17 +153,17 @@ var UserStore = assign({}, EventEmitter.prototype, {
     this._storeProfiles(ps);
   },
   _storeProfiles: function(profiles) {
-    localStorage.setItem("profiles", JSON.stringify(profiles));
+    BrowserStore.setGlobalItem("profiles", JSON.stringify(profiles));
     var profileUsernameMap = {};
     for (var id in profiles) {
         profileUsernameMap[profiles[id].username] = profiles[id];
     }
-    localStorage.setItem("profileUsernameMap", JSON.stringify(profileUsernameMap));
+    BrowserStore.setGlobalItem("profileUsernameMap", JSON.stringify(profileUsernameMap));
   },
   _getProfiles: function() {
     var profiles = {};
     try {
-        profiles = JSON.parse(localStorage.getItem("profiles"));
+        profiles = JSON.parse(BrowserStore.getGlobalItem("profiles"));
     }
     catch (err) {
     }
@@ -177,7 +177,7 @@ var UserStore = assign({}, EventEmitter.prototype, {
   _getProfilesUsernameMap: function() {
     var profileUsernameMap = {};
     try {
-        profileUsernameMap = JSON.parse(localStorage.getItem("profileUsernameMap"));
+        profileUsernameMap = JSON.parse(BrowserStore.getGlobalItem("profileUsernameMap"));
     }
     catch (err) {
     }