awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-04 20:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update org-dal.ts

Browse Source
This commit is contained in:
Daniel Hougaard
2024-08-23 02:25:15 +04:00
parent fbf3f26abd
commit 783d4c7bd6
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/org/org-dal.ts
+16 -15
View File
@@ -114,10 +114,11 @@ export const orgDALFactory = (db: TDbClient) => {
} }
}; };
const findOrgMembersByUsername = async (orgId: string, usernames: string[]) => { const findOrgMembersByUsername = async (orgId: string, usernames: string[], tx?: Knex) => {
try { try {
const members = await db const conn = tx || db;
.replicaNode()(TableName.OrgMembership) const members = await conn(TableName.OrgMembership)
// .replicaNode()(TableName.OrgMembership)
.where(`${TableName.OrgMembership}.orgId`, orgId) .where(`${TableName.OrgMembership}.orgId`, orgId)
.join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`) .join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
.leftJoin<TUserEncryptionKeys>( .leftJoin<TUserEncryptionKeys>(
@@ -126,18 +127,18 @@ export const orgDALFactory = (db: TDbClient) => {
`${TableName.Users}.id` `${TableName.Users}.id`
) )
.select( .select(
db.ref("id").withSchema(TableName.OrgMembership), conn.ref("id").withSchema(TableName.OrgMembership),
db.ref("inviteEmail").withSchema(TableName.OrgMembership), conn.ref("inviteEmail").withSchema(TableName.OrgMembership),
db.ref("orgId").withSchema(TableName.OrgMembership), conn.ref("orgId").withSchema(TableName.OrgMembership),
db.ref("role").withSchema(TableName.OrgMembership), conn.ref("role").withSchema(TableName.OrgMembership),
db.ref("roleId").withSchema(TableName.OrgMembership), conn.ref("roleId").withSchema(TableName.OrgMembership),
db.ref("status").withSchema(TableName.OrgMembership), conn.ref("status").withSchema(TableName.OrgMembership),
db.ref("username").withSchema(TableName.Users), conn.ref("username").withSchema(TableName.Users),
db.ref("email").withSchema(TableName.Users), conn.ref("email").withSchema(TableName.Users),
db.ref("firstName").withSchema(TableName.Users), conn.ref("firstName").withSchema(TableName.Users),
db.ref("lastName").withSchema(TableName.Users), conn.ref("lastName").withSchema(TableName.Users),
db.ref("id").withSchema(TableName.Users).as("userId"), conn.ref("id").withSchema(TableName.Users).as("userId"),
db.ref("publicKey").withSchema(TableName.UserEncryptionKey) conn.ref("publicKey").withSchema(TableName.UserEncryptionKey)
) )
.where({ isGhost: false }) .where({ isGhost: false })
.whereIn("username", usernames); .whereIn("username", usernames);