diff --git a/backend/src/services/project-membership/project-membership-service.ts b/backend/src/services/project-membership/project-membership-service.ts index fbaa0bb00..e96247c97 100644 --- a/backend/src/services/project-membership/project-membership-service.ts +++ b/backend/src/services/project-membership/project-membership-service.ts @@ -21,7 +21,7 @@ import { groupBy } from "@app/lib/fn"; import { ActorType } from "../auth/auth-type"; import { TOrgDALFactory } from "../org/org-dal"; import { TProjectDALFactory } from "../project/project-dal"; -import { createWsMembers } from "../project/project-fns"; +import { assignWorkspaceKeysToMembers } from "../project/project-fns"; import { TProjectBotDALFactory } from "../project-bot/project-bot-dal"; import { TProjectKeyDALFactory } from "../project-key/project-key-dal"; import { TProjectRoleDALFactory } from "../project-role/project-role-dal"; @@ -275,7 +275,7 @@ export const projectMembershipServiceFactory = ({ ciphertext: bot.encryptedPrivateKey }); - const newWsMembers = createWsMembers({ + const newWsMembers = assignWorkspaceKeysToMembers({ decryptKey: ghostUserLatestKey, userPrivateKey: botPrivateKey, members: orgMembers.map((membership) => ({ diff --git a/backend/src/services/project/project-fns.ts b/backend/src/services/project/project-fns.ts index eb6fe3b11..0f1f5a08d 100644 --- a/backend/src/services/project/project-fns.ts +++ b/backend/src/services/project/project-fns.ts @@ -4,8 +4,8 @@ import { decryptAsymmetric, encryptAsymmetric } from "@app/lib/crypto"; import { AddUserToWsDTO } from "./project-types"; -export const createWsMembers = ({ members, decryptKey, userPrivateKey }: AddUserToWsDTO) => { - const key = decryptAsymmetric({ +export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateKey }: AddUserToWsDTO) => { + const plaintextProjectKey = decryptAsymmetric({ ciphertext: decryptKey.encryptedKey, nonce: decryptKey.nonce, publicKey: decryptKey.sender.publicKey, @@ -14,7 +14,7 @@ export const createWsMembers = ({ members, decryptKey, userPrivateKey }: AddUser const newWsMembers = members.map(({ orgMembershipId, userPublicKey, projectMembershipRole }) => { const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric( - key, + plaintextProjectKey, userPublicKey, userPrivateKey ); diff --git a/backend/src/services/project/project-queue.ts b/backend/src/services/project/project-queue.ts index 5620a89c4..7bf9f0e51 100644 --- a/backend/src/services/project/project-queue.ts +++ b/backend/src/services/project/project-queue.ts @@ -43,7 +43,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"; +import { assignWorkspaceKeysToMembers, createProjectKey } from "./project-fns"; export type TProjectQueueFactory = ReturnType; @@ -260,7 +260,7 @@ export const projectQueueFactory = ({ throw new Error(`User with ID ${key.receiverId} was not found during upgrade, or user is not in org.`); } - const [newMember] = createWsMembers({ + const [newMember] = assignWorkspaceKeysToMembers({ decryptKey: ghostUserLatestKey, userPrivateKey: ghostUser.keys.plainPrivateKey, members: [