Fixes redirect on login (#6900)

cypress/e2e/auth_spec/redirect.cy.ts

@@ -0,0 +1,22 @@
+/// <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(
+      "/facility/657c32be-d584-476c-9ce2-0412f0e7692e/cns?page=1&limit=6"
+    );
+    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",
+      "/facility/657c32be-d584-476c-9ce2-0412f0e7692e/cns?page=1&limit=6"
+    );
+  });
+});

src/Providers/AuthUserProvider.tsx

@@ -55,9 +55,6 @@ export default function AuthUserProvider({ children, unauthorized }: Props) {
     localStorage.removeItem(LocalStorageKeys.refreshToken);
 
     await refetch();
-
-    const redirectURL = getRedirectURL();
-    navigate(redirectURL ? `/?redirect=${redirectURL}` : "/");
   }, [refetch]);
 
   // Handles signout from current tab, if signed out from another tab.
@@ -112,24 +109,14 @@ const updateRefreshToken = async (silent = false) => {
   localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
 };
 
-const getRedirectURL = () => {
-  return new URLSearchParams(window.location.search).get("redirect");
-};
-
 const getRedirectOr = (fallback: string) => {
-  const url = getRedirectURL();
-
-  if (url) {
-    try {
-      const redirect = new URL(url);
-      if (window.location.origin === redirect.origin) {
-        return redirect.pathname + redirect.search;
-      }
-      console.error("Redirect does not belong to same origin.");
-    } catch {
-      console.error(`Invalid redirect URL: ${url}`);
-    }
+  const url = window.location.href;
+  if (
+    url == `${window.location.origin}/login` ||
+    url == window.location.origin
+  ) {
+    return fallback;
+  } else {
+    return url;
   }
-
-  return fallback;
 };