Fixes redirect on login (#6900)

cypress/e2e/auth_spec/redirect.cy.ts

@@ -0,0 +1,17 @@
+/// <reference types="cypress" />
+
+import { cy, describe, it } from "local-cypress";
+
+describe("redirect", () => {
+  it("Check if login redirects to the right url", () => {
+    cy.log("Logging in the user staffdev:Coronasafe@123");
+
+    cy.visit("/resource/board");
+    cy.get("input[id='username']").type("staffdev");
+    cy.get("input[id='password']").type("Coronasafe@123");
+    cy.get("button").contains("Login").click();
+
+    cy.get("p").contains("Sign Out").should("exist");
+    cy.url().should("include", "/resource/board");
+  });
+});

src/Providers/AuthUserProvider.tsx

@@ -42,7 +42,7 @@ export default function AuthUserProvider({ children, unauthorized }: Props) {
         localStorage.setItem(LocalStorageKeys.refreshToken, query.data.refresh);
 
         await refetch();
-        navigate(getRedirectOr("/"));
+        navigate(getRedirectOr(location.pathname));
       }
 
       return query;
@@ -55,9 +55,7 @@ export default function AuthUserProvider({ children, unauthorized }: Props) {
     localStorage.removeItem(LocalStorageKeys.refreshToken);
 
     await refetch();
-
-    const redirectURL = getRedirectURL();
-    navigate(redirectURL ? `/?redirect=${redirectURL}` : "/");
+    navigate(getRedirectOr(`/login?redirect=${location.href}`));
   }, [refetch]);
 
   // Handles signout from current tab, if signed out from another tab.
@@ -118,18 +116,24 @@ const getRedirectURL = () => {
 
 const getRedirectOr = (fallback: string) => {
   const url = getRedirectURL();
-
+  const reserverdURLS = ["/login", "/session-expired"];
   if (url) {
     try {
       const redirect = new URL(url);
+      console.log(redirect);
       if (window.location.origin === redirect.origin) {
-        return redirect.pathname + redirect.search;
+        console.log(redirect);
+        return redirect.href;
       }
       console.error("Redirect does not belong to same origin.");
     } catch {
       console.error(`Invalid redirect URL: ${url}`);
     }
+    if (reserverdURLS.includes(location.pathname)) {
+      return "/";
+    }
+    return location.origin + location.pathname;
+  } else {
+    return fallback;
   }
-
-  return fallback;
 };