From 997d7f22fcf5452b27b474afe60d1f8ae8dff15f Mon Sep 17 00:00:00 2001
From: Alfonso Hernandez <a.hernandez@newxel.online>
Date: Thu, 18 Jul 2024 13:13:39 +0200
Subject: [PATCH] fix(backend): secretPath default / + default enforcementLevel

---
 .../src/ee/routes/v1/access-approval-policy-router.ts  |  4 ++--
 .../src/ee/routes/v1/secret-approval-policy-router.ts  | 10 ++++++----
 2 files changed, 8 insertions(+), 6 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 fe3a16f2b..8a3f93109 100644
--- a/backend/src/ee/routes/v1/access-approval-policy-router.ts
+++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts
@@ -19,7 +19,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
           environment: z.string(),
           approvers: z.string().array().min(1),
           approvals: z.number().min(1).default(1),
-          enforcementLevel: z.nativeEnum(EnforcementLevel)
+          enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard)
         })
         .refine((data) => data.approvals <= data.approvers.length, {
           path: ["approvals"],
@@ -119,7 +119,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
             .transform((val) => (val === "" ? "/" : val)),
           approvers: z.string().array().min(1),
           approvals: z.number().min(1).default(1),
-          enforcementLevel: z.nativeEnum(EnforcementLevel)
+          enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard)
         })
         .refine((data) => data.approvals <= data.approvers.length, {
           path: ["approvals"],
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 305c588a6..25c1bb0b5 100644
--- a/backend/src/ee/routes/v1/secret-approval-policy-router.ts
+++ b/backend/src/ee/routes/v1/secret-approval-policy-router.ts
@@ -25,10 +25,11 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi
             .string()
             .optional()
             .nullable()
+            .default("/")
             .transform((val) => (val ? removeTrailingSlash(val) : val)),
           approvers: z.string().array().min(1),
           approvals: z.number().min(1).default(1),
-          enforcementLevel: z.nativeEnum(EnforcementLevel)
+          enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard)
         })
         .refine((data) => data.approvals <= data.approvers.length, {
           path: ["approvals"],
@@ -50,7 +51,7 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi
         projectId: req.body.workspaceId,
         ...req.body,
         name: req.body.name ?? `${req.body.environment}-${nanoid(3)}`,
-        enforcementLevel: req.body.enforcementLevel ?? EnforcementLevel.Hard
+        enforcementLevel: req.body.enforcementLevel
       });
       return { approval };
     }
@@ -75,8 +76,9 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi
             .string()
             .optional()
             .nullable()
-            .transform((val) => (val ? removeTrailingSlash(val) : val)),
-          enforcementLevel: z.nativeEnum(EnforcementLevel)
+            .transform((val) => (val ? removeTrailingSlash(val) : val))
+            .transform((val) => (val === "" ? "/" : val)),
+          enforcementLevel: z.nativeEnum(EnforcementLevel).optional()
         })
         .refine((data) => data.approvals <= data.approvers.length, {
           path: ["approvals"],