Browse Source

fix builder assignment issue

pull/6571/head
Peter Clement 4 years ago
parent
commit
caa06e5772
  1. 8
      packages/worker/src/sdk/users/users.ts

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

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

Loading…
Cancel
Save