From e2550d70b50ac396473100215af4250d95605922 Mon Sep 17 00:00:00 2001
From: Maidul Islam <maidul98@gmail.com>
Date: Tue, 11 Jun 2024 00:28:55 -0400
Subject: [PATCH] make skipMultilineEncoding null|undefined|bool

---
 backend/src/db/schemas/secrets.ts             |  2 +-
 backend/src/services/secret/secret-fns.ts     |  2 +-
 backend/src/services/secret/secret-service.ts | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/backend/src/db/schemas/secrets.ts b/backend/src/db/schemas/secrets.ts
index 5d7b1caf0..f261c40bb 100644
--- a/backend/src/db/schemas/secrets.ts
+++ b/backend/src/db/schemas/secrets.ts
@@ -23,7 +23,7 @@ export const SecretsSchema = z.object({
   secretCommentTag: z.string().nullable().optional(),
   secretReminderNote: z.string().nullable().optional(),
   secretReminderRepeatDays: z.number().nullable().optional(),
-  skipMultilineEncoding: z.boolean().default(false).optional(),
+  skipMultilineEncoding: z.boolean().default(false).nullable().optional(),
   algorithm: z.string().default("aes-256-gcm"),
   keyEncoding: z.string().default("utf8"),
   metadata: z.unknown().nullable().optional(),
diff --git a/backend/src/services/secret/secret-fns.ts b/backend/src/services/secret/secret-fns.ts
index eac99d71f..bf3227c3f 100644
--- a/backend/src/services/secret/secret-fns.ts
+++ b/backend/src/services/secret/secret-fns.ts
@@ -309,7 +309,7 @@ export const interpolateSecrets = ({ projectId, secretEncKey, secretDAL, folderD
   };
 
   const expandSecrets = async (
-    secrets: Record<string, { value: string; comment?: string; skipMultilineEncoding?: boolean }>
+    secrets: Record<string, { value: string; comment?: string; skipMultilineEncoding: boolean | null | undefined }>
   ) => {
     const expandedSec: Record<string, string> = {};
     const interpolatedSec: Record<string, string> = {};
diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts
index 7be4a6506..532a2a890 100644
--- a/backend/src/services/secret/secret-service.ts
+++ b/backend/src/services/secret/secret-service.ts
@@ -976,13 +976,18 @@ export const secretServiceFactory = ({
           secretValue: string;
           secretComment?: string;
           secretPath: string;
-          skipMultilineEncoding?: boolean;
+          skipMultilineEncoding: boolean | null | undefined;
         }[]
       ) => {
         // Group secrets by secretPath
         const secretsByPath: Record<
           string,
-          { secretKey: string; secretValue: string; secretComment?: string; skipMultilineEncoding?: boolean }[]
+          {
+            secretKey: string;
+            secretValue: string;
+            secretComment?: string;
+            skipMultilineEncoding: boolean | null | undefined;
+          }[]
         > = {};
 
         secretBatch.forEach((secret) => {
@@ -999,7 +1004,10 @@ export const secretServiceFactory = ({
             continue;
           }
 
-          const secretRecord: Record<string, { value: string; comment?: string; skipMultilineEncoding?: boolean }> = {};
+          const secretRecord: Record<
+            string,
+            { value: string; comment?: string; skipMultilineEncoding: boolean | null | undefined }
+          > = {};
           secretsByPath[secPath].forEach((decryptedSecret) => {
             secretRecord[decryptedSecret.secretKey] = {
               value: decryptedSecret.secretValue,