mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-20 10:23:57 +00:00
misc: allow org admins to bypass sso enforcement
This commit is contained in:
@@ -3,6 +3,7 @@ import { z } from "zod";
|
||||
import { TDbClient } from "@app/db";
|
||||
import {
|
||||
IdentityProjectMembershipRoleSchema,
|
||||
OrgMembershipRole,
|
||||
OrgMembershipsSchema,
|
||||
TableName,
|
||||
TProjectRoles,
|
||||
@@ -571,6 +572,11 @@ export const permissionDALFactory = (db: TDbClient) => {
|
||||
})
|
||||
.join<TProjects>(TableName.Project, `${TableName.Project}.id`, db.raw("?", [projectId]))
|
||||
.join(TableName.Organization, `${TableName.Project}.orgId`, `${TableName.Organization}.id`)
|
||||
.join(TableName.OrgMembership, (qb) => {
|
||||
void qb
|
||||
.on(`${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
|
||||
.andOn(`${TableName.OrgMembership}.orgId`, `${TableName.Organization}.id`);
|
||||
})
|
||||
.leftJoin(TableName.IdentityMetadata, (queryBuilder) => {
|
||||
void queryBuilder
|
||||
.on(`${TableName.Users}.id`, `${TableName.IdentityMetadata}.userId`)
|
||||
@@ -670,6 +676,7 @@ export const permissionDALFactory = (db: TDbClient) => {
|
||||
db.ref("key").withSchema(TableName.IdentityMetadata).as("metadataKey"),
|
||||
db.ref("value").withSchema(TableName.IdentityMetadata).as("metadataValue"),
|
||||
db.ref("authEnforced").withSchema(TableName.Organization).as("orgAuthEnforced"),
|
||||
db.ref("role").withSchema(TableName.OrgMembership).as("orgRole"),
|
||||
db.ref("orgId").withSchema(TableName.Project),
|
||||
db.ref("type").withSchema(TableName.Project).as("projectType"),
|
||||
db.ref("id").withSchema(TableName.Project).as("projectId"),
|
||||
@@ -683,6 +690,7 @@ export const permissionDALFactory = (db: TDbClient) => {
|
||||
orgId,
|
||||
username,
|
||||
orgAuthEnforced,
|
||||
orgRole,
|
||||
membershipId,
|
||||
groupMembershipId,
|
||||
membershipCreatedAt,
|
||||
@@ -694,6 +702,7 @@ export const permissionDALFactory = (db: TDbClient) => {
|
||||
}) => ({
|
||||
orgId,
|
||||
orgAuthEnforced,
|
||||
orgRole: orgRole as OrgMembershipRole,
|
||||
userId,
|
||||
projectId,
|
||||
username,
|
||||
|
||||
Reference in New Issue
Block a user