awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 14:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renaming

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-22 05:00:26 +01:00
parent ae3606c9fb
commit 9c11226b71
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/project-membership/project-membership-service.ts
+2 -2
View File
@@ -21,7 +21,7 @@ import { groupBy } from "@app/lib/fn";
import { ActorType } from "../auth/auth-type"; import { ActorType } from "../auth/auth-type";
import { TOrgDALFactory } from "../org/org-dal"; import { TOrgDALFactory } from "../org/org-dal";
import { TProjectDALFactory } from "../project/project-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 { TProjectBotDALFactory } from "../project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "../project-key/project-key-dal"; import { TProjectKeyDALFactory } from "../project-key/project-key-dal";
import { TProjectRoleDALFactory } from "../project-role/project-role-dal"; import { TProjectRoleDALFactory } from "../project-role/project-role-dal";
@@ -275,7 +275,7 @@ export const projectMembershipServiceFactory = ({
ciphertext: bot.encryptedPrivateKey ciphertext: bot.encryptedPrivateKey
}); });
const newWsMembers = createWsMembers({ const newWsMembers = assignWorkspaceKeysToMembers({
decryptKey: ghostUserLatestKey, decryptKey: ghostUserLatestKey,
userPrivateKey: botPrivateKey, userPrivateKey: botPrivateKey,
members: orgMembers.map((membership) => ({ members: orgMembers.map((membership) => ({
backend/src/services/project/project-fns.ts
+3 -3
View File
@@ -4,8 +4,8 @@ import { decryptAsymmetric, encryptAsymmetric } from "@app/lib/crypto";
import { AddUserToWsDTO } from "./project-types"; import { AddUserToWsDTO } from "./project-types";
export const createWsMembers = ({ members, decryptKey, userPrivateKey }: AddUserToWsDTO) => { export const assignWorkspaceKeysToMembers = ({ members, decryptKey, userPrivateKey }: AddUserToWsDTO) => {
const key = decryptAsymmetric({ const plaintextProjectKey = decryptAsymmetric({
ciphertext: decryptKey.encryptedKey, ciphertext: decryptKey.encryptedKey,
nonce: decryptKey.nonce, nonce: decryptKey.nonce,
publicKey: decryptKey.sender.publicKey, publicKey: decryptKey.sender.publicKey,
@@ -14,7 +14,7 @@ export const createWsMembers = ({ members, decryptKey, userPrivateKey }: AddUser
const newWsMembers = members.map(({ orgMembershipId, userPublicKey, projectMembershipRole }) => { const newWsMembers = members.map(({ orgMembershipId, userPublicKey, projectMembershipRole }) => {
const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric( const { ciphertext: inviteeCipherText, nonce: inviteeNonce } = encryptAsymmetric(
key, plaintextProjectKey,
userPublicKey, userPublicKey,
userPrivateKey userPrivateKey
); );
backend/src/services/project/project-queue.ts
+2 -2
View File
@@ -43,7 +43,7 @@ import { TSecretVersionDALFactory } from "../secret/secret-version-dal";
import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal"; import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";
import { TUserDALFactory } from "../user/user-dal"; import { TUserDALFactory } from "../user/user-dal";
import { TProjectDALFactory } from "./project-dal"; import { TProjectDALFactory } from "./project-dal";
import { createProjectKey, createWsMembers } from "./project-fns"; import { assignWorkspaceKeysToMembers, createProjectKey } from "./project-fns";
export type TProjectQueueFactory = ReturnType<typeof projectQueueFactory>; export type TProjectQueueFactory = ReturnType<typeof projectQueueFactory>;
@@ -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.`); 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, decryptKey: ghostUserLatestKey,
userPrivateKey: ghostUser.keys.plainPrivateKey, userPrivateKey: ghostUser.keys.plainPrivateKey,
members: [ members: [