github/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2026-01-07 22:53:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve findAllMyAccounts query

Browse Source
This commit is contained in:
Carlos Monastyrski
2025-12-19 16:30:27 -03:00
parent 78ed6b4bd6
commit 7453cfb7f6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/services/auth/auth-signup-service.ts
View File

@@ -185,14 +185,14 @@ export const authSignupServiceFactory = ({
}, },
{ tx } { tx }
); );
const duplicateUserIds = duplicateUsers const nonAcceptedDuplicateUserIds = duplicateUsers
.filter((duplicateUser) => duplicateUser.id !== user.id) .filter((duplicateUser) => duplicateUser.id !== user.id)
.map((duplicateUser) => duplicateUser.id); .map((duplicateUser) => duplicateUser.id);
if (duplicateUserIds.length > 0) { if (nonAcceptedDuplicateUserIds.length > 0) {
await userDAL.delete( await userDAL.delete(
{ {
$in: { $in: {
id: duplicateUserIds id: nonAcceptedDuplicateUserIds
} }
}, },
tx tx
@@ -370,14 +370,14 @@ export const authSignupServiceFactory = ({
}, },
{ tx } { tx }
); );
const duplicateUserIds = duplicateUsers const nonAcceptedDuplicateUserIds = duplicateUsers
.filter((duplicateUser) => duplicateUser.id !== user.id) .filter((duplicateUser) => duplicateUser.id !== user.id)
.map((duplicateUser) => duplicateUser.id); .map((duplicateUser) => duplicateUser.id);
if (duplicateUserIds.length > 0) { if (nonAcceptedDuplicateUserIds.length > 0) {
await userDAL.delete( await userDAL.delete(
{ {
$in: { $in: {
id: duplicateUserIds id: nonAcceptedDuplicateUserIds
} }
}, },
tx tx

6
backend/src/services/user/user-dal.ts
View File

@@ -198,7 +198,11 @@ export const userDALFactory = (db: TDbClient) => {
try { try {
const doc = await db(TableName.Users) const doc = await db(TableName.Users)
.where({ email }) .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`) .leftJoin(TableName.Organization, `${TableName.Organization}.id`, `${TableName.Membership}.scopeOrgId`)
.select(selectAllTableCols(TableName.Users)) .select(selectAllTableCols(TableName.Users))
.select( .select(