Merge pull request #18091 from jeclrsg/hpcc-30934-eclwatch-v9-unlock-…

…redirect HPCC-30934 ECL Watch v9 fix unlock page redirect
hpcc-systems · Nov 30, 2023 · 4f0e084 · 4f0e084
2 parents 363512b + a30f6b0
commit 4f0e084
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/esp/src/src-react/components/forms/Login.tsx b/esp/src/src-react/components/forms/Login.tsx
@@ -120,7 +120,9 @@ export const Login: React.FunctionComponent<LoginProps> = ({
                     cookies["ESPAuthenticated"] = "true";
                     createUserSession(cookies).then(() => {
                         setErrorMessage("");
-                        replaceUrl("/", null, true);
+                        const lastUrl = window.localStorage.getItem("pageOnLock") ?? "/";
+                        window.localStorage.removeItem("pageOnLock");
+                        replaceUrl(lastUrl, true);
                     }).catch(err => logger.error("Unable to create user session."));
                 }
             }