feat: changed line length to 120

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

@@ -8,13 +8,7 @@ import {
   TSecretApprovalRequestsSecrets
 } from "@app/db/schemas";
 import { DatabaseError } from "@app/lib/errors";
-import {
-  ormify,
-  selectAllTableCols,
-  sqlNestRelationships,
-  stripUndefinedInWhere,
-  TFindFilter
-} from "@app/lib/knex";
+import { ormify, selectAllTableCols, sqlNestRelationships, stripUndefinedInWhere, TFindFilter } from "@app/lib/knex";
 
 import { RequestState } from "./secret-approval-request-types";
 
@@ -36,11 +30,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
   const findQuery = (filter: TFindFilter<TSecretApprovalRequests>, tx: Knex) =>
     tx(TableName.SecretApprovalRequest)
       .where(filter)
-      .join(
-        TableName.SecretFolder,
-        `${TableName.SecretApprovalRequest}.folderId`,
-        `${TableName.SecretFolder}.id`
-      )
+      .join(TableName.SecretFolder, `${TableName.SecretApprovalRequest}.folderId`, `${TableName.SecretFolder}.id`)
       .join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
       .join(
         TableName.SecretApprovalPolicy,
@@ -92,8 +82,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
           {
             key: "reviewerMemberId",
             label: "reviewers" as const,
-            mapper: ({ reviewerMemberId: member, reviewerStatus: status }) =>
-              member ? { member, status } : undefined
+            mapper: ({ reviewerMemberId: member, reviewerStatus: status }) => (member ? { member, status } : undefined)
           },
           { key: "approverId", label: "approvers" as const, mapper: ({ approverId }) => approverId }
         ]
@@ -114,16 +103,8 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
         .with(
           "temp",
           (tx || db)(TableName.SecretApprovalRequest)
-            .join(
-              TableName.SecretFolder,
-              `${TableName.SecretApprovalRequest}.folderId`,
-              `${TableName.SecretFolder}.id`
-            )
-            .join(
-              TableName.Environment,
-              `${TableName.SecretFolder}.envId`,
-              `${TableName.Environment}.id`
-            )
+            .join(TableName.SecretFolder, `${TableName.SecretApprovalRequest}.folderId`, `${TableName.SecretFolder}.id`)
+            .join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
             .join(
               TableName.SecretApprovalPolicyApprover,
               `${TableName.SecretApprovalRequest}.policyId`,
@@ -147,13 +128,11 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
 
       return {
         open: parseInt(
-          (docs.find(({ status }) => status === RequestState.Open) as { count: string })?.count ||
-            "0",
+          (docs.find(({ status }) => status === RequestState.Open) as { count: string })?.count || "0",
           10
         ),
         closed: parseInt(
-          (docs.find(({ status }) => status === RequestState.Closed) as { count: string })?.count ||
-            "0",
+          (docs.find(({ status }) => status === RequestState.Closed) as { count: string })?.count || "0",
           10
         )
       };
@@ -163,31 +142,15 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
   };
 
   const findByProjectId = async (
-    {
-      status,
-      limit = 20,
-      offset = 0,
-      projectId,
-      committer,
-      environment,
-      membershipId
-    }: TFindQueryFilter,
+    { status, limit = 20, offset = 0, projectId, committer, environment, membershipId }: TFindQueryFilter,
     tx?: Knex
   ) => {
     try {
       // akhilmhdh: If ever u wanted a 1 to so many relationship connected with pagination
       // this is the place u wanna look at.
       const query = (tx || db)(TableName.SecretApprovalRequest)
-        .join(
-          TableName.SecretFolder,
-          `${TableName.SecretApprovalRequest}.folderId`,
-          `${TableName.SecretFolder}.id`
-        )
-        .join(
-          TableName.Environment,
-          `${TableName.SecretFolder}.envId`,
-          `${TableName.Environment}.id`
-        )
+        .join(TableName.SecretFolder, `${TableName.SecretApprovalRequest}.folderId`, `${TableName.SecretFolder}.id`)
+        .join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
         .join(
           TableName.SecretApprovalPolicy,
           `${TableName.SecretApprovalRequest}.policyId`,
@@ -266,8 +229,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
           {
             key: "reviewerMemberId",
             label: "reviewers" as const,
-            mapper: ({ reviewerMemberId: member, reviewerStatus: s }) =>
-              member ? { member, status: s } : undefined
+            mapper: ({ reviewerMemberId: member, reviewerStatus: s }) => (member ? { member, status: s } : undefined)
           },
           {
             key: "approverId",

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

@@ -2,9 +2,7 @@ import { TDbClient } from "@app/db";
 import { TableName } from "@app/db/schemas";
 import { ormify } from "@app/lib/knex";
 
-export type TSecretApprovalRequestReviewerDALFactory = ReturnType<
-  typeof secretApprovalRequestReviewerDALFactory
->;
+export type TSecretApprovalRequestReviewerDALFactory = ReturnType<typeof secretApprovalRequestReviewerDALFactory>;
 
 export const secretApprovalRequestReviewerDALFactory = (db: TDbClient) => {
   const secretApprovalRequestReviewerOrm = ormify(db, TableName.SecretApprovalRequestReviewer);

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

@@ -5,9 +5,7 @@ import { SecretApprovalRequestsSecretsSchema, TableName, TSecretTags } from "@ap
 import { DatabaseError } from "@app/lib/errors";
 import { ormify, selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";
 
-export type TSecretApprovalRequestSecretDALFactory = ReturnType<
-  typeof secretApprovalRequestSecretDALFactory
->;
+export type TSecretApprovalRequestSecretDALFactory = ReturnType<typeof secretApprovalRequestSecretDALFactory>;
 
 export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {
   const secretApprovalRequestSecretOrm = ormify(db, TableName.SecretApprovalRequestSecret);
@@ -25,16 +23,8 @@ export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {
           `${TableName.SecretApprovalRequestSecret}.id`,
           `${TableName.SecretApprovalRequestSecretTag}.secretId`
         )
-        .leftJoin(
-          TableName.SecretTag,
-          `${TableName.SecretApprovalRequestSecretTag}.tagId`,
-          `${TableName.SecretTag}.id`
-        )
-        .leftJoin(
-          TableName.Secret,
-          `${TableName.SecretApprovalRequestSecret}.secretId`,
-          `${TableName.Secret}.id`
-        )
+        .leftJoin(TableName.SecretTag, `${TableName.SecretApprovalRequestSecretTag}.tagId`, `${TableName.SecretTag}.id`)
+        .leftJoin(TableName.Secret, `${TableName.SecretApprovalRequestSecret}.secretId`, `${TableName.Secret}.id`)
         .leftJoin(
           TableName.SecretVersion,
           `${TableName.SecretVersion}.id`,
@@ -75,37 +65,24 @@ export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {
           db.ref("secretValueCiphertext").withSchema(TableName.Secret).as("orgSecValueCiphertext"),
           db.ref("secretCommentIV").withSchema(TableName.Secret).as("orgSecCommentIV"),
           db.ref("secretCommentTag").withSchema(TableName.Secret).as("orgSecCommentTag"),
-          db
-            .ref("secretCommentCiphertext")
-            .withSchema(TableName.Secret)
-            .as("orgSecCommentCiphertext")
+          db.ref("secretCommentCiphertext").withSchema(TableName.Secret).as("orgSecCommentCiphertext")
         )
         .select(
           db.ref("version").withSchema(TableName.SecretVersion).as("secVerVersion"),
           db.ref("secretKeyIV").withSchema(TableName.SecretVersion).as("secVerKeyIV"),
           db.ref("secretKeyTag").withSchema(TableName.SecretVersion).as("secVerKeyTag"),
-          db
-            .ref("secretKeyCiphertext")
-            .withSchema(TableName.SecretVersion)
-            .as("secVerKeyCiphertext"),
+          db.ref("secretKeyCiphertext").withSchema(TableName.SecretVersion).as("secVerKeyCiphertext"),
           db.ref("secretValueIV").withSchema(TableName.SecretVersion).as("secVerValueIV"),
           db.ref("secretValueTag").withSchema(TableName.SecretVersion).as("secVerValueTag"),
-          db
-            .ref("secretValueCiphertext")
-            .withSchema(TableName.SecretVersion)
-            .as("secVerValueCiphertext"),
+          db.ref("secretValueCiphertext").withSchema(TableName.SecretVersion).as("secVerValueCiphertext"),
           db.ref("secretCommentIV").withSchema(TableName.SecretVersion).as("secVerCommentIV"),
           db.ref("secretCommentTag").withSchema(TableName.SecretVersion).as("secVerCommentTag"),
-          db
-            .ref("secretCommentCiphertext")
-            .withSchema(TableName.SecretVersion)
-            .as("secVerCommentCiphertext")
+          db.ref("secretCommentCiphertext").withSchema(TableName.SecretVersion).as("secVerCommentCiphertext")
         );
       const formatedDoc = sqlNestRelationships({
         data: doc,
         key: "id",
-        parentMapper: (data) =>
-          SecretApprovalRequestsSecretsSchema.omit({ secretVersion: true }).parse(data),
+        parentMapper: (data) => SecretApprovalRequestsSecretsSchema.omit({ secretVersion: true }).parse(data),
         childrenMapper: [
           {
             key: "tagJnId",
@@ -186,12 +163,7 @@ export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {
               {
                 key: "secVerTagId",
                 label: "tags" as const,
-                mapper: ({
-                  secVerTagId: id,
-                  secVerTagName: name,
-                  secVerTagSlug: slug,
-                  secVerTagColor: color
-                }) => ({
+                mapper: ({ secVerTagId: id, secVerTagName: name, secVerTagSlug: slug, secVerTagColor: color }) => ({
                   // eslint-disable-next-line
                   id,
                   // eslint-disable-next-line

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

@@ -42,10 +42,7 @@ type TSecretApprovalRequestServiceFactoryDep = {
   secretApprovalRequestDAL: TSecretApprovalRequestDALFactory;
   secretApprovalRequestSecretDAL: TSecretApprovalRequestSecretDALFactory;
   secretApprovalRequestReviewerDAL: TSecretApprovalRequestReviewerDALFactory;
-  folderDAL: Pick<
-    TSecretFolderDALFactory,
-    "findBySecretPath" | "findById" | "findSecretPathByFolderIds"
-  >;
+  folderDAL: Pick<TSecretFolderDALFactory, "findBySecretPath" | "findById" | "findSecretPathByFolderIds">;
   secretTagDAL: Pick<TSecretTagDALFactory, "findManyTagsById">;
   secretBlindIndexDAL: Pick<TSecretBlindIndexDALFactory, "findOne">;
   snapshotService: Pick<TSecretSnapshotServiceFactory, "performSnapshot">;
@@ -61,9 +58,7 @@ type TSecretApprovalRequestServiceFactoryDep = {
   secretQueueService: Pick<TSecretQueueFactory, "syncSecrets">;
 };
 
-export type TSecretApprovalRequestServiceFactory = ReturnType<
-  typeof secretApprovalRequestServiceFactory
->;
+export type TSecretApprovalRequestServiceFactory = ReturnType<typeof secretApprovalRequestServiceFactory>;
 
 export const secretApprovalRequestServiceFactory = ({
   secretApprovalRequestDAL,
@@ -79,14 +74,9 @@ export const secretApprovalRequestServiceFactory = ({
   secretQueueService
 }: TSecretApprovalRequestServiceFactoryDep) => {
   const requestCount = async ({ projectId, actor, actorId }: TApprovalRequestCountDTO) => {
-    if (actor === ActorType.SERVICE)
-      throw new BadRequestError({ message: "Cannot use service token" });
+    if (actor === ActorType.SERVICE) throw new BadRequestError({ message: "Cannot use service token" });
 
-    const { membership } = await permissionService.getProjectPermission(
-      actor as ActorType.USER,
-      actorId,
-      projectId
-    );
+    const { membership } = await permissionService.getProjectPermission(actor as ActorType.USER, actorId, projectId);
 
     const count = await secretApprovalRequestDAL.findProjectRequestCount(projectId, membership.id);
     return count;
@@ -102,8 +92,7 @@ export const secretApprovalRequestServiceFactory = ({
     limit,
     offset
   }: TListApprovalsDTO) => {
-    if (actor === ActorType.SERVICE)
-      throw new BadRequestError({ message: "Cannot use service token" });
+    if (actor === ActorType.SERVICE) throw new BadRequestError({ message: "Cannot use service token" });
 
     const { membership } = await permissionService.getProjectPermission(actor, actorId, projectId);
     const approvals = await secretApprovalRequestDAL.findByProjectId({
@@ -119,12 +108,10 @@ export const secretApprovalRequestServiceFactory = ({
   };
 
   const getSecretApprovalDetails = async ({ actor, actorId, id }: TSecretApprovalDetailsDTO) => {
-    if (actor === ActorType.SERVICE)
-      throw new BadRequestError({ message: "Cannot use service token" });
+    if (actor === ActorType.SERVICE) throw new BadRequestError({ message: "Cannot use service token" });
 
     const secretApprovalRequest = await secretApprovalRequestDAL.findById(id);
-    if (!secretApprovalRequest)
-      throw new BadRequestError({ message: "Secret approval request not found" });
+    if (!secretApprovalRequest) throw new BadRequestError({ message: "Secret approval request not found" });
 
     const { policy } = secretApprovalRequest;
     const { membership } = await permissionService.getProjectPermission(
@@ -149,8 +136,7 @@ export const secretApprovalRequestServiceFactory = ({
 
   const reviewApproval = async ({ approvalId, actor, status, actorId }: TReviewRequestDTO) => {
     const secretApprovalRequest = await secretApprovalRequestDAL.findById(approvalId);
-    if (!secretApprovalRequest)
-      throw new BadRequestError({ message: "Secret approval request not found" });
+    if (!secretApprovalRequest) throw new BadRequestError({ message: "Secret approval request not found" });
     if (actor !== ActorType.USER) throw new BadRequestError({ message: "Must be a user" });
 
     const { policy } = secretApprovalRequest;
@@ -191,8 +177,7 @@ export const secretApprovalRequestServiceFactory = ({
 
   const updateApprovalStatus = async ({ actorId, status, approvalId, actor }: TStatusChangeDTO) => {
     const secretApprovalRequest = await secretApprovalRequestDAL.findById(approvalId);
-    if (!secretApprovalRequest)
-      throw new BadRequestError({ message: "Secret approval request not found" });
+    if (!secretApprovalRequest) throw new BadRequestError({ message: "Secret approval request not found" });
     if (actor !== ActorType.USER) throw new BadRequestError({ message: "Must be a user" });
 
     const { policy } = secretApprovalRequest;
@@ -209,8 +194,7 @@ export const secretApprovalRequestServiceFactory = ({
       throw new UnauthorizedError({ message: "User has no access" });
     }
 
-    if (secretApprovalRequest.hasMerged)
-      throw new BadRequestError({ message: "Approval request has been merged" });
+    if (secretApprovalRequest.hasMerged) throw new BadRequestError({ message: "Approval request has been merged" });
     if (secretApprovalRequest.status === RequestState.Closed && status === RequestState.Closed)
       throw new BadRequestError({ message: "Approval request is already closed" });
     if (secretApprovalRequest.status === RequestState.Open && status === RequestState.Open)
@@ -223,22 +207,13 @@ export const secretApprovalRequestServiceFactory = ({
     return { ...secretApprovalRequest, ...updatedRequest };
   };
 
-  const mergeSecretApprovalRequest = async ({
-    approvalId,
-    actor,
-    actorId
-  }: TMergeSecretApprovalRequestDTO) => {
+  const mergeSecretApprovalRequest = async ({ approvalId, actor, actorId }: TMergeSecretApprovalRequestDTO) => {
     const secretApprovalRequest = await secretApprovalRequestDAL.findById(approvalId);
-    if (!secretApprovalRequest)
-      throw new BadRequestError({ message: "Secret approval request not found" });
+    if (!secretApprovalRequest) throw new BadRequestError({ message: "Secret approval request not found" });
     if (actor !== ActorType.USER) throw new BadRequestError({ message: "Must be a user" });
 
     const { policy, folderId, projectId } = secretApprovalRequest;
-    const { membership } = await permissionService.getProjectPermission(
-      ActorType.USER,
-      actorId,
-      projectId
-    );
+    const { membership } = await permissionService.getProjectPermission(ActorType.USER, actorId, projectId);
     if (
       membership.role !== ProjectMembershipRole.Admin &&
       secretApprovalRequest.committerId !== membership.id &&
@@ -256,28 +231,24 @@ export const secretApprovalRequestServiceFactory = ({
         (approverId) => reviewers[approverId.toString()] === ApprovalStatus.APPROVED
       ).length;
 
-    if (!hasMinApproval)
-      throw new BadRequestError({ message: "Doesn't have minimum approvals needed" });
-    const secretApprovalSecrets = await secretApprovalRequestSecretDAL.findByRequestId(
-      secretApprovalRequest.id
-    );
+    if (!hasMinApproval) throw new BadRequestError({ message: "Doesn't have minimum approvals needed" });
+    const secretApprovalSecrets = await secretApprovalRequestSecretDAL.findByRequestId(secretApprovalRequest.id);
     if (!secretApprovalSecrets) throw new BadRequestError({ message: "No secrets found" });
 
     const conflicts: Array<{ secretId: string; op: CommitType }> = [];
     let secretCreationCommits = secretApprovalSecrets.filter(({ op }) => op === CommitType.Create);
     if (secretCreationCommits.length) {
-      const { secsGroupedByBlindIndex: conflictGroupByBlindIndex } =
-        await secretService.fnSecretBlindIndexCheckV2({
-          folderId,
-          inputSecrets: secretCreationCommits.map(({ secretBlindIndex }) => {
-            if (!secretBlindIndex) {
-              throw new BadRequestError({
-                message: "Missing secret blind index"
-              });
-            }
-            return { secretBlindIndex };
-          })
-        });
+      const { secsGroupedByBlindIndex: conflictGroupByBlindIndex } = await secretService.fnSecretBlindIndexCheckV2({
+        folderId,
+        inputSecrets: secretCreationCommits.map(({ secretBlindIndex }) => {
+          if (!secretBlindIndex) {
+            throw new BadRequestError({
+              message: "Missing secret blind index"
+            });
+          }
+          return { secretBlindIndex };
+        })
+      });
       secretCreationCommits
         .filter(({ secretBlindIndex }) => conflictGroupByBlindIndex[secretBlindIndex || ""])
         .forEach((el) => {
@@ -290,23 +261,19 @@ export const secretApprovalRequestServiceFactory = ({
 
     let secretUpdationCommits = secretApprovalSecrets.filter(({ op }) => op === CommitType.Update);
     if (secretUpdationCommits.length) {
-      const { secsGroupedByBlindIndex: conflictGroupByBlindIndex } =
-        await secretService.fnSecretBlindIndexCheckV2({
-          folderId,
-          inputSecrets: secretUpdationCommits
-            .filter(
-              ({ secretBlindIndex, secret }) =>
-                secret && secret.secretBlindIndex !== secretBlindIndex
-            )
-            .map(({ secretBlindIndex }) => {
-              if (!secretBlindIndex) {
-                throw new BadRequestError({
-                  message: "Missing secret blind index"
-                });
-              }
-              return { secretBlindIndex };
-            })
-        });
+      const { secsGroupedByBlindIndex: conflictGroupByBlindIndex } = await secretService.fnSecretBlindIndexCheckV2({
+        folderId,
+        inputSecrets: secretUpdationCommits
+          .filter(({ secretBlindIndex, secret }) => secret && secret.secretBlindIndex !== secretBlindIndex)
+          .map(({ secretBlindIndex }) => {
+            if (!secretBlindIndex) {
+              throw new BadRequestError({
+                message: "Missing secret blind index"
+              });
+            }
+            return { secretBlindIndex };
+          })
+      });
       secretUpdationCommits
         .filter(
           ({ secretBlindIndex, secretId }) =>
@@ -318,14 +285,11 @@ export const secretApprovalRequestServiceFactory = ({
 
       secretUpdationCommits = secretUpdationCommits.filter(
         ({ secretBlindIndex, secretId }) =>
-          Boolean(secretId) &&
-          (secretBlindIndex ? !conflictGroupByBlindIndex[secretBlindIndex] : true)
+          Boolean(secretId) && (secretBlindIndex ? !conflictGroupByBlindIndex[secretBlindIndex] : true)
       );
     }
 
-    const secretDeletionCommits = secretApprovalSecrets.filter(
-      ({ op }) => op === CommitType.Delete
-    );
+    const secretDeletionCommits = secretApprovalSecrets.filter(({ op }) => op === CommitType.Delete);
 
     const mergeStatus = await secretApprovalRequestDAL.transaction(async (tx) => {
       const newSecrets = secretCreationCommits.length
@@ -442,27 +406,20 @@ export const secretApprovalRequestServiceFactory = ({
     secretPath,
     environment
   }: TGenerateSecretApprovalRequestDTO) => {
-    if (actor === ActorType.SERVICE)
-      throw new BadRequestError({ message: "Cannot use service token" });
+    if (actor === ActorType.SERVICE) throw new BadRequestError({ message: "Cannot use service token" });
 
-    const { permission, membership } = await permissionService.getProjectPermission(
-      actor,
-      actorId,
-      projectId
-    );
+    const { permission, membership } = await permissionService.getProjectPermission(actor, actorId, projectId);
     ForbiddenError.from(permission).throwUnlessCan(
       ProjectPermissionActions.Read,
       subject(ProjectPermissionSub.Secrets, { environment, secretPath })
     );
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
-    if (!folder)
-      throw new BadRequestError({ message: "Folder not  found", name: "GenSecretApproval" });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "GenSecretApproval" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
-    if (!blindIndexCfg)
-      throw new BadRequestError({ message: "Blind index not found", name: "Update secret" });
+    if (!blindIndexCfg) throw new BadRequestError({ message: "Blind index not found", name: "Update secret" });
 
     const commits: Omit<TSecretApprovalRequestsSecretsInsert, "requestId">[] = [];
     const commitTagIds: Record<string, string[]> = {};
@@ -496,38 +453,28 @@ export const secretApprovalRequestServiceFactory = ({
       // get all blind index
       // Find all those secrets
       // if not throw not found
-      const { keyName2BlindIndex, secrets: secretsToBeUpdated } =
-        await secretService.fnSecretBlindIndexCheck({
-          inputSecrets: updatedSecrets,
-          folderId,
-          isNew: false,
-          blindIndexCfg
-        });
+      const { keyName2BlindIndex, secrets: secretsToBeUpdated } = await secretService.fnSecretBlindIndexCheck({
+        inputSecrets: updatedSecrets,
+        folderId,
+        isNew: false,
+        blindIndexCfg
+      });
 
       // now find any secret that needs to update its name
       // same process as above
-      const nameUpdatedSecrets = updatedSecrets.filter(({ newSecretName }) =>
-        Boolean(newSecretName)
-      );
-      const { keyName2BlindIndex: newKeyName2BlindIndex } =
-        await secretService.fnSecretBlindIndexCheck({
-          inputSecrets: nameUpdatedSecrets,
-          folderId,
-          isNew: true,
-          blindIndexCfg
-        });
+      const nameUpdatedSecrets = updatedSecrets.filter(({ newSecretName }) => Boolean(newSecretName));
+      const { keyName2BlindIndex: newKeyName2BlindIndex } = await secretService.fnSecretBlindIndexCheck({
+        inputSecrets: nameUpdatedSecrets,
+        folderId,
+        isNew: true,
+        blindIndexCfg
+      });
 
-      const secsGroupedByBlindIndex = groupBy(
-        secretsToBeUpdated,
-        (el) => el.secretBlindIndex as string
-      );
+      const secsGroupedByBlindIndex = groupBy(secretsToBeUpdated, (el) => el.secretBlindIndex as string);
       const updatedSecretIds = updatedSecrets.map(
         (el) => secsGroupedByBlindIndex[keyName2BlindIndex[el.secretName]][0].id
       );
-      const latestSecretVersions = await secretVersionDAL.findLatestVersionMany(
-        folderId,
-        updatedSecretIds
-      );
+      const latestSecretVersions = await secretVersionDAL.findLatestVersionMany(folderId, updatedSecretIds);
       commits.push(
         ...updatedSecrets.map(({ newSecretName, secretName, tagIds, ...el }) => {
           const secretId = secsGroupedByBlindIndex[keyName2BlindIndex[secretName]][0].id;
@@ -562,17 +509,13 @@ export const secretApprovalRequestServiceFactory = ({
         blindIndexCfg
       });
       const secretsGroupedByBlindIndex = groupBy(secrets, (i) => {
-        if (!i.secretBlindIndex)
-          throw new BadRequestError({ message: "Missing secret blind index" });
+        if (!i.secretBlindIndex) throw new BadRequestError({ message: "Missing secret blind index" });
         return i.secretBlindIndex;
       });
       const deletedSecretIds = deletedSecrets.map(
         (el) => secretsGroupedByBlindIndex[keyName2BlindIndex[el.secretName]][0].id
       );
-      const latestSecretVersions = await secretVersionDAL.findLatestVersionMany(
-        folderId,
-        deletedSecretIds
-      );
+      const latestSecretVersions = await secretVersionDAL.findLatestVersionMany(folderId, deletedSecretIds);
       commits.push(
         ...deletedSecrets.map((el) => {
           const secretId = secretsGroupedByBlindIndex[keyName2BlindIndex[el.secretName]][0].id;

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

@@ -1,8 +1,4 @@
-import {
-  TImmutableDBKeys,
-  TSecretApprovalPolicies,
-  TSecretApprovalRequestsSecrets
-} from "@app/db/schemas";
+import { TImmutableDBKeys, TSecretApprovalPolicies, TSecretApprovalRequestsSecrets } from "@app/db/schemas";
 import { TProjectPermission } from "@app/lib/types";
 
 export enum CommitType {
@@ -24,14 +20,7 @@ export enum ApprovalStatus {
 
 type TApprovalCreateSecret = Omit<
   TSecretApprovalRequestsSecrets,
-  | TImmutableDBKeys
-  | "version"
-  | "algorithm"
-  | "keyEncoding"
-  | "requestId"
-  | "op"
-  | "secretVersion"
-  | "secretBlindIndex"
+  TImmutableDBKeys | "version" | "algorithm" | "keyEncoding" | "requestId" | "op" | "secretVersion" | "secretBlindIndex"
 > & {
   secretName: string;
   tagIds?: string[];