wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-11 01:40:32 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

uberf-9691: expose full social ids in own account (#8340)

Browse Source 
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev 2025-03-25 13:48:28 +04:00 committed by GitHub
parent 3d9c9aa8b7
commit b37c119628
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/src/classes.ts
View File

@ -74,6 +74,7 @@ export interface Account {
role: AccountRole role: AccountRole
primarySocialId: PersonId primarySocialId: PersonId
socialIds: PersonId[] socialIds: PersonId[]
fullSocialIds: SocialId[]
} }
/** /**

3
packages/core/src/component.ts
View File

@ -90,7 +90,8 @@ export const systemAccount: Account = {
uuid: systemAccountUuid, uuid: systemAccountUuid,
role: AccountRole.Owner, role: AccountRole.Owner,
primarySocialId: '' as PersonId, primarySocialId: '' as PersonId,
socialIds: [] socialIds: [],
fullSocialIds: []
} }
export const configUserAccountUuid = '0d94731c-0787-4bcd-aefe-304efc3706b1' as AccountUuid export const configUserAccountUuid = '0d94731c-0787-4bcd-aefe-304efc3706b1' as AccountUuid

3
plugins/guest-resources/src/connect.ts
View File

@ -185,7 +185,8 @@ export async function connect (title: string): Promise<Client | undefined> {
uuid: account, uuid: account,
role: workspaceLoginInfo.role, role: workspaceLoginInfo.role,
primarySocialId: '' as PersonId, primarySocialId: '' as PersonId,
socialIds: [] socialIds: [],
fullSocialIds: []
} }
if (me !== undefined) { if (me !== undefined) {

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

@ -348,7 +348,8 @@ export async function connect (title: string): Promise<Client | undefined> {
uuid: account, uuid: account,
role: workspaceLoginInfo.role, role: workspaceLoginInfo.role,
primarySocialId: pickPrimarySocialId(socialIds)._id, primarySocialId: pickPrimarySocialId(socialIds)._id,
socialIds: socialIds.map((si) => si._id) socialIds: socialIds.map((si) => si._id),
fullSocialIds: socialIds
} }
// Ensure employee and social identifiers // Ensure employee and social identifiers

9
server/server/src/sessionManager.ts
View File

@ -339,7 +339,8 @@ export class TSessionManager implements SessionManager {
uuid: loginInfo.account, uuid: loginInfo.account,
role: loginInfo.role, role: loginInfo.role,
primarySocialId: '' as PersonId, primarySocialId: '' as PersonId,
socialIds: [] socialIds: [],
fullSocialIds: []
} }
} }
@ -348,7 +349,8 @@ export class TSessionManager implements SessionManager {
uuid: loginInfo.account, uuid: loginInfo.account,
role: loginInfo.role, role: loginInfo.role,
primarySocialId: core.account.System, primarySocialId: core.account.System,
socialIds: [] socialIds: [core.account.System],
fullSocialIds: []
} }
} }
@ -358,7 +360,8 @@ export class TSessionManager implements SessionManager {
uuid: loginInfo.account, uuid: loginInfo.account,
role: loginInfo.role, role: loginInfo.role,
primarySocialId: pickPrimarySocialId(socialIds)._id, primarySocialId: pickPrimarySocialId(socialIds)._id,
socialIds: socialIds.map((si) => si._id) socialIds: socialIds.map((si) => si._id),
fullSocialIds: socialIds
} }
} catch (err: any) { } catch (err: any) {
if (err?.cause?.code === 'ECONNRESET' || err?.cause?.code === 'ECONNREFUSED') { if (err?.cause?.code === 'ECONNRESET' || err?.cause?.code === 'ECONNREFUSED') {

3
services/ai-bot/pod-ai-bot/src/workspace/workspaceClient.ts
View File

@ -111,7 +111,8 @@ export class WorkspaceClient {
uuid: this.personUuid, uuid: this.personUuid,
role: AccountRole.User, role: AccountRole.User,
primarySocialId: this.primarySocialId._id, primarySocialId: this.primarySocialId._id,
socialIds: this.socialIds.map((it) => it._id) socialIds: this.socialIds.map((it) => it._id),
fullSocialIds: this.socialIds
} }
await ensureEmployee(this.ctx, me, client, this.socialIds, async () => await getGlobalPerson(this.token)) await ensureEmployee(this.ctx, me, client, this.socialIds, async () => await getGlobalPerson(this.token))
} }

6
ws-tests/api-tests/src/__tests__/rest.test.ts
View File

@ -78,7 +78,8 @@ describe('rest-api-server', () => {
uuid: apiWorkspace1.info.account, uuid: apiWorkspace1.info.account,
role: apiWorkspace1.info.role, role: apiWorkspace1.info.role,
primarySocialId: pickPrimarySocialId(socialIds)._id, primarySocialId: pickPrimarySocialId(socialIds)._id,
socialIds: socialIds.map((si) => si._id) socialIds: socialIds.map((si) => si._id),
fullSocialIds: socialIds
}, },
connect(), connect(),
socialIds, socialIds,
@ -91,7 +92,8 @@ describe('rest-api-server', () => {
uuid: apiWorkspace2.info.account, uuid: apiWorkspace2.info.account,
role: apiWorkspace2.info.role, role: apiWorkspace2.info.role,
primarySocialId: pickPrimarySocialId(socialIds)._id, primarySocialId: pickPrimarySocialId(socialIds)._id,
socialIds: socialIds.map((si) => si._id) socialIds: socialIds.map((si) => si._id),
fullSocialIds: socialIds
}, },
connect(apiWorkspace2), connect(apiWorkspace2),
socialIds, socialIds,