feat: testing v2 architecture changes and corrections as needed

backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts

@@ -4,7 +4,6 @@ import { TableName, TSecretFolders, TSecretsV2 } from "@app/db/schemas";
 import { groupBy } from "@app/lib/fn";
 import { logger } from "@app/lib/logger";
 
-import { TKmsServiceFactory } from "../kms/kms-service";
 import { TProjectEnvDALFactory } from "../project-env/project-env-dal";
 import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";
 import { TSecretV2BridgeDALFactory } from "./secret-v2-bridge-dal";
@@ -204,7 +203,10 @@ export const fnSecretBulkUpdate = async ({
     tags !== undefined ? { tags, secretId: newSecrets[i].id } : []
   );
   if (secsUpdatedTag.length) {
-    await secretTagDAL.deleteTagsToSecretV2({ $in: { id: secsUpdatedTag.map(({ secretId }) => secretId) } }, tx);
+    await secretTagDAL.deleteTagsToSecretV2(
+      { $in: { secrets_v2Id: secsUpdatedTag.map(({ secretId }) => secretId) } },
+      tx
+    );
     const newSecretTags = secsUpdatedTag.flatMap(({ tags: secretTags = [], secretId }) =>
       secretTags.map((tag) => ({
         [`${TableName.SecretTag}Id` as const]: tag,
@@ -552,14 +554,3 @@ export const reshapeBridgeSecret = (
   createdAt: secret.createdAt,
   updatedAt: secret.updatedAt
 });
-
-export const secretEncryptionHelper = {
-  encryptValue: (encryptor: Awaited<ReturnType<TKmsServiceFactory["encryptWithKmsKey"]>>, value?: string) => {
-    if (typeof value === "undefined") return;
-    return encryptor({ plainText: Buffer.from(value) }).cipherTextBlob;
-  },
-  decryptValue: (decryptor: Awaited<ReturnType<TKmsServiceFactory["decryptWithInputKey"]>>, value?: Buffer | null) => {
-    if (!value) return;
-    return decryptor({ cipherTextBlob: value }).toString();
-  }
-};

backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts

@@ -9,6 +9,7 @@ import { TSecretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-
 import { TSecretSnapshotServiceFactory } from "@app/ee/services/secret-snapshot/secret-snapshot-service";
 import { BadRequestError, NotFoundError } from "@app/lib/errors";
 import { groupBy } from "@app/lib/fn";
+import { setKnexStringValue } from "@app/lib/knex";
 import { logger } from "@app/lib/logger";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
@@ -160,9 +161,10 @@ export const secretV2BridgeServiceFactory = ({
             version: 1,
             type,
             reminderRepeatDays: el.secretReminderRepeatDays,
-            encryptedComment: el.secretComment
-              ? secretManagerEncryptor({ plainText: Buffer.from(el.secretComment) }).cipherTextBlob
-              : undefined,
+            encryptedComment: setKnexStringValue(
+              el.secretComment,
+              (value) => secretManagerEncryptor({ plainText: Buffer.from(value) }).cipherTextBlob
+            ),
             encryptedValue: el.secretValue
               ? secretManagerEncryptor({ plainText: Buffer.from(el.secretValue) }).cipherTextBlob
               : undefined,
@@ -265,7 +267,7 @@ export const secretV2BridgeServiceFactory = ({
 
     if (inputSecret.newSecretName) {
       const doesNewNameSecretExist = await secretDAL.findOne({
-        key: inputSecret.secretName,
+        key: inputSecret.newSecretName,
         type: SecretType.Shared,
         folderId
       });
@@ -299,9 +301,10 @@ export const secretV2BridgeServiceFactory = ({
             filter: { id: secretId },
             data: {
               reminderRepeatDays: inputSecret.secretReminderRepeatDays,
-              encryptedComment: inputSecret.secretComment
-                ? secretManagerEncryptor({ plainText: Buffer.from(inputSecret.secretComment) }).cipherTextBlob
-                : undefined,
+              encryptedComment: setKnexStringValue(
+                inputSecret.secretComment,
+                (value) => secretManagerEncryptor({ plainText: Buffer.from(value) }).cipherTextBlob
+              ),
               reminderNote: inputSecret.secretReminderNote,
               skipMultilineEncoding: inputSecret.skipMultilineEncoding,
               key: inputSecret.newSecretName || secretName,
@@ -732,9 +735,10 @@ export const secretV2BridgeServiceFactory = ({
       fnSecretBulkInsert({
         inputSecrets: inputSecrets.map((el) => ({
           version: 1,
-          encryptedComment: el.secretComment
-            ? secretManagerEncryptor({ plainText: Buffer.from(el.secretComment) }).cipherTextBlob
-            : undefined,
+          encryptedComment: setKnexStringValue(
+            el.secretComment,
+            (value) => secretManagerEncryptor({ plainText: Buffer.from(value) }).cipherTextBlob
+          ),
           encryptedValue: el.secretValue
             ? secretManagerEncryptor({ plainText: Buffer.from(el.secretValue) }).cipherTextBlob
             : undefined,
@@ -821,7 +825,7 @@ export const secretV2BridgeServiceFactory = ({
       const secrets = await secretDAL.findBySecretKeys(
         folderId,
         secretsWithNewName.map((el) => ({
-          key: el.secretKey,
+          key: el.newSecretName as string,
           type: SecretType.Shared
         }))
       );
@@ -856,9 +860,10 @@ export const secretV2BridgeServiceFactory = ({
             filter: { id: originalSecret.id, type: SecretType.Shared },
             data: {
               reminderRepeatDays: el.secretReminderRepeatDays,
-              encryptedComment: el.secretComment
-                ? secretManagerEncryptor({ plainText: Buffer.from(el.secretComment) }).cipherTextBlob
-                : undefined,
+              encryptedComment: setKnexStringValue(
+                el.secretComment,
+                (value) => secretManagerEncryptor({ plainText: Buffer.from(value) }).cipherTextBlob
+              ),
               reminderNote: el.secretReminderNote,
               skipMultilineEncoding: el.skipMultilineEncoding,
               key: el.newSecretName || el.secretKey,