🥅 Catch session storage error

likecoin · Sep 10, 2024 · 65f921a · 65f921a
1 parent efbd3ca
commit 65f921a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/src/pages/auth/redirect.vue b/src/pages/auth/redirect.vue
@@ -10,6 +10,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import { logTrackerEvent } from '~/util/EventLogger';
+import { getFromSessionStorage, removeSessionStorageItem } from '~/util/misc';
 
 export default {
   name: 'AuthRedirect',
@@ -26,12 +27,9 @@ export default {
     const { error, method, code } = this.$route.query;
 
     let postAuthRoute = this.localeLocation(this.getHomeRoute);
-    if (window.sessionStorage) {
-      const storedRoute = window.sessionStorage.getItem('USER_POST_AUTH_ROUTE');
-      if (storedRoute) {
-        postAuthRoute = storedRoute;
-        window.sessionStorage.removeItem('USER_POST_AUTH_ROUTE');
-      }
+    const storedRoute = getFromSessionStorage('USER_POST_AUTH_ROUTE', true);
+    if (storedRoute) {
+      postAuthRoute = storedRoute;
     }
 
     if (method && code) {
@@ -81,9 +79,7 @@ export default {
       }
     } else {
       logTrackerEvent(this, 'RedirectLogin', 'RedirectLoginFail', error, 1);
-      if (window.sessionStorage) {
-        window.sessionStorage.removeItem('USER_POST_AUTH_ROUTE');
-      }
+      removeSessionStorageItem('USER_POST_AUTH_ROUTE');
       this.$nuxt.error({
         statusCode: 400,
         message: error,

diff --git a/src/pages/oauth/redirect.vue b/src/pages/oauth/redirect.vue
@@ -80,8 +80,8 @@ export default {
       }
     } else {
       logTrackerEvent(this, 'Register', 'RegisterFail', error, 1);
-      if (window.sessionStorage) {
-        window.sessionStorage.removeItem('USER_POST_AUTH_ROUTE');
+      if (window.localStorage) {
+        window.localStorage.removeItem('USER_POST_AUTH_ROUTE');
       }
       this.$nuxt.error({
         statusCode: 400,

diff --git a/src/util/misc.js b/src/util/misc.js
@@ -69,18 +69,32 @@ export function getContentUrlType(url) {
   return undefined;
 }
 
-export function getFromSessionStorage(key) {
-  if (window.sessionStorage) {
-    return window.sessionStorage.getItem(key);
-  }
+export function getFromSessionStorage(key, remove = false) {
+  try {
+    if (window.sessionStorage) {
+      const item = window.sessionStorage.getItem(key);
+      if (remove) window.sessionStorage.removeItem(key);
+      return item;
+    }
+  } catch {}
   return null;
 }
 
 export function setSessionStorageItem(key, item) {
-  if (window.sessionStorage) {
-    return window.sessionStorage.setItem(key, item);
-  }
-  return undefined;
+  try {
+    if (window.sessionStorage) {
+      window.sessionStorage.setItem(key, item);
+    }
+  } catch {}
+}
+
+export function removeSessionStorageItem(key) {
+  try {
+    if (window.sessionStorage) {
+      window.sessionStorage.removeItem(key);
+    }
+  } catch {}
+  return null;
 }
 
 export default sleep;