feat: remove project role from workspace user encryption computation

This commit is contained in:
Daniel Hougaard
2024-09-12 11:03:20 +04:00
parent 2e3dcc50ae
commit ceab951bca
4 changed files with 5 additions and 9 deletions
+1 -2
View File
@@ -16,7 +16,7 @@ export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateK
privateKey: userPrivateKey privateKey: userPrivateKey
}); });
const newWsMembers = members.map(({ orgMembershipId, userPublicKey, projectMembershipRole }) => { const newWsMembers = members.map(({ orgMembershipId, userPublicKey }) => {
const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric( const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric(
plaintextProjectKey, plaintextProjectKey,
userPublicKey, userPublicKey,
@@ -25,7 +25,6 @@ export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateK
return { return {
orgMembershipId, orgMembershipId,
projectRole: projectMembershipRole,
workspaceEncryptedKey: inviteeCipherText, workspaceEncryptedKey: inviteeCipherText,
workspaceEncryptedNonce: inviteeNonce workspaceEncryptedNonce: inviteeNonce
}; };
@@ -300,8 +300,7 @@ export const projectQueueFactory = ({
members: [ members: [
{ {
userPublicKey: user.publicKey, userPublicKey: user.publicKey,
orgMembershipId: orgMembership.id, orgMembershipId: orgMembership.id
projectMembershipRole: ProjectMembershipRole.Admin
} }
] ]
}); });
@@ -277,8 +277,7 @@ export const projectServiceFactory = ({
members: [ members: [
{ {
userPublicKey: user.publicKey, userPublicKey: user.publicKey,
orgMembershipId: orgMembership.id, orgMembershipId: orgMembership.id
projectMembershipRole: ProjectMembershipRole.Admin
} }
] ]
}); });
@@ -292,7 +291,7 @@ export const projectServiceFactory = ({
tx tx
); );
await projectUserMembershipRoleDAL.create( await projectUserMembershipRoleDAL.create(
{ projectMembershipId: userProjectMembership.id, role: projectAdmin.projectRole }, { projectMembershipId: userProjectMembership.id, role: ProjectMembershipRole.Admin },
tx tx
); );
@@ -1,4 +1,4 @@
import { ProjectMembershipRole, TProjectKeys } from "@app/db/schemas"; import { TProjectKeys } from "@app/db/schemas";
import { TProjectPermission } from "@app/lib/types"; import { TProjectPermission } from "@app/lib/types";
import { ActorAuthMethod, ActorType } from "../auth/auth-type"; import { ActorAuthMethod, ActorType } from "../auth/auth-type";
@@ -88,7 +88,6 @@ export type AddUserToWsDTO = {
userPrivateKey: string; userPrivateKey: string;
members: { members: {
orgMembershipId: string; orgMembershipId: string;
projectMembershipRole: ProjectMembershipRole;
userPublicKey: string; userPublicKey: string;
}[]; }[];
}; };