Browse Source
Merge pull request #2810 from Budibase/fix/save-user
Fix saveUser by adding same tenant check
gh-pages
Rory Powell
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
packages/worker/src/api/controllers/global/users.js
|
|
@ -59,7 +59,7 @@ async function saveUser( |
|
|
// check budibase users in other tenants
|
|
|
// check budibase users in other tenants
|
|
|
if (env.MULTI_TENANCY) { |
|
|
if (env.MULTI_TENANCY) { |
|
|
dbUser = await getTenantUser(email) |
|
|
dbUser = await getTenantUser(email) |
|
|
if (dbUser != null) { |
|
|
if (dbUser != null && dbUser.tenantId !== tenantId) { |
|
|
throw `Email address ${email} already in use.` |
|
|
throw `Email address ${email} already in use.` |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -67,7 +67,7 @@ async function saveUser( |
|
|
// check root account users in account portal
|
|
|
// check root account users in account portal
|
|
|
if (!env.SELF_HOSTED) { |
|
|
if (!env.SELF_HOSTED) { |
|
|
const account = await accounts.getAccount(email) |
|
|
const account = await accounts.getAccount(email) |
|
|
if (account && account.verified) { |
|
|
if (account && account.verified && account.tenantId !== tenantId) { |
|
|
throw `Email address ${email} already in use.` |
|
|
throw `Email address ${email} already in use.` |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
