awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove project role from workspace user encryption computation

Browse Source
This commit is contained in:
Daniel Hougaard
2024-09-06 10:39:27 +04:00
parent 2e3dcc50ae
commit ceab951bca
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/services/project/project-fns.ts
View File

@@ -16,7 +16,7 @@ export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateK
privateKey: userPrivateKey
});
const newWsMembers = members.map(({ orgMembershipId, userPublicKey, projectMembershipRole }) => {
const newWsMembers = members.map(({ orgMembershipId, userPublicKey }) => {
const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric(
plaintextProjectKey,
userPublicKey,
@@ -25,7 +25,6 @@ export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateK
return {
orgMembershipId,
projectRole: projectMembershipRole,
workspaceEncryptedKey: inviteeCipherText,
workspaceEncryptedNonce: inviteeNonce
};

3
backend/src/services/project/project-queue.ts
View File

@@ -300,8 +300,7 @@ export const projectQueueFactory = ({
members: [
{
userPublicKey: user.publicKey,
orgMembershipId: orgMembership.id,
projectMembershipRole: ProjectMembershipRole.Admin
orgMembershipId: orgMembership.id
}
]
});

5
backend/src/services/project/project-service.ts
View File

@@ -277,8 +277,7 @@ export const projectServiceFactory = ({
members: [
{
userPublicKey: user.publicKey,
orgMembershipId: orgMembership.id,
projectMembershipRole: ProjectMembershipRole.Admin
orgMembershipId: orgMembership.id
}
]
});
@@ -292,7 +291,7 @@ export const projectServiceFactory = ({
tx
);
await projectUserMembershipRoleDAL.create(
{ projectMembershipId: userProjectMembership.id, role: projectAdmin.projectRole },
{ projectMembershipId: userProjectMembership.id, role: ProjectMembershipRole.Admin },
tx
);

3
backend/src/services/project/project-types.ts
View File

@@ -1,4 +1,4 @@
import { ProjectMembershipRole, TProjectKeys } from "@app/db/schemas";
import { TProjectKeys } from "@app/db/schemas";
import { TProjectPermission } from "@app/lib/types";
import { ActorAuthMethod, ActorType } from "../auth/auth-type";
@@ -88,7 +88,6 @@ export type AddUserToWsDTO = {
userPrivateKey: string;
members: {
orgMembershipId: string;
projectMembershipRole: ProjectMembershipRole;
userPublicKey: string;
}[];
};