Browse Source

refactor: add null check

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/9599/head
Pranav C 2 months ago
parent
commit
7f9f8ef4a5
  1. 6
      packages/nocodb/src/services/base-users/base-users.service.ts

6
packages/nocodb/src/services/base-users/base-users.service.ts

@ -114,13 +114,13 @@ export class BaseUsersService {
} }
// if already exists and has a role then throw error // if already exists and has a role then throw error
if (baseUser.is_mapped && baseUser?.roles) { if (baseUser?.is_mapped && baseUser?.roles) {
NcError.badRequest( NcError.badRequest(
`${user.email} with role ${baseUser.roles} already exists in this base`, `${user.email} with role ${baseUser.roles} already exists in this base`,
); );
} }
// if user exist and role is not assigned then assign role by updating base user // if user exist and role is not assigned then assign role by updating base user
else if (baseUser.is_mapped) { else if (baseUser?.is_mapped) {
await BaseUser.updateRoles( await BaseUser.updateRoles(
context, context,
param.baseId, param.baseId,
@ -472,7 +472,7 @@ export class BaseUsersService {
if (Object.keys(baseUserData).length) { if (Object.keys(baseUserData).length) {
// create new base user if it doesn't exist // create new base user if it doesn't exist
if ( if (
!(await BaseUser.get(context, param.baseId, param.user?.id)).is_mapped !(await BaseUser.get(context, param.baseId, param.user?.id))?.is_mapped
) { ) {
await BaseUser.insert(context, { await BaseUser.insert(context, {
...baseUserData, ...baseUserData,

Loading…
Cancel
Save