From 29e0f5597cd69f8d41d3cb2910b37ed805270d53 Mon Sep 17 00:00:00 2001
From: Mac Siri <krairit.siri@gmail.com>
Date: Fri, 28 Jun 2019 17:11:49 -0400
Subject: [PATCH] Disable use of localStorage when cookie-less (#3322)

* Disable use of localStorage when cookie-less

* Add missing return
---
 .../utilities/browserStoreCache.js            | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/utilities/browserStoreCache.js b/app/assets/javascripts/utilities/browserStoreCache.js
index 02b93f0a4..6c6fa334a 100644
--- a/app/assets/javascripts/utilities/browserStoreCache.js
+++ b/app/assets/javascripts/utilities/browserStoreCache.js
@@ -1,14 +1,22 @@
 function browserStoreCache(action, userData) {
   try {
-    if (action === 'set') {
-      localStorage.setItem('current_user', userData);
-      localStorage.setItem('config_body_class', JSON.parse(userData)['config_body_class']);
-    } else if (action === 'remove') {
-      localStorage.removeItem('current_user');
-    } else {
-      return localStorage.getItem('current_user');
+    switch (action) {
+      case 'set':
+        localStorage.setItem('current_user', userData);
+        localStorage.setItem(
+          'config_body_class',
+          JSON.parse(userData).config_body_class,
+        );
+        break;
+      case 'remove':
+        localStorage.removeItem('current_user');
+        break;
+      default:
+        return localStorage.getItem('current_user');
     }
   } catch (err) {
-    browserStoreCache('remove');
+    if (navigator.cookieEnabled) {
+      browserStoreCache('remove');
+    }
   }
 }