From f829cdd8a724dae42ab93aaadf930d433dd2cc4d Mon Sep 17 00:00:00 2001
From: aj-rosado <109146700+aj-rosado@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:18:11 +0100
Subject: [PATCH] [PM-7603] Fix individual vault export not appearing on Event
 Logs (#8829)

* Added validation to update User_ClientExportedVault on events even with no organization id or cipher id

* Fixed missing data and validation
---
 .../common/src/services/event/event-collection.service.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts
index 641c1b4d44b..1482bb8b61e 100644
--- a/libs/common/src/services/event/event-collection.service.ts
+++ b/libs/common/src/services/event/event-collection.service.ts
@@ -36,7 +36,7 @@ export class EventCollectionService implements EventCollectionServiceAbstraction
     const userId = await firstValueFrom(this.stateProvider.activeUserId$);
     const eventStore = this.stateProvider.getUser(userId, EVENT_COLLECTION);
 
-    if (!(await this.shouldUpdate(cipherId, organizationId))) {
+    if (!(await this.shouldUpdate(cipherId, organizationId, eventType))) {
       return;
     }
 
@@ -64,6 +64,7 @@ export class EventCollectionService implements EventCollectionServiceAbstraction
   private async shouldUpdate(
     cipherId: string = null,
     organizationId: string = null,
+    eventType: EventType = null,
   ): Promise<boolean> {
     const orgIds$ = this.organizationService.organizations$.pipe(
       map((orgs) => orgs?.filter((o) => o.useEvents)?.map((x) => x.id) ?? []),
@@ -85,6 +86,11 @@ export class EventCollectionService implements EventCollectionServiceAbstraction
       return false;
     }
 
+    // Individual vault export doesn't need cipher id or organization id.
+    if (eventType == EventType.User_ClientExportedVault) {
+      return true;
+    }
+
     // If the cipher is null there must be an organization id provided
     if (cipher == null && organizationId == null) {
       return false;