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 68408a05f..74545579c 100644 --- a/backend/src/ee/routes/v1/access-approval-policy-router.ts +++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts @@ -39,7 +39,8 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi .max(100, "Cannot have more than 100 approvers") .min(1, { message: "At least one approver should be provided" }) .refine( - (el) => el.every((i) => Object.hasOwn(i, "id") || Object.hasOwn(i, "username")), + // @ts-expect-error this is ok + (el) => el.every((i) => Boolean(i?.id) || Boolean(i?.username)), "Must provide either username or id" ), bypassers: z @@ -193,7 +194,8 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi .min(1, { message: "At least one approver should be provided" }) .max(100, "Cannot have more than 100 approvers") .refine( - (el) => el.every((i) => Object.hasOwn(i, "id") || Object.hasOwn(i, "username")), + // @ts-expect-error this is ok + (el) => el.every((i) => Boolean(i?.id) || Boolean(i?.username)), "Must provide either username or id" ), bypassers: z diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts index 0007868df..922ba16a4 100644 --- a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts +++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts @@ -95,9 +95,6 @@ export const accessApprovalPolicyServiceFactory = ({ (approver) => approver.type === ApproverType.User && approver.username ) as { username: string; sequence?: number }[]; - if (!groupApprovers && approvals > userApprovers.length + userApproverNames.length) - throw new BadRequestError({ message: "Approvals cannot be greater than approvers" }); - const { permission } = await permissionService.getProjectPermission({ actor, actorId, @@ -137,7 +134,6 @@ export const accessApprovalPolicyServiceFactory = ({ })) ); } - let groupBypassers: string[] = []; let bypasserUserIds: string[] = [];