wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-14 19:36:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

UBERF-9714: Support subsecutive meeting joins (#8421)

Browse Source 
* uberf-9714: support subsecutive meeting joins
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>

* uberf-9714: fix unit test
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev 2025-04-01 18:43:53 +04:00 committed by GitHub
parent addd09cc52
commit 0341b69395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/account/src/__tests__/postgres.test.ts
View File

@ -244,6 +244,7 @@ describe('AccountPostgresDbCollection', () => {
a.uuid, a.uuid,
a.timezone, a.timezone,
a.locale, a.locale,
a.automatic,
p.hash, p.hash,
p.salt p.salt
FROM global_account.account as a FROM global_account.account as a

1
server/account/src/collections/postgres.ts
View File

@ -316,6 +316,7 @@ export class AccountPostgresDbCollection
a.uuid, a.uuid,
a.timezone, a.timezone,
a.locale, a.locale,
a.automatic,
p.hash, p.hash,
p.salt p.salt
FROM ${this.getTableName()} as a FROM ${this.getTableName()} as a

2
server/account/src/operations.ts
View File

@ -766,6 +766,7 @@ export async function checkAutoJoin (
if (emailSocialId != null) { if (emailSocialId != null) {
const targetAccount = await getAccount(db, emailSocialId.personUuid) const targetAccount = await getAccount(db, emailSocialId.personUuid)
if (targetAccount != null) { if (targetAccount != null) {
if (targetAccount.automatic == null || !targetAccount.automatic) {
if (token == null) { if (token == null) {
// Login required // Login required
const person = await db.person.findOne({ uuid: targetAccount.uuid }) const person = await db.person.findOne({ uuid: targetAccount.uuid })
@ -789,6 +790,7 @@ export async function checkAutoJoin (
email: normalizedEmail email: normalizedEmail
} }
} }
}
const targetRole = await getWorkspaceRole(db, targetAccount.uuid, workspace.uuid) const targetRole = await getWorkspaceRole(db, targetAccount.uuid, workspace.uuid)