From f031339d83d3f58219303196463451a9cf1db18b Mon Sep 17 00:00:00 2001
From: Piyush Gupta <piyushguptaa2z123@gmail.com>
Date: Tue, 25 Nov 2025 20:23:04 +0530
Subject: [PATCH 1/2] fix: default duplicate secret deletion

---
 .../src/services/secret-v2-bridge/secret-v2-bridge-fns.ts   | 6 ++++--
 .../services/secret-v2-bridge/secret-v2-bridge-service.ts   | 3 ++-
 frontend/src/helpers/project.ts                             | 5 -----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
index 01a7f6210..d25c9d58e 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
@@ -424,8 +424,10 @@ export const fnSecretBulkDelete = async ({
     .filter(({ type }) => type === SecretType.Shared)
     .map(({ id }) => ({
       type: CommitType.DELETE,
-      secretVersionId: secretVersions[id].id
-    }));
+      secretVersionId: secretVersions[id]?.id
+    }))
+    .filter((el) => el.secretVersionId);
+
   if (changes.length > 0) {
     if (commitChanges) {
       commitChanges.push(...changes);
diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
index 559c86843..d42a26eff 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
@@ -2254,7 +2254,8 @@ export const secretV2BridgeServiceFactory = ({
         ]
       }
     });
-    if (secretsToDelete.length !== inputSecrets.length)
+    const secretsToDeleteSet = new Set(secretsToDelete.map((el) => el.key));
+    if (secretsToDeleteSet.size !== inputSecrets.length)
       throw new NotFoundError({
         message: `One or more secrets does not exist: ${secretsToDelete.map((el) => el.key).join(", ")}`
       });
diff --git a/frontend/src/helpers/project.ts b/frontend/src/helpers/project.ts
index 1a3114868..128dd31ce 100644
--- a/frontend/src/helpers/project.ts
+++ b/frontend/src/helpers/project.ts
@@ -14,11 +14,6 @@ const secretsToBeAdded = [
     secretValue: "OVERRIDE_THIS",
     secretComment: "Override secrets with personal value"
   },
-  {
-    secretKey: "DB_PASSWORD",
-    secretValue: "OVERRIDE_THIS",
-    secretComment: "Another secret override"
-  },
   {
     secretKey: "DB_PASSWORD",
     secretValue: "example_password"

From 448d8186ec01b53df6c4c49a5646e972ac3a544f Mon Sep 17 00:00:00 2001
From: Piyush Gupta <piyushguptaa2z123@gmail.com>
Date: Wed, 26 Nov 2025 18:48:41 +0530
Subject: [PATCH 2/2] fix: review comments

---
 .../src/services/secret-v2-bridge/secret-v2-bridge-fns.ts    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
index d25c9d58e..c18a51ea4 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
@@ -421,12 +421,11 @@ export const fnSecretBulkDelete = async ({
   );
 
   const changes = deletedSecrets
-    .filter(({ type }) => type === SecretType.Shared)
+    .filter(({ type, id }) => type === SecretType.Shared && secretVersions[id])
     .map(({ id }) => ({
       type: CommitType.DELETE,
       secretVersionId: secretVersions[id]?.id
-    }))
-    .filter((el) => el.secretVersionId);
+    }));
 
   if (changes.length > 0) {
     if (commitChanges) {