O3-2409: Login: support interpolation in loginUrl and logoutUrl (#766)

openmrs · Sep 14, 2023 · b1d9e74 · b1d9e74
1 parent 3f7080e
commit b1d9e74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/apps/esm-login-app/src/login/login.component.tsx b/packages/apps/esm-login-app/src/login/login.component.tsx
@@ -18,6 +18,7 @@ import {
   clearCurrentUser,
   getSessionStore,
   useConnectivity,
+  navigate as openmrsNavigate,
 } from "@openmrs/esm-framework";
 import { performLogin } from "../login.resource";
 import styles from "./login.scss";
@@ -78,8 +79,7 @@ const Login: React.FC<LoginProps> = () => {
 
   useEffect(() => {
     if (!user && config.provider.type === "oauth2") {
-      const loginUrl = config.provider.loginUrl;
-      window.location.href = loginUrl;
+      openmrsNavigate({ to: config.provider.loginUrl });
     }
   }, [config, user]);
 

diff --git a/packages/apps/esm-login-app/src/redirect-logout/redirect-logout.component.tsx b/packages/apps/esm-login-app/src/redirect-logout/redirect-logout.component.tsx
@@ -20,7 +20,7 @@ const RedirectLogout: React.FC<RedirectLogoutProps> = () => {
     } else {
       performLogout().then(() => {
         if (config.provider.type === "oauth2") {
-          location.href = config.provider.logoutUrl;
+          navigate({ to: config.provider.logoutUrl });
         } else {
           navigate({ to: "${openmrsSpaBase}/login" });
         }