go back to previous url after session expiration

AshrafMd-1 · Oct 25, 2023 · a838ca7 · a838ca7
1 parent 438dc61
commit a838ca7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
@@ -109,7 +109,13 @@ export const Login = (props: { forgot?: boolean }) => {
           window.location.pathname === "/" ||
           window.location.pathname === "/login"
         ) {
-          window.location.href = "/facility";
+          const lastPath = localStorage.getItem("lastPath");
+          if (lastPath) {
+            localStorage.removeItem("lastPath");
+            window.location.href = lastPath;
+          } else {
+            window.location.href = "/facility";
+          }
         } else {
           window.location.href = window.location.pathname.toString();
         }

diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx
@@ -152,6 +152,8 @@ export const fireRequest = (
           if (error.response.status > 400 && error.response.status < 500) {
             if (error.response.data && error.response.data.detail) {
               if (error.response.data.code === "token_not_valid") {
+                //store the path before session expiry in local storage
+                localStorage.setItem("lastPath", window.location.href);
                 window.location.href = "/session-expired";
               }
               Notification.Error({