From e30d6bda24251cf44c2af51adc1d38bba349002b Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Mon, 6 Nov 2023 04:15:16 -0800
Subject: [PATCH] Redirect to Original URL After Session Expiry and Re-login
 (#6495)

* go back to previous url after session expiration

* add query parameters instead of localstorage

* resolve cross scripting

* use newURL instead of string manipulation

* check origin while redirecting

* remove cross-site-scripting

* convert the redirection into a function

* remove else redirection
---
 src/Components/Auth/Login.tsx       |  3 ++-
 src/Redux/fireRequest.tsx           |  2 +-
 src/Utils/request/handleResponse.ts |  2 +-
 src/Utils/utils.ts                  | 25 ++++++++++++++++++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index 140a0013fd9..58472c4ff25 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -12,6 +12,7 @@ import CircularProgress from "../Common/components/CircularProgress";
 import { LocalStorageKeys } from "../../Common/constants";
 import ReactMarkdown from "react-markdown";
 import rehypeRaw from "rehype-raw";
+import { handleRedirection } from "../../Utils/utils";
 
 export const Login = (props: { forgot?: boolean }) => {
   const {
@@ -109,7 +110,7 @@ export const Login = (props: { forgot?: boolean }) => {
           window.location.pathname === "/" ||
           window.location.pathname === "/login"
         ) {
-          window.location.href = "/facility";
+          handleRedirection();
         } else {
           window.location.href = window.location.pathname.toString();
         }
diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx
index 3d8c677d47d..892e6bd2ee9 100644
--- a/src/Redux/fireRequest.tsx
+++ b/src/Redux/fireRequest.tsx
@@ -152,7 +152,7 @@ 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") {
-                window.location.href = "/session-expired";
+                window.location.href = `/session-expired?redirect=${window.location.href}`;
               }
               Notification.Error({
                 msg: error.response.data.detail,
diff --git a/src/Utils/request/handleResponse.ts b/src/Utils/request/handleResponse.ts
index 2ecad95ac88..8698919c869 100644
--- a/src/Utils/request/handleResponse.ts
+++ b/src/Utils/request/handleResponse.ts
@@ -29,7 +29,7 @@ export default function handleResponse(
   if (res.status >= 400) {
     // Invalid token
     if (!silent && error?.code === "token_not_valid") {
-      navigate("/session-expired");
+      navigate(`/session-expired?redirect=${window.location.href}`);
     }
 
     notify?.Error({ msg: error?.detail || "Something went wrong...!" });
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 847304553a8..a96a4c65146 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -107,8 +107,31 @@ export const handleSignOut = (forceReload: boolean) => {
   Object.values(LocalStorageKeys).forEach((key) =>
     localStorage.removeItem(key)
   );
+  const redirectURL = new URLSearchParams(window.location.search).get(
+    "redirect"
+  );
+  redirectURL ? navigate(`/?redirect=${redirectURL}`) : navigate("/");
   if (forceReload) window.location.href = "/";
-  else navigate("/");
+};
+
+export const handleRedirection = () => {
+  const redirectParam = new URLSearchParams(window.location.search).get(
+    "redirect"
+  );
+  try {
+    if (redirectParam) {
+      const redirectURL = new URL(redirectParam);
+
+      if (redirectURL.origin === window.location.origin) {
+        const newPath = redirectURL.pathname + redirectURL.search;
+        window.location.href = `${window.location.origin}${newPath}`;
+        return;
+      }
+    }
+    window.location.href = "/facility";
+  } catch {
+    window.location.href = "/facility";
+  }
 };
 
 /**