WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-29 04:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dont allow reactivate merged accounts (#2714)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov
2023-03-06 22:43:46 +07:00
committed by GitHub
parent 3179d122b8
commit b480552d3f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/account/src/index.ts
+10 -4
View File
@@ -74,6 +74,7 @@ const accountPlugin = plugin(accountId, {
WorkspaceNotFound: '' as StatusCode<{ workspace: string }>,
InvalidPassword: '' as StatusCode<{ account: string }>,
AccountAlreadyExists: '' as StatusCode<{ account: string }>,
AccountWasMerged: '' as StatusCode<{ account: string }>,
WorkspaceAlreadyExists: '' as StatusCode<{ workspace: string }>,
ProductIdMismatch: '' as StatusCode<{ productId: string }>
},
@@ -556,15 +557,15 @@ export async function setRole (email: string, workspace: string, productId: stri
*/
export async function assignWorkspace (db: Db, productId: string, email: string, workspace: string): Promise<void> {
const { workspaceId, accountId } = await getWorkspaceAndAccount(db, productId, email, workspace)
const account = await db.collection<Account>(ACCOUNT_COLLECTION).findOne({ _id: accountId })
if (account !== null) await createEmployeeAccount(account, productId, workspace)
// Add account into workspace.
await db.collection(WORKSPACE_COLLECTION).updateOne({ _id: workspaceId }, { $addToSet: { accounts: accountId } })
// Add workspace to account
await db.collection(ACCOUNT_COLLECTION).updateOne({ _id: accountId }, { $addToSet: { workspaces: workspaceId } })
const account = await db.collection<Account>(ACCOUNT_COLLECTION).findOne({ _id: accountId })
if (account !== null) await createEmployeeAccount(account, productId, workspace)
}
async function createEmployee (ops: TxOperations, name: string, email: string): Promise<Ref<Employee>> {
@@ -618,6 +619,11 @@ async function createEmployeeAccount (account: Account, productId: string, works
employee: employeeId
})
} else if (!employee.active) {
if (employee.mergedTo !== undefined) {
throw new PlatformError(
new Status(Severity.ERROR, accountPlugin.status.AccountWasMerged, { account: account.email })
)
}
await ops.update(employee, {
active: true
})