feat: fixed secret approval for architecture v2

backend/src/ee/routes/v1/secret-approval-request-router.ts

@@ -261,8 +261,8 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProv
               secretPath: z.string(),
               commits: secretRawSchema
                 .omit({ _id: true, environment: true, workspace: true, type: true, version: true })
-                .merge(
+                .extend({
-                  z.object({
+                  op: z.string(),
                   tags: tagSchema,
                   secret: z
                     .object({
@@ -285,7 +285,6 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProv
                     })
                     .optional()
                 })
-                )
                 .array()
             })
           )

backend/src/ee/routes/v1/snapshot-router.ts

@@ -29,9 +29,9 @@ export const registerSnapshotRouter = async (server: FastifyZodProvider) => {
               name: z.string()
             }),
             secretVersions: secretRawSchema
-              .omit({ _id: true, environment: true, workspace: true, type: true, version: true })
+              .omit({ _id: true, environment: true, workspace: true, type: true })
-              .merge(
+              .extend({
-                z.object({
+                secretId: z.string(),
                 tags: SecretTagsSchema.pick({
                   id: true,
                   slug: true,
@@ -39,7 +39,6 @@ export const registerSnapshotRouter = async (server: FastifyZodProvider) => {
                   color: true
                 }).array()
               })
-              )
               .array(),
             folderVersion: z.object({ id: z.string(), name: z.string() }).array(),
             createdAt: z.date(),

backend/src/ee/services/secret-approval-request/secret-approval-request-secret-dal.ts

@@ -242,7 +242,7 @@ export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {
           `${TableName.SecretApprovalRequestSecretTagV2}.tagId`,
           `${TableName.SecretTag}.id`
         )
-        .leftJoin(TableName.SecretV2, `${TableName.SecretApprovalRequestSecretV2}.secretId`, `${TableName.Secret}.id`)
+        .leftJoin(TableName.SecretV2, `${TableName.SecretApprovalRequestSecretV2}.secretId`, `${TableName.SecretV2}.id`)
         .leftJoin(
           TableName.SecretVersionV2,
           `${TableName.SecretVersionV2}.id`,

backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts

@@ -230,7 +230,8 @@ export const secretApprovalRequestServiceFactory = ({
         secretComment: el.encryptedComment
           ? secretManagerDecryptor({ cipherTextBlob: el.encryptedComment }).toString()
           : undefined,
-        secret: {
+        secret: el.secret
+          ? {
               secretKey: el.secret.key,
               id: el.secret.id,
               version: el.secret.version,
@@ -240,8 +241,10 @@ export const secretApprovalRequestServiceFactory = ({
               secretComment: el.secret.encryptedComment
                 ? secretManagerDecryptor({ cipherTextBlob: el.secret.encryptedComment }).toString()
                 : undefined
-        },
+            }
-        secretVersion: {
+          : undefined,
+        secretVersion: el.secretVersion
+          ? {
               secretKey: el.secretVersion.key,
               id: el.secretVersion.id,
               version: el.secretVersion.version,
@@ -252,6 +255,7 @@ export const secretApprovalRequestServiceFactory = ({
                 ? secretManagerDecryptor({ cipherTextBlob: el.secretVersion.encryptedComment }).toString()
                 : undefined
             }
+          : undefined
       }));
     } else {
       if (!botKey) throw new BadRequestError({ message: "Bot key not found" });
@@ -259,16 +263,20 @@ export const secretApprovalRequestServiceFactory = ({
       secrets = encrypedSecrets.map((el) => ({
         ...el,
         ...decryptSecretWithBot(el, botKey),
-        secret: {
+        secret: el.secret
+          ? {
               id: el.secret.id,
               version: el.secret.version,
               ...decryptSecretWithBot(el.secret, botKey)
-        },
+            }
-        secretVersion: {
+          : undefined,
+        secretVersion: el.secretVersion
+          ? {
               id: el.secretVersion.id,
               version: el.secretVersion.version,
               ...decryptSecretWithBot(el.secretVersion, botKey)
             }
+          : undefined
       }));
     }
     const secretPath = await folderDAL.findSecretPathByFolderIds(secretApprovalRequest.projectId, [

backend/src/ee/services/secret-snapshot/snapshot-dal.ts

@@ -505,7 +505,7 @@ export const snapshotDALFactory = (db: TDbClient) => {
           db.ref("max").withSchema("secGroupByMaxVersion").as("latestSecretVersion"),
           db.ref("max").withSchema("folderGroupByMaxVersion").as("latestFolderVersion"),
           db.ref("id").withSchema(TableName.SecretTag).as("tagId"),
-          db.ref("id").withSchema(TableName.SecretVersionTag).as("tagVersionId"),
+          db.ref("id").withSchema(TableName.SecretVersionV2Tag).as("tagVersionId"),
           db.ref("color").withSchema(TableName.SecretTag).as("tagColor"),
           db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug"),
           db.ref("name").withSchema(TableName.SecretTag).as("tagName")