Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
feat: change dals to take into account migrated policies and requests
adilson2f27d58d90c4
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.tsindex 80f00b79e8..2f65d28fec 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts@@ -398,6 +398,12 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPoconst result = await tx(TableName.AccessApprovalPolicy)// eslint-disable-next-line.where(buildFindFilter(filter))+ .whereNotExists((qb) => {+ void qb+ .select(db.raw("1"))+ .from(TableName.ApprovalPolicies)+ .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);+ }).where((qb) => {if (customFilter?.policyId) {void qb.where(`${TableName.AccessApprovalPolicy}.id`, "=", customFilter.policyId);diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.tsindex f0d8079cf0..1b86bcd77f 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts@@ -21,6 +21,12 @@ export const accessApprovalPolicyEnvironmentDALFactory = (db: TDbClient) => {// eslint-disable-next-line @typescript-eslint/no-misused-promises.where(buildFindFilter({ envId }, TableName.AccessApprovalPolicyEnvironment)).whereNull(`${TableName.AccessApprovalPolicy}.deletedAt`)+ .whereNotExists((qb) => {+ void qb+ .select(db.raw("1"))+ .from(TableName.ApprovalPolicies)+ .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);+ }).select(selectAllTableCols(TableName.AccessApprovalPolicyEnvironment));return docs;} catch (error) {diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts b/backend/src/ee/services/access-approval-request/access-approval-request-dal.tsindex 877768df22..a9ef167db5 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts@@ -278,6 +278,12 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalRconst docs = await db.replicaNode()(TableName.AccessApprovalRequest).whereIn(`${TableName.AccessApprovalRequest}.policyId`, policyIds)+ .whereNotExists((qb) => {+ void qb+ .select(db.raw("1"))+ .from(TableName.ApprovalRequests)+ .whereRaw(`"${TableName.ApprovalRequests}"."id" = "${TableName.AccessApprovalRequest}"."id"`);+ }).leftJoin(TableName.AdditionalPrivilege,`${TableName.AccessApprovalRequest}.privilegeId`,@@ -904,6 +910,12 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR`${TableName.AccessApprovalRequestReviewer}.requestId`).where(`${TableName.Environment}.projectId`, projectId)+ .whereNotExists((qb) => {+ void qb+ .select(db.raw("1"))+ .from(TableName.ApprovalRequests)+ .whereRaw(`"${TableName.ApprovalRequests}"."id" = "${TableName.AccessApprovalRequest}"."id"`);+ }).where((qb) => {if (policyId) {void qb.where(`${TableName.AccessApprovalPolicy}.id`, policyId);diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.tsindex a8efdd26ec..ab9fc92f95 100644--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts@@ -575,6 +575,11 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({);await approvalPolicyDAL.deleteById(policy.id, tx);++ const legacyPolicy = await accessApprovalPolicyDAL.findOne({ id: policy.id }, tx);+ if (legacyPolicy && !legacyPolicy.deletedAt) {+ await accessApprovalPolicyDAL.softDeleteById(policy.id, tx);+ }});return policy;diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.tsindex 77baa3a211..68ec543d58 100644--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts@@ -33,7 +33,10 @@ export type TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep = {projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;userDAL: Pick<TUserDALFactory, "find">;groupDAL: Pick<TGroupDALFactory, "find">;- accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;+ accessApprovalPolicyDAL: Pick<+ TAccessApprovalPolicyDALFactory,+ "findPolicyByEnvIdAndSecretPath" | "findOne" | "softDeleteById"+ >;approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;