mirror of
https://github.com/hcengineering/platform.git
synced 2026-09-12 12:47:45 +02:00
Create workspace docker compose fix (#800)
Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
import workbench from '@anticrm/workbench'
|
||||
import InviteLink from './InviteLink.svelte'
|
||||
|
||||
const fields = [{ name: 'workspace', i18n: login.string.Workspace, rule: /^\S+$/ }]
|
||||
const fields = [{ name: 'workspace', i18n: login.string.Workspace, rule: /^[0-9a-z#%&^\-@!\()]{3,63}$/ }]
|
||||
|
||||
const object = {
|
||||
workspace: ''
|
||||
|
||||
@@ -159,6 +159,19 @@ export async function getWorkspaces (): Promise<Workspace[]> {
|
||||
throw new Error('accounts url not specified')
|
||||
}
|
||||
|
||||
const overrideToken = getMetadata(login.metadata.OverrideLoginToken)
|
||||
if (overrideToken !== undefined) {
|
||||
const endpoint = getMetadata(login.metadata.OverrideEndpoint)
|
||||
if (endpoint !== undefined) {
|
||||
return [{
|
||||
_id: '' as any,
|
||||
workspace: 'DEV WORKSPACE',
|
||||
organisation: '',
|
||||
accounts: []
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
||||
const token = fetchMetadataLocalStorage(login.metadata.LoginToken)
|
||||
if (token === null) {
|
||||
const loc = getCurrentLocation()
|
||||
@@ -197,6 +210,15 @@ export async function selectWorkspace (workspace: string): Promise<[Status, Logi
|
||||
throw new Error('accounts url not specified')
|
||||
}
|
||||
|
||||
const overrideToken = getMetadata(login.metadata.OverrideLoginToken)
|
||||
const email = getMetadata(login.metadata.LoginEmail) ?? ''
|
||||
if (overrideToken !== undefined) {
|
||||
const endpoint = getMetadata(login.metadata.OverrideEndpoint)
|
||||
if (endpoint !== undefined) {
|
||||
return [OK, { token: overrideToken, endpoint, email }]
|
||||
}
|
||||
}
|
||||
|
||||
const token = fetchMetadataLocalStorage(login.metadata.LoginToken)
|
||||
if (token === null) {
|
||||
const loc = getCurrentLocation()
|
||||
|
||||
Reference in New Issue
Block a user