From cdb16595068a1102847f6736c7df6a309a05457c Mon Sep 17 00:00:00 2001
From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:23:24 -0700
Subject: [PATCH] Fix redirect to login base url. (#2182)

No longer needed due to baseUrl in the react router
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
---
 portal-ui/src/ProtectedRoutes.tsx           | 3 +--
 portal-ui/src/screens/Console/Menu/Menu.tsx | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/portal-ui/src/ProtectedRoutes.tsx b/portal-ui/src/ProtectedRoutes.tsx
index fb3895055..bc429664e 100644
--- a/portal-ui/src/ProtectedRoutes.tsx
+++ b/portal-ui/src/ProtectedRoutes.tsx
@@ -21,7 +21,6 @@ import { ISessionResponse } from "./screens/Console/types";
 import useApi from "./screens/Console/Common/Hooks/useApi";
 import { ErrorResponseHandler } from "./common/types";
 import { ReplicationSite } from "./screens/Console/Configurations/SiteReplication/SiteReplication";
-import { baseUrl } from "./history";
 import { useSelector } from "react-redux";
 import {
   globalSetDistributedSetup,
@@ -50,7 +49,7 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => {
 
   const StorePathAndRedirect = () => {
     localStorage.setItem("redirect-path", pathname);
-    return <Navigate to={{ pathname: `${baseUrl}login` }} />;
+    return <Navigate to={{ pathname: `login` }} />;
   };
 
   useEffect(() => {
diff --git a/portal-ui/src/screens/Console/Menu/Menu.tsx b/portal-ui/src/screens/Console/Menu/Menu.tsx
index b348e155c..fa042ffb5 100644
--- a/portal-ui/src/screens/Console/Menu/Menu.tsx
+++ b/portal-ui/src/screens/Console/Menu/Menu.tsx
@@ -26,8 +26,6 @@ import { AppState, useAppDispatch } from "../../../store";
 
 import { ErrorResponseHandler } from "../../../common/types";
 import { clearSession } from "../../../common/utils";
-
-import { baseUrl } from "../../../history";
 import api from "../../../common/api";
 
 import MenuToggle from "./MenuToggle";
@@ -107,7 +105,7 @@ const Menu = ({ classes }: IMenuProps) => {
       localStorage.setItem("userLoggedIn", "");
       localStorage.setItem("redirect-path", "");
       dispatch(resetSession());
-      navigate(`${baseUrl}login`);
+      navigate(`login`);
     };
     api
       .invoke("POST", `/api/v1/logout`)