From 3a38e1e41395459ada52b7f38c489f642380210f Mon Sep 17 00:00:00 2001 From: Meet Date: Mon, 23 Sep 2024 19:04:57 +0530 Subject: [PATCH] chore: refactor --- backend/src/ee/routes/v1/access-approval-policy-router.ts | 4 ++-- backend/src/ee/routes/v1/secret-approval-policy-router.ts | 4 ++-- .../secret-approval-request-service.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/ee/routes/v1/access-approval-policy-router.ts b/backend/src/ee/routes/v1/access-approval-policy-router.ts index 464d9df4c..f8abcee89 100644 --- a/backend/src/ee/routes/v1/access-approval-policy-router.ts +++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts @@ -20,7 +20,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi approvers: z .object({ type: z.nativeEnum(ApproverType), id: z.string() }) .array() - .min(1), + .min(1, { message: "At least one approver should be provided" }), approvals: z.number().min(1).default(1), enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard) }), @@ -129,7 +129,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi approvers: z .object({ type: z.nativeEnum(ApproverType), id: z.string() }) .array() - .min(1), + .min(1, { message: "At least one approver should be provided" }), approvals: z.number().min(1).optional(), enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard) }), diff --git a/backend/src/ee/routes/v1/secret-approval-policy-router.ts b/backend/src/ee/routes/v1/secret-approval-policy-router.ts index 34a7dc779..80b77aabf 100644 --- a/backend/src/ee/routes/v1/secret-approval-policy-router.ts +++ b/backend/src/ee/routes/v1/secret-approval-policy-router.ts @@ -30,7 +30,7 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi approvers: z .object({ type: z.nativeEnum(ApproverType), id: z.string() }) .array() - .min(1), + .min(1, { message: "At least one approver should be provided" }), approvals: z.number().min(1).default(1), enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard) }), @@ -71,7 +71,7 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi approvers: z .object({ type: z.nativeEnum(ApproverType), id: z.string() }) .array() - .min(1), + .min(1, { message: "At least one approver should be provided" }), approvals: z.number().min(1).default(1), secretPath: z .string() diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts index f9bb2ec10..ad476bbab 100644 --- a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts +++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts @@ -448,7 +448,7 @@ export const secretApprovalRequestServiceFactory = ({ const hasMinApproval = secretApprovalRequest.policy.approvals <= secretApprovalRequest.policy.approvers.filter(({ userId: approverId }) => - approverId ? reviewers[approverId.toString()] === ApprovalStatus.APPROVED : null + approverId ? reviewers[approverId] === ApprovalStatus.APPROVED : false ).length; const isSoftEnforcement = secretApprovalRequest.policy.enforcementLevel === EnforcementLevel.Soft;