diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts index 3624344f1..8569ef2a9 100644 --- a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts +++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts @@ -761,11 +761,7 @@ export const secretApprovalRequestServiceFactory = ({ secretDAL, secretVersionDAL, secretTagDAL, - secretVersionTagDAL, - actor: { - type: actor, - actorId - } + secretVersionTagDAL }) : []; const updatedSecrets = secretUpdationCommits.length @@ -811,11 +807,7 @@ export const secretApprovalRequestServiceFactory = ({ secretDAL, secretVersionDAL, secretTagDAL, - secretVersionTagDAL, - actor: { - type: actor, - actorId - } + secretVersionTagDAL }) : []; const deletedSecret = secretDeletionCommits.length diff --git a/backend/src/ee/services/secret-replication/secret-replication-service.ts b/backend/src/ee/services/secret-replication/secret-replication-service.ts index c9b0a3532..3c25db98c 100644 --- a/backend/src/ee/services/secret-replication/secret-replication-service.ts +++ b/backend/src/ee/services/secret-replication/secret-replication-service.ts @@ -710,10 +710,6 @@ export const secretReplicationServiceFactory = ({ tx, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, inputSecrets: locallyCreatedSecrets.map((doc) => { return { keyEncoding: doc.keyEncoding, @@ -745,10 +741,6 @@ export const secretReplicationServiceFactory = ({ tx, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, inputSecrets: locallyUpdatedSecrets.map((doc) => { return { filter: { diff --git a/backend/src/services/secret/secret-fns.ts b/backend/src/services/secret/secret-fns.ts index 3ecdcbd08..d7c9b86fb 100644 --- a/backend/src/services/secret/secret-fns.ts +++ b/backend/src/services/secret/secret-fns.ts @@ -525,7 +525,6 @@ export const fnSecretBulkInsert = async ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor, tx }: TFnSecretBulkInsert) => { const sanitizedInputSecrets = inputSecrets.map( @@ -581,16 +580,9 @@ export const fnSecretBulkInsert = async ({ })) ); - const userActorId = actor && actor?.type === ActorType.USER ? actor?.actorId : undefined; - const identityActorId = actor && actor?.type !== ActorType.USER ? actor?.actorId : undefined; - const actorType = actor?.type || ActorType.PLATFORM; - const secretVersions = await secretVersionDAL.insertMany( sanitizedInputSecrets.map((el) => ({ ...el, - userActorId, - identityActorId, - actorType, secretId: newSecretGroupByBlindIndex[el.secretBlindIndex as string][0].id })), tx @@ -623,8 +615,7 @@ export const fnSecretBulkUpdate = async ({ secretDAL, secretVersionDAL, secretTagDAL, - secretVersionTagDAL, - actor + secretVersionTagDAL }: TFnSecretBulkUpdate) => { const sanitizedInputSecrets = inputSecrets.map( ({ @@ -674,17 +665,10 @@ export const fnSecretBulkUpdate = async ({ }) ); - const userActorId = actor && actor?.type === ActorType.USER ? actor?.actorId : undefined; - const identityActorId = actor && actor?.type !== ActorType.USER ? actor?.actorId : undefined; - const actorType = actor?.type || ActorType.PLATFORM; - const newSecrets = await secretDAL.bulkUpdate(sanitizedInputSecrets, tx); const secretVersions = await secretVersionDAL.insertMany( newSecrets.map(({ id, createdAt, updatedAt, ...el }) => ({ ...el, - userActorId, - identityActorId, - actorType, secretId: id })), tx diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts index 49640ac2a..93f68e813 100644 --- a/backend/src/services/secret/secret-service.ts +++ b/backend/src/services/secret/secret-service.ts @@ -284,10 +284,6 @@ export const secretServiceFactory = ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, tx }) ); @@ -433,10 +429,6 @@ export const secretServiceFactory = ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, tx }) ); @@ -830,10 +822,6 @@ export const secretServiceFactory = ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, tx }) ); @@ -943,11 +931,7 @@ export const secretServiceFactory = ({ secretDAL, secretVersionDAL, secretTagDAL, - secretVersionTagDAL, - actor: { - type: actor, - actorId - } + secretVersionTagDAL }) ); @@ -2420,10 +2404,6 @@ export const secretServiceFactory = ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, tx }) ); @@ -2534,10 +2514,6 @@ export const secretServiceFactory = ({ secretVersionDAL, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, tx }) ); @@ -2872,10 +2848,6 @@ export const secretServiceFactory = ({ secretDAL, tx, secretTagDAL, - actor: { - type: actor, - actorId - }, secretVersionTagDAL, inputSecrets: locallyCreatedSecrets.map((doc) => { return { @@ -2907,10 +2879,6 @@ export const secretServiceFactory = ({ tx, secretTagDAL, secretVersionTagDAL, - actor: { - type: actor, - actorId - }, inputSecrets: locallyUpdatedSecrets.map((doc) => { return { filter: { diff --git a/backend/src/services/secret/secret-types.ts b/backend/src/services/secret/secret-types.ts index 4b671b02d..158605276 100644 --- a/backend/src/services/secret/secret-types.ts +++ b/backend/src/services/secret/secret-types.ts @@ -322,10 +322,6 @@ export type TFnSecretBulkInsert = { secretVersionDAL: Pick; secretTagDAL: Pick; secretVersionTagDAL: Pick; - actor?: { - type?: string; - actorId?: string; - }; }; export type TFnSecretBulkUpdate = { @@ -340,10 +336,6 @@ export type TFnSecretBulkUpdate = { secretTagDAL: Pick; secretVersionTagDAL: Pick; tx?: Knex; - actor?: { - type?: string; - actorId?: string; - }; }; export type TAttachSecretTagsDTO = {