Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

fix policy id get check

adilsond2b9bbf751dc
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
index 95ed8368df..306e8ecefb 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
@@ -21,7 +21,12 @@ export type TSecretAccessApprovalPolicyBridgeDALFactory = ReturnType<typeof secr
export const secretAccessApprovalPolicyBridgeDALFactory = (db: TDbClient) => {
const findSecretAccessPolicies = async (
- { policyId, projectId, envId }: { policyId?: string; projectId?: string; envId?: string },
+ {
+ policyId,
+ projectId,
+ envId,
+ organizationId
+ }: { policyId?: string; projectId?: string; envId?: string; organizationId?: string },
tx?: Knex
) => {
try {
@@ -30,6 +35,7 @@ export const secretAccessApprovalPolicyBridgeDALFactory = (db: TDbClient) => {
.where((qb) => {
if (policyId) void qb.where(`${TableName.ApprovalPolicies}.id`, policyId);
if (projectId) void qb.where(`${TableName.ApprovalPolicies}.projectId`, projectId);
+ if (organizationId) void qb.where(`${TableName.ApprovalPolicies}.organizationId`, organizationId);
})
.join(
TableName.ApprovalPolicySecretEnvironment,
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
index 9c4bc9ed6c..46735d603a 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
@@ -267,8 +267,8 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
return permission;
};
- const $findPolicyById = async (policyId: string, message: string) => {
- const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId });
+ const $findPolicyById = async (policyId: string, organizationId: string, message: string) => {
+ const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId, organizationId });
if (!policy) throw new NotFoundError({ message });
return policy;
};
@@ -407,7 +407,11 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
maxTimePeriod,
requestExpirationTime
}: TUpdateSecretAccessApprovalPolicyDTO) => {
- const policy = await $findPolicyById(policyId, `Access approval policy with ID '${policyId}' not found`);
+ const policy = await $findPolicyById(
+ policyId,
+ actorOrgId,
+ `Access approval policy with ID '${policyId}' not found`
+ );
const permission = await $getProjectPermission({
actor,
@@ -493,7 +497,11 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TDeleteSecretAccessApprovalPolicyDTO) => {
- const policy = await $findPolicyById(policyId, `Secret approval policy with ID '${policyId}' not found`);
+ const policy = await $findPolicyById(
+ policyId,
+ actorOrgId,
+ `Secret approval policy with ID '${policyId}' not found`
+ );
const permission = await $getProjectPermission({
actor,
@@ -544,7 +552,11 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TGetSecretAccessApprovalPolicyByIdDTO) => {
- const policy = await $findPolicyById(policyId, `Cannot find access approval policy with ID ${policyId}`);
+ const policy = await $findPolicyById(
+ policyId,
+ actorOrgId,
+ `Cannot find access approval policy with ID ${policyId}`
+ );
const permission = await $getProjectPermission({
actor,