From ce7fc92e567d0c91bc628041b380fbcbcd6d712b Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Fri, 12 Apr 2024 11:17:37 +0500 Subject: [PATCH] Clean LastToken when relogin (#5303) Signed-off-by: Denis Bykhov --- plugins/login-resources/src/actions.ts | 5 +++++ .../src/components/SelectWorkspace.svelte | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/login-resources/src/actions.ts b/plugins/login-resources/src/actions.ts index 4a0bab82bc..7dbb32e473 100644 --- a/plugins/login-resources/src/actions.ts +++ b/plugins/login-resources/src/actions.ts @@ -1,6 +1,9 @@ import { goTo } from './utils' import login from './plugin' import { type BottomAction } from '.' +import { setMetadataLocalStorage } from '@hcengineering/ui' +import { setMetadata } from '@hcengineering/platform' +import presentation from '@hcengineering/presentation' export const signUpAction: BottomAction = { caption: login.string.DoNotHaveAnAccount, @@ -16,6 +19,8 @@ export const loginAction: BottomAction = { i18n: login.string.LogIn, page: 'login', func: () => { + setMetadata(presentation.metadata.Token, null) + setMetadataLocalStorage(login.metadata.LastToken, null) goTo('login', true) } } diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte index d585453da9..a0bd2ee07d 100644 --- a/plugins/login-resources/src/components/SelectWorkspace.svelte +++ b/plugins/login-resources/src/components/SelectWorkspace.svelte @@ -84,6 +84,7 @@ flagToUpdateWorkspaces = true await updateWorkspaces() } catch (err: any) { + setMetadataLocalStorage(login.metadata.LastToken, null) setMetadataLocalStorage(presentation.metadata.Token, null) setMetadataLocalStorage(login.metadata.LoginEndpoint, null) setMetadataLocalStorage(login.metadata.LoginEmail, null) @@ -160,7 +161,16 @@ {/if}
- + { + setMetadataLocalStorage(login.metadata.LastToken, null) + setMetadataLocalStorage(presentation.metadata.Token, null) + setMetadataLocalStorage(login.metadata.LoginEndpoint, null) + setMetadataLocalStorage(login.metadata.LoginEmail, null) + goTo('login') + }}>
{/await}