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

fix builder assignment issue

This commit is contained in:
Peter Clement 2022-07-25 17:18:42 +01:00
parent 9e4e005dcb
commit caa06e5772
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/worker/src/sdk/users/users.ts
View File

@ -100,7 +100,6 @@ export const buildUser = async (
opts: SaveUserOpts = { opts: SaveUserOpts = {
hashPassword: true, hashPassword: true,
requirePassword: true, requirePassword: true,
bulkCreate: false,
}, },
tenantId: string, tenantId: string,
dbUser?: any dbUser?: any
@ -116,16 +115,16 @@ export const buildUser = async (
} }
_id = _id || dbUtils.generateGlobalUserID() _id = _id || dbUtils.generateGlobalUserID()
user = { user = {
createdAt: Date.now(), createdAt: Date.now(),
...dbUser,
...user, ...user,
...(dbUser && {
...dbUser,
}),
_id, _id,
password: hashedPassword, password: hashedPassword,
tenantId, tenantId,
} }
// make sure the roles object is always present // make sure the roles object is always present
if (!user.roles) { if (!user.roles) {
user.roles = {} user.roles = {}
@ -184,7 +183,6 @@ export const save = async (
{ {
hashPassword: true, hashPassword: true,
requirePassword: user.requirePassword, requirePassword: user.requirePassword,
bulkCreate: true,
}, },
tenantId, tenantId,
dbUser dbUser