use a different local storage key for jwt token in admin-frontend vs …

…frontend
bcgov · May 28, 2024 · edcfc2e · edcfc2e
1 parent e64d6c2
commit edcfc2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/admin-frontend/src/common/apiService.ts b/admin-frontend/src/common/apiService.ts
@@ -4,6 +4,8 @@ import { ApiRoutes } from '../utils/constant';
 import AuthService from './authService';
 import { IConfigValue, IReport } from './types';
 
+export const LOCAL_STORAGE_KEY_JWT = 'pay-transparency-admin-jwt';
+
 export enum REPORT_FORMATS {
   HTML = 'html',
   PDF = 'pdf',
@@ -51,12 +53,12 @@ const intercept = apiAxios.interceptors.response.use(
     axios.interceptors.response.eject(intercept);
     return new Promise((resolve, reject) => {
       AuthService.refreshAuthToken(
-        localStorage.getItem('jwtToken'),
+        localStorage.getItem(LOCAL_STORAGE_KEY_JWT),
         localStorage.getItem('correlationID'),
       )
         .then((response) => {
           if (response.jwtFrontend) {
-            localStorage.setItem('jwtToken', response.jwtFrontend);
+            localStorage.setItem(LOCAL_STORAGE_KEY_JWT, response.jwtFrontend);
             localStorage.setItem('correlationID', response.correlationID);
             apiAxios.defaults.headers.common['Authorization'] =
               `Bearer ${response.jwtFrontend}`;
@@ -72,7 +74,7 @@ const intercept = apiAxios.interceptors.response.use(
         })
         .catch((e) => {
           processQueue(e, null);
-          localStorage.removeItem('jwtToken');
+          localStorage.removeItem(LOCAL_STORAGE_KEY_JWT);
           window.location.href = '/token-expired';
           reject(new Error('token expired', { cause: e }));
         });

diff --git a/admin-frontend/src/store/modules/auth.js b/admin-frontend/src/store/modules/auth.js
@@ -1,4 +1,4 @@
-import ApiService from '../../common/apiService';
+import ApiService, { LOCAL_STORAGE_KEY_JWT } from '../../common/apiService';
 import AuthService from '../../common/authService';
 import { defineStore } from 'pinia';
 
@@ -22,7 +22,7 @@ export const authStore = defineStore('auth', {
     error: false,
     isLoading: true,
     loginError: false,
-    jwtToken: localStorage.getItem('jwtToken'),
+    jwtToken: localStorage.getItem(LOCAL_STORAGE_KEY_JWT),
   }),
   getters: {
     acronymsGet: (state) => state.acronyms,
@@ -39,11 +39,11 @@ export const authStore = defineStore('auth', {
       if (token) {
         this.isAuthenticated = true;
         this.jwtToken = token;
-        localStorage.setItem('jwtToken', token);
+        localStorage.setItem(LOCAL_STORAGE_KEY_JWT, token);
       } else {
         this.isAuthenticated = false;
         this.jwtToken = null;
-        localStorage.removeItem('jwtToken');
+        localStorage.removeItem(LOCAL_STORAGE_KEY_JWT);
       }
     },
     setCorrelationID(correlationID) {