From 620d5745b5fb97e08945c15048ad5439e5bbe80c Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 12 Jul 2022 10:05:36 -0400 Subject: [PATCH] 18965: Fix storing targetUrl for non-password login Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/services/auth-service/auth-service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts index 548dbcaa..52bfa29e 100644 --- a/src/services/auth-service/auth-service.ts +++ b/src/services/auth-service/auth-service.ts @@ -68,13 +68,16 @@ export class AuthService { } } + public setTargetUrl(url: string) { + localStorage.setItem(TARGET_URL, url); + } + public removeTargetURL() { localStorage.removeItem(TARGET_URL); - sessionStorage.removeItem(TARGET_URL); } public getTargetURL() { - return this.getStorage().getItem(TARGET_URL); + return localStorage.getItem(TARGET_URL); } public removeApiToken() { @@ -113,7 +116,7 @@ export class AuthService { const currentUrl = `${window.location.protocol}//${window.location.host}/token`; const homeClusterHost = remoteHosts[homeCluster]; const rd = new URL(window.location.href); - this.getStorage().setItem(TARGET_URL, rd.pathname + rd.search); + this.setTargetUrl(rd.pathname + rd.search); window.location.assign(`https://${homeClusterHost}/login?${(uuidPrefix !== homeCluster && homeCluster !== loginCluster) ? "remote=" + uuidPrefix + "&" : ""}return_to=${currentUrl}`); } -- 2.30.2