MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update existing user in account portal check to only check verified users - fix provision flow

This commit is contained in:
Rory Powell 2021-09-29 17:46:13 +01:00
parent 8aa192d1e8
commit 93d4ee4aad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/worker/src/api/controllers/global/users.js
View File

@ -53,22 +53,22 @@ async function saveUser(
// check budibase users inside the tenant // check budibase users inside the tenant
dbUser = await getGlobalUserByEmail(email) dbUser = await getGlobalUserByEmail(email)
if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) { if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) {
throw "Email address already in use." throw `Email address ${email} already in use.`
} }
// 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) {
throw "Email address already in use." throw `Email address ${email} already in use.`
} }
} }
// 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) { if (account?.verified) {
throw "Email address already in use." throw `Email address ${email} already in use.`
} }
} }
} else { } else {