Fix session expiry detection (#6472)

* fix session expiry detection * Fix logout bug
ohcnetwork · Oct 20, 2023 · 33f103d · 33f103d
1 parent 08193ba
commit 33f103d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx
@@ -93,11 +93,15 @@ export const fireRequest = (
     const config: any = {
       headers: {},
     };
-    if (!request.noAuth && localStorage.getItem(LocalStorageKeys.accessToken)) {
-      config.headers["Authorization"] =
-        "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken);
-    } else {
-      // TODO: get access token
+    if (!request.noAuth) {
+      const access_token = localStorage.getItem(LocalStorageKeys.accessToken);
+      if (access_token) {
+        config.headers["Authorization"] = "Bearer " + access_token;
+      } else {
+        // The access token is missing from the local storage. Redirect to login page.
+        window.location.href = "/";
+        return;
+      }
     }
     const axiosApiCall: any = axios.create(config);
 

diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
@@ -65,7 +65,12 @@ export default function AppRouter() {
 
   useEffect(() => {
     addEventListener("storage", (event: any) => {
-      if (event.key === LocalStorageKeys.accessToken && !event.newValue) {
+      if (
+        [LocalStorageKeys.accessToken, LocalStorageKeys.refreshToken].includes(
+          event.key
+        ) &&
+        !event.newValue
+      ) {
         handleSignOut(true);
       }
     });