wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-05 15:24:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix select workspace logout (#4760)

Browse Source
This commit is contained in:
Denis Bykhov 2024-02-23 18:52:00 +06:00 committed by GitHub
parent ffc8d1dfac
commit a7d065baf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
View File

@ -48,18 +48,6 @@
} }
async function clickHandler (e: MouseEvent, ws: string): Promise<void> { async function clickHandler (e: MouseEvent, ws: string): Promise<void> {
if (ws !== getCurrentLocation().path[1]) {
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
const token = tokens[ws]
if (!token) {
const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = (await selectWorkspace(ws))[1]
if (loginInfo !== undefined) {
tokens[ws] = loginInfo?.token
}
setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
}
}
if (!e.metaKey && !e.ctrlKey) { if (!e.metaKey && !e.ctrlKey) {
e.preventDefault() e.preventDefault()
closePopup() closePopup()

11
plugins/workbench-resources/src/connect.ts
View File

@ -51,7 +51,16 @@ export async function connect (title: string): Promise<Client | undefined> {
} }
} }
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {} const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
const token = tokens[ws] let token = tokens[ws]
if (token === undefined) {
const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = (await selectWorkspace(ws))[1]
if (loginInfo !== undefined) {
tokens[ws] = loginInfo.token
token = loginInfo.token
setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
}
}
setMetadata(presentation.metadata.Token, token) setMetadata(presentation.metadata.Token, token)
document.cookie = document.cookie =
encodeURIComponent(presentation.metadata.Token.replaceAll(':', '-')) + '=' + encodeURIComponent(token) + '; path=/' encodeURIComponent(presentation.metadata.Token.replaceAll(':', '-')) + '=' + encodeURIComponent(token) + '; path=/'