diff --git a/backend/src/services/auth/auth-signup-service.ts b/backend/src/services/auth/auth-signup-service.ts index 0007f24475..b102ed4eb5 100644 --- a/backend/src/services/auth/auth-signup-service.ts +++ b/backend/src/services/auth/auth-signup-service.ts @@ -185,14 +185,14 @@ export const authSignupServiceFactory = ({ }, { tx } ); - const duplicateUserIds = duplicateUsers + const nonAcceptedDuplicateUserIds = duplicateUsers .filter((duplicateUser) => duplicateUser.id !== user.id) .map((duplicateUser) => duplicateUser.id); - if (duplicateUserIds.length > 0) { + if (nonAcceptedDuplicateUserIds.length > 0) { await userDAL.delete( { $in: { - id: duplicateUserIds + id: nonAcceptedDuplicateUserIds } }, tx @@ -370,14 +370,14 @@ export const authSignupServiceFactory = ({ }, { tx } ); - const duplicateUserIds = duplicateUsers + const nonAcceptedDuplicateUserIds = duplicateUsers .filter((duplicateUser) => duplicateUser.id !== user.id) .map((duplicateUser) => duplicateUser.id); - if (duplicateUserIds.length > 0) { + if (nonAcceptedDuplicateUserIds.length > 0) { await userDAL.delete( { $in: { - id: duplicateUserIds + id: nonAcceptedDuplicateUserIds } }, tx diff --git a/backend/src/services/user/user-dal.ts b/backend/src/services/user/user-dal.ts index eecc256299..88cd1a7347 100644 --- a/backend/src/services/user/user-dal.ts +++ b/backend/src/services/user/user-dal.ts @@ -198,7 +198,11 @@ export const userDALFactory = (db: TDbClient) => { try { const doc = await db(TableName.Users) .where({ email }) - .leftJoin(TableName.Membership, `${TableName.Membership}.actorUserId`, `${TableName.Users}.id`) + .leftJoin(TableName.Membership, (qb) => { + void qb + .on(`${TableName.Membership}.actorUserId`, `${TableName.Users}.id`) + .andOn(`${TableName.Membership}.scope`, db.raw("?", [AccessScope.Organization])); + }) .leftJoin(TableName.Organization, `${TableName.Organization}.id`, `${TableName.Membership}.scopeOrgId`) .select(selectAllTableCols(TableName.Users)) .select(