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

Merge branch 'staging' into develop
Some checks are pending
CI / build (push) Waiting to run
Details
CI / svelte-check (push) Blocked by required conditions
Details
CI / formatting (push) Blocked by required conditions
Details
CI / test (push) Blocked by required conditions
Details
CI / uitest (push) Waiting to run
Details
CI / uitest-pg (push) Waiting to run
Details
CI / uitest-qms (push) Waiting to run
Details
CI / docker-build (push) Blocked by required conditions
Details
CI / dist-build (push) Blocked by required conditions
Details

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-02-06 16:58:50 +07:00
commit 3c2735d870
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/api-client/src/client.ts
View File

@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
import { getClient as getAccountClient } from '@hcengineering/account-client'
import client, { clientId } from '@hcengineering/client'
import { import {
type Class, type Class,
type Client, type Client,
@ -24,23 +26,21 @@ import {
type ModelDb, type ModelDb,
type Ref, type Ref,
type Space, type Space,
type WithLookup,
type TxResult, type TxResult,
DocumentUpdate, type WithLookup,
TxOperations,
AttachedDoc,
AttachedData, AttachedData,
AttachedDoc,
DocumentUpdate,
Mixin, Mixin,
MixinUpdate,
MixinData, MixinData,
generateId, MixinUpdate,
PersonId, PersonId,
TxOperations,
WorkspaceUuid,
buildSocialIdString, buildSocialIdString,
WorkspaceUuid generateId
} from '@hcengineering/core' } from '@hcengineering/core'
import client, { clientId } from '@hcengineering/client'
import { addLocation, getResource } from '@hcengineering/platform' import { addLocation, getResource } from '@hcengineering/platform'
import { getClient as getAccountClient } from '@hcengineering/account-client'
import { type ServerConfig, loadServerConfig } from './config' import { type ServerConfig, loadServerConfig } from './config'
import { import {
@ -50,7 +50,7 @@ import {
MarkupContent, MarkupContent,
createMarkupOperations createMarkupOperations
} from './markup' } from './markup'
import { type PlatformClient, type ConnectOptions, WithMarkup } from './types' import { type ConnectOptions, type PlatformClient, WithMarkup } from './types'
/** /**
* Create platform client * Create platform client
@ -292,7 +292,7 @@ async function getWorkspaceToken (
url: string, url: string,
options: ConnectOptions, options: ConnectOptions,
config?: ServerConfig config?: ServerConfig
): Promise<{ endpoint: string, token: string }> { ): Promise<{ endpoint: string, token: string, workspaceId: string }> {
config ??= await loadServerConfig(url) config ??= await loadServerConfig(url)
let token: string | undefined let token: string | undefined
@ -314,5 +314,5 @@ async function getWorkspaceToken (
throw new Error('Workspace not found') throw new Error('Workspace not found')
} }
return { endpoint: ws.endpoint, token: ws.token } return { endpoint: ws.endpoint, token: ws.token, workspaceId: ws.workspace }
} }

1
packages/api-client/src/types.ts
View File

@ -16,6 +16,7 @@
import { type ClientSocketFactory } from '@hcengineering/client' import { type ClientSocketFactory } from '@hcengineering/client'
import { import {
CollaborativeDoc, CollaborativeDoc,
type Account,
type AttachedData, type AttachedData,
type AttachedDoc, type AttachedDoc,
type Class, type Class,