From 4121c1d5732d4c28728af3f2ec835591b9933b5d Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Sat, 17 Feb 2024 01:03:03 +0100
Subject: [PATCH] Requested changes

---
 backend/src/services/project/project-queue.ts   |  9 ++-------
 backend/src/services/project/project-service.ts |  2 +-
 backend/src/services/project/project-types.ts   | 11 +++++++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/backend/src/services/project/project-queue.ts b/backend/src/services/project/project-queue.ts
index 81b0afe60..2b364bd53 100644
--- a/backend/src/services/project/project-queue.ts
+++ b/backend/src/services/project/project-queue.ts
@@ -16,7 +16,6 @@ import {
   infisicalSymmetricEncypt
 } from "@app/lib/crypto/encryption";
 import { logger } from "@app/lib/logger";
-import { createProjectKey, createWsMembers } from "@app/lib/project";
 import { decryptSecrets, SecretDocType, TPartialSecret } from "@app/lib/secret";
 import { QueueJobs, QueueName, TQueueJobTypes, TQueueServiceFactory } from "@app/queue";
 
@@ -31,6 +30,7 @@ import { TSecretVersionDALFactory } from "../secret/secret-version-dal";
 import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";
 import { TUserDALFactory } from "../user/user-dal";
 import { TProjectDALFactory } from "./project-dal";
+import { createProjectKey, createWsMembers } from "./project-fns";
 
 export type TProjectQueueFactory = ReturnType<typeof projectQueueFactory>;
 
@@ -143,12 +143,7 @@ export const projectQueueFactory = ({
         secrets.push(...approvalSecrets.map((el) => ({ ...el, docType: SecretDocType.ApprovalSecret })));
       }
 
-      const decryptedSecrets = decryptSecrets(
-        // secrets.filter((s) => s.keyEncoding === "base64"),
-        secrets,
-        userPrivateKey,
-        oldProjectKey
-      );
+      const decryptedSecrets = decryptSecrets(secrets, userPrivateKey, oldProjectKey);
 
       if (secrets.length !== decryptedSecrets.length) {
         throw new Error("Failed to decrypt some secret versions");
diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts
index f3bbff491..86c606e67 100644
--- a/backend/src/services/project/project-service.ts
+++ b/backend/src/services/project/project-service.ts
@@ -15,7 +15,6 @@ import { createSecretBlindIndex } from "@app/lib/crypto";
 import { infisicalSymmetricEncypt } from "@app/lib/crypto/encryption";
 import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
-import { createProjectKey, createWsMembers } from "@app/lib/project";
 import { TProjectPermission } from "@app/lib/types";
 
 import { ActorType } from "../auth/auth-type";
@@ -30,6 +29,7 @@ import { TSecretBlindIndexDALFactory } from "../secret-blind-index/secret-blind-
 import { ROOT_FOLDER_NAME, TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";
 import { TUserDALFactory } from "../user/user-dal";
 import { TProjectDALFactory } from "./project-dal";
+import { createProjectKey, createWsMembers } from "./project-fns";
 import { TProjectQueueFactory } from "./project-queue";
 import { TCreateProjectDTO, TDeleteProjectDTO, TGetProjectDTO, TUpgradeProjectDTO } from "./project-types";
 
diff --git a/backend/src/services/project/project-types.ts b/backend/src/services/project/project-types.ts
index d4bbd9af1..e6468e528 100644
--- a/backend/src/services/project/project-types.ts
+++ b/backend/src/services/project/project-types.ts
@@ -1,3 +1,4 @@
+import { ProjectMembershipRole, TProjectKeys } from "@app/db/schemas";
 import { TProjectPermission } from "@app/lib/types";
 
 import { ActorType } from "../auth/auth-type";
@@ -27,3 +28,13 @@ export type TGetProjectDTO = {
 export type TUpgradeProjectDTO = {
   userPrivateKey: string;
 } & TProjectPermission;
+
+export type AddUserToWsDTO = {
+  decryptKey: TProjectKeys & { sender: { publicKey: string } };
+  userPrivateKey: string;
+  members: {
+    orgMembershipId: string;
+    projectMembershipRole: ProjectMembershipRole;
+    userPublicKey: string;
+  }[];
+};