wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-28 19:25:36 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Allow convert guest to user via invite link (#7014)

Browse Source
This commit is contained in:
Denis Bykhov 2024-10-22 19:43:33 +05:00 committed by GitHub
parent afcc25beca
commit c7fb3bdb98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1786,6 +1786,9 @@ async function createPersonAccount (
personAccountId personAccountId
) )
} else { } else {
if (roleOrder[existingAccount.role] < roleOrder[role]) {
await ops.update(existingAccount, { role })
}
const person = await ops.findOne(contact.class.Person, { _id: existingAccount.person }) const person = await ops.findOne(contact.class.Person, { _id: existingAccount.person })
if (person === undefined) { if (person === undefined) {
// Employee was deleted, let's restore it. // Employee was deleted, let's restore it.
@ -1794,10 +1797,16 @@ async function createPersonAccount (
await ops.updateDoc(contact.class.PersonAccount, existingAccount.space, existingAccount._id, { await ops.updateDoc(contact.class.PersonAccount, existingAccount.space, existingAccount._id, {
person: employeeId person: employeeId
}) })
} else if (ops.getHierarchy().hasMixin(person, contact.mixin.Employee)) { } else if (shouldCreateEmployee) {
const employee = ops.getHierarchy().as(person, contact.mixin.Employee) if (ops.getHierarchy().hasMixin(person, contact.mixin.Employee)) {
if (!employee.active) { const employee = ops.getHierarchy().as(person, contact.mixin.Employee)
await ops.update(employee, { if (!employee.active) {
await ops.update(employee, {
active: true
})
}
} else {
await ops.createMixin(person._id, contact.class.Person, contact.space.Contacts, contact.mixin.Employee, {
active: true active: true
}) })
} }