awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-19 00:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated "defaultOrgId" and "defaultOrgSlug" to "defaultAuthOrgId" and "defaultAuthOrgSlug"

Browse Source
This commit is contained in:
Daniel Hougaard
2024-06-24 19:10:22 +02:00
parent 91bdd7ea6a
commit 2d98560255
11 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/super-admin/super-admin-dal.ts
+4 -4
View File
@@ -10,17 +10,17 @@ export const superAdminDALFactory = (db: TDbClient) => {
const findById = async (id: string) => {
const config = await db(TableName.SuperAdmin)
.where(`${TableName.SuperAdmin}.id`, id)
.leftJoin(TableName.Organization, `${TableName.SuperAdmin}.defaultOrgId`, `${TableName.Organization}.id`)
.leftJoin(TableName.Organization, `${TableName.SuperAdmin}.defaultAuthOrgId`, `${TableName.Organization}.id`)
.select(
db.ref("*").withSchema(TableName.SuperAdmin) as unknown as keyof TSuperAdmin,
db.ref("slug").withSchema(TableName.Organization).as("defaultOrgSlug")
db.ref("slug").withSchema(TableName.Organization).as("defaultAuthOrgSlug")
)
.first();
return {
defaultOrgSlug: config?.defaultOrgSlug || null,
defaultAuthOrgSlug: config?.defaultAuthOrgSlug || null,
...config
} as TSuperAdmin & { defaultOrgSlug: string | null };
} as TSuperAdmin & { defaultAuthOrgSlug: string | null };
};
return {