X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ae94f4d8463ff6350329e802cb902c8dad96a710..b05f087c3e2bbaaa829d602af6d90fa565a9900e:/src/common/redirect-to.ts diff --git a/src/common/redirect-to.ts b/src/common/redirect-to.ts index 7cb0d580..77be742f 100644 --- a/src/common/redirect-to.ts +++ b/src/common/redirect-to.ts @@ -7,23 +7,26 @@ import { Config } from './config'; const REDIRECT_TO_KEY = 'redirectTo'; export const storeRedirects = () => { - if (window.location.href.indexOf(REDIRECT_TO_KEY) > -1) { - const { location: { href }, sessionStorage } = window; - const redirectUrl = href.split(`${REDIRECT_TO_KEY}=`)[1]; + let redirectUrl; + const { location: { href }, localStorage } = window; - if (sessionStorage) { - sessionStorage.setItem(REDIRECT_TO_KEY, redirectUrl); - } + if (href.indexOf(REDIRECT_TO_KEY) > -1) { + redirectUrl = href.split(`${REDIRECT_TO_KEY}=`)[1]; + } + + if (localStorage && redirectUrl) { + localStorage.setItem(REDIRECT_TO_KEY, redirectUrl); } }; export const handleRedirects = (token: string, config: Config) => { - const { sessionStorage } = window; + const { localStorage } = window; const { keepWebServiceUrl } = config; - if (sessionStorage && sessionStorage.getItem(REDIRECT_TO_KEY)) { - const redirectUrl = sessionStorage.getItem(REDIRECT_TO_KEY); - sessionStorage.removeItem(REDIRECT_TO_KEY); + if (localStorage && localStorage.getItem(REDIRECT_TO_KEY)) { + const redirectUrl = localStorage.getItem(REDIRECT_TO_KEY); + localStorage.removeItem(REDIRECT_TO_KEY); + if (redirectUrl) { const sep = redirectUrl.indexOf("?") > -1 ? "&" : "?"; window.location.href = `${keepWebServiceUrl}${redirectUrl}${sep}api_token=${token}`;