wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-20 15:20:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor login fixes (#4892)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-03-07 13:14:43 +06:00 committed by GitHub
parent 734177f3ea
commit 517f5a85d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/login-resources/src/utils.ts
View File

@ -313,6 +313,7 @@ export async function selectWorkspace (workspace: string): Promise<[Status, Work
const token = getMetadata(presentation.metadata.Token) const token = getMetadata(presentation.metadata.Token)
if (token === undefined) { if (token === undefined) {
const loc = getCurrentLocation() const loc = getCurrentLocation()
loc.path[0] = 'login'
loc.path[1] = 'login' loc.path[1] = 'login'
loc.path.length = 2 loc.path.length = 2
navigate(loc) navigate(loc)

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

@ -52,7 +52,7 @@ 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) ?? {}
let token = tokens[ws] let token = tokens[ws]
if (token === undefined) { if (token === undefined && getMetadata(presentation.metadata.Token) !== undefined) {
const selectWorkspace = await getResource(login.function.SelectWorkspace) const selectWorkspace = await getResource(login.function.SelectWorkspace)
const loginInfo = (await selectWorkspace(ws))[1] const loginInfo = (await selectWorkspace(ws))[1]
if (loginInfo !== undefined) { if (loginInfo !== undefined) {
@ -67,11 +67,11 @@ export async function connect (title: string): Promise<Client | undefined> {
const endpoint = fetchMetadataLocalStorage(login.metadata.LoginEndpoint) const endpoint = fetchMetadataLocalStorage(login.metadata.LoginEndpoint)
const email = fetchMetadataLocalStorage(login.metadata.LoginEmail) const email = fetchMetadataLocalStorage(login.metadata.LoginEmail)
if (token === undefined || endpoint === null || email === null) { if (token === undefined || endpoint === null || email === null) {
const navigateUrl = encodeURIComponent(JSON.stringify(loc))
navigate({ navigate({
path: [loginId], path: [loginId],
query: { navigateUrl: encodeURIComponent(JSON.stringify(loc)) } query: { navigateUrl }
}) })
return return
} }