From db0a72f7b48e032eacc3b1d4c0c6223f758a9106 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Tue, 8 Apr 2025 02:26:20 +0800
Subject: [PATCH] misc: add missing version filter

---
 .../secret-v2-bridge-service.ts               | 23 +++++++++++--------
 backend/src/services/secret/secret-service.ts |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

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 88b410b55..509144e21 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
@@ -1252,21 +1252,24 @@ export const secretV2BridgeServiceFactory = ({
       : secretVersionDAL
           .findOne({
             folderId,
+            version,
             type: secretType,
             userId: secretType === SecretType.Personal ? actorId : null,
             key: secretName
           })
           .then((el) =>
-            SecretsV2Schema.extend({
-              tags: z
-                .object({ slug: z.string(), name: z.string(), id: z.string(), color: z.string() })
-                .array()
-                .default([])
-                .optional()
-            }).parse({
-              ...el,
-              id: el.secretId
-            })
+            el
+              ? SecretsV2Schema.extend({
+                  tags: z
+                    .object({ slug: z.string(), name: z.string(), id: z.string(), color: z.string() })
+                    .array()
+                    .default([])
+                    .optional()
+                }).parse({
+                  ...el,
+                  id: el.secretId
+                })
+              : undefined
           ));
 
     throwIfMissingSecretReadValueOrDescribePermission(permission, ProjectPermissionSecretActions.DescribeSecret, {
diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts
index 7aeb59f01..a82b04833 100644
--- a/backend/src/services/secret/secret-service.ts
+++ b/backend/src/services/secret/secret-service.ts
@@ -1558,6 +1558,7 @@ export const secretServiceFactory = ({
         actorOrgId,
         actor,
         actorId,
+        version,
         expandSecretReferences,
         type,
         secretName