[PS-1906] Extract uploadEvents from EventService into new service (#4108)

* Move event.service to it's own folder

Move abstractions/event.service to abstractions/event/event.service
Move services/event.service to services/event/event.service
Fix all the imports

* Extract event-upload from event.service

Move `uploadEvents` from `EventService` to `EventUploadService`
Create event-upload-service-factory
Fix wiring up all the dependencies

* Remove clearEvents from EventService

clearEvents is only related to uploading events and can be moved into EventUploadService

Change the logout-method to only call EventUploadService.uploadEvents as that also calls clearEvents internally

* Rename EventService to EventCollectionService

Rename libs\common\abstraction\event\event.service.ts to libs\common\abstractions\event\event-collection.service.ts

Rename libs\common\services\event\event.service.ts to libs\common\services\event\event-collection.service.ts

Fix all the imports

Fix up service regristration/instantiation

Reanme \browser\src\background\service_factories\event-service.factory.ts to \browser\src\background\service_factories\event-collection-service.factory.ts

* Move interval to upload events to EventUploadSvc

Move the `init()` from event-collection.service to event-upload.service
Change call-site in web, desktop, browser

apps/browser/src/background/contextMenus.background.ts

@@ -1,6 +1,6 @@
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
@@ -24,7 +24,7 @@ export default class ContextMenusBackground {
     private passwordGenerationService: PasswordGenerationService,
     private platformUtilsService: PlatformUtilsService,
     private authService: AuthService,
-    private eventService: EventService,
+    private eventCollectionService: EventCollectionService,
     private totpService: TotpService
   ) {
     this.contextMenus = chrome.contextMenus;
@@ -124,7 +124,7 @@ export default class ContextMenusBackground {
       this.platformUtilsService.copyToClipboard(cipher.login.username, { window: window });
     } else if (info.parentMenuItemId === "copy-password") {
       this.platformUtilsService.copyToClipboard(cipher.login.password, { window: window });
-      this.eventService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
     } else if (info.parentMenuItemId === "copy-totp") {
       const totpValue = await this.totpService.getCode(cipher.login.totp);
       this.platformUtilsService.copyToClipboard(totpValue, { window: window });

apps/browser/src/background/main.background.ts

@@ -7,7 +7,8 @@ import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/co
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
 import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
@@ -54,7 +55,8 @@ import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service
 import { ContainerService } from "@bitwarden/common/services/container.service";
 import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation";
 import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/services/cryptography/multithread-encrypt.service.implementation";
-import { EventService } from "@bitwarden/common/services/event.service";
+import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
+import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
 import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
@@ -148,7 +150,8 @@ export default class MainBackground {
   stateService: StateServiceAbstraction;
   stateMigrationService: StateMigrationService;
   systemService: SystemServiceAbstraction;
-  eventService: EventServiceAbstraction;
+  eventCollectionService: EventCollectionServiceAbstraction;
+  eventUploadService: EventUploadServiceAbstraction;
   policyService: InternalPolicyServiceAbstraction;
   popupUtilsService: PopupUtilsService;
   sendService: SendServiceAbstraction;
@@ -412,12 +415,16 @@ export default class MainBackground {
       this.organizationService,
       logoutCallback
     );
-    this.eventService = new EventService(
+    this.eventUploadService = new EventUploadService(
       this.apiService,
+      this.stateService,
+      this.logService
+    );
+    this.eventCollectionService = new EventCollectionService(
       this.cipherService,
       this.stateService,
-      this.logService,
-      this.organizationService
+      this.organizationService,
+      this.eventUploadService
     );
     this.passwordGenerationService = new PasswordGenerationService(
       this.cryptoService,
@@ -429,7 +436,7 @@ export default class MainBackground {
       this.cipherService,
       this.stateService,
       this.totpService,
-      this.eventService,
+      this.eventCollectionService,
       this.logService
     );
     this.containerService = new ContainerService(this.cryptoService, this.encryptService);
@@ -532,7 +539,7 @@ export default class MainBackground {
       this.passwordGenerationService,
       this.platformUtilsService,
       this.authService,
-      this.eventService,
+      this.eventCollectionService,
       this.totpService
     );
     this.idleBackground = new IdleBackground(
@@ -560,7 +567,7 @@ export default class MainBackground {
 
     await (this.vaultTimeoutService as VaultTimeoutService).init(true);
     await (this.i18nService as I18nService).init();
-    await (this.eventService as EventService).init(true);
+    await (this.eventUploadService as EventUploadService).init(true);
     await this.runtimeBackground.init();
     await this.notificationBackground.init();
     await this.commandsBackground.init();
@@ -626,10 +633,9 @@ export default class MainBackground {
   }
 
   async logout(expired: boolean, userId?: string) {
-    await this.eventService.uploadEvents(userId);
+    await this.eventUploadService.uploadEvents(userId);
 
     await Promise.all([
-      this.eventService.clearEvents(userId),
       this.syncService.setLastSync(new Date(0), userId),
       this.cryptoService.clearKeys(userId),
       this.settingsService.clear(userId),

apps/browser/src/background/service_factories/autofill-service.factory.ts

@@ -2,7 +2,10 @@ import { AutofillService as AbstractAutoFillService } from "../../services/abstr
 import AutofillService from "../../services/autofill.service";
 
 import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
-import { EventServiceInitOptions, eventServiceFactory } from "./event-service.factory";
+import {
+  EventCollectionServiceInitOptions,
+  eventCollectionServiceFactory,
+} from "./event-collection-service.factory";
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
 import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
@@ -14,7 +17,7 @@ export type AutoFillServiceInitOptions = AutoFillServiceOptions &
   CipherServiceInitOptions &
   StateServiceInitOptions &
   TotpServiceInitOptions &
-  EventServiceInitOptions &
+  EventCollectionServiceInitOptions &
   LogServiceInitOptions;
 
 export function autofillServiceFactory(
@@ -30,7 +33,7 @@ export function autofillServiceFactory(
         await cipherServiceFactory(cache, opts),
         await stateServiceFactory(cache, opts),
         await totpServiceFactory(cache, opts),
-        await eventServiceFactory(cache, opts),
+        await eventCollectionServiceFactory(cache, opts),
         await logServiceFactory(cache, opts)
       )
   );

apps/browser/src/background/service_factories/event-collection-service.factory.ts

@@ -0,0 +1,40 @@
+import { EventCollectionService as AbstractEventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
+
+import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
+import {
+  eventUploadServiceFactory,
+  EventUploadServiceInitOptions,
+} from "./event-upload-service.factory";
+import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import {
+  organizationServiceFactory,
+  OrganizationServiceInitOptions,
+} from "./organization-service.factory";
+import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+
+type EventCollectionServiceOptions = FactoryOptions;
+
+export type EventCollectionServiceInitOptions = EventCollectionServiceOptions &
+  CipherServiceInitOptions &
+  StateServiceInitOptions &
+  OrganizationServiceInitOptions &
+  EventUploadServiceInitOptions;
+
+export function eventCollectionServiceFactory(
+  cache: { eventCollectionService?: AbstractEventCollectionService } & CachedServices,
+  opts: EventCollectionServiceInitOptions
+): Promise<AbstractEventCollectionService> {
+  return factory(
+    cache,
+    "eventCollectionService",
+    opts,
+    async () =>
+      new EventCollectionService(
+        await cipherServiceFactory(cache, opts),
+        await stateServiceFactory(cache, opts),
+        await organizationServiceFactory(cache, opts),
+        await eventUploadServiceFactory(cache, opts)
+      )
+  );
+}

apps/browser/src/background/service_factories/event-service.factory.ts

@@ -1,40 +0,0 @@
-import { EventService as AbstractEventService } from "@bitwarden/common/abstractions/event.service";
-import { EventService } from "@bitwarden/common/services/event.service";
-
-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
-import {
-  organizationServiceFactory,
-  OrganizationServiceInitOptions,
-} from "./organization-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
-
-type EventServiceOptions = FactoryOptions;
-
-export type EventServiceInitOptions = EventServiceOptions &
-  ApiServiceInitOptions &
-  CipherServiceInitOptions &
-  StateServiceInitOptions &
-  LogServiceInitOptions &
-  OrganizationServiceInitOptions;
-
-export function eventServiceFactory(
-  cache: { eventService?: AbstractEventService } & CachedServices,
-  opts: EventServiceInitOptions
-): Promise<AbstractEventService> {
-  return factory(
-    cache,
-    "eventService",
-    opts,
-    async () =>
-      new EventService(
-        await apiServiceFactory(cache, opts),
-        await cipherServiceFactory(cache, opts),
-        await stateServiceFactory(cache, opts),
-        await logServiceFactory(cache, opts),
-        await organizationServiceFactory(cache, opts)
-      )
-  );
-}

apps/browser/src/background/service_factories/event-upload-service.factory.ts

@@ -0,0 +1,31 @@
+import { EventUploadService as AbstractEventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
+import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
+
+import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
+import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+
+type EventUploadServiceOptions = FactoryOptions;
+
+export type EventUploadServiceInitOptions = EventUploadServiceOptions &
+  ApiServiceInitOptions &
+  StateServiceInitOptions &
+  LogServiceInitOptions;
+
+export function eventUploadServiceFactory(
+  cache: { eventUploadService?: AbstractEventUploadService } & CachedServices,
+  opts: EventUploadServiceInitOptions
+): Promise<AbstractEventUploadService> {
+  return factory(
+    cache,
+    "eventUploadService",
+    opts,
+    async () =>
+      new EventUploadService(
+        await apiServiceFactory(cache, opts),
+        await stateServiceFactory(cache, opts),
+        await logServiceFactory(cache, opts)
+      )
+  );
+}

apps/browser/src/popup/components/action-buttons.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -27,7 +27,7 @@ export class ActionButtonsComponent {
   constructor(
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
-    private eventService: EventService,
+    private eventCollectionService: EventCollectionService,
     private totpService: TotpService,
     private stateService: StateService,
     private passwordRepromptService: PasswordRepromptService
@@ -68,9 +68,12 @@ export class ActionButtonsComponent {
     );
 
     if (typeI18nKey === "password" || typeI18nKey === "verificationCodeTotp") {
-      this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, cipher.id);
+      this.eventCollectionService.collect(
+        EventType.Cipher_ClientToggledHiddenFieldVisible,
+        cipher.id
+      );
     } else if (typeI18nKey === "securityCode") {
-      this.eventService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
+      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
     }
   }
 

apps/browser/src/popup/services/services.module.ts

@@ -15,7 +15,8 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service";
@@ -195,7 +196,16 @@ function getBgService<T>(service: keyof MainBackground) {
     { provide: TokenService, useFactory: getBgService<TokenService>("tokenService"), deps: [] },
     { provide: I18nService, useFactory: getBgService<I18nService>("i18nService"), deps: [] },
     { provide: CryptoService, useFactory: getBgService<CryptoService>("cryptoService"), deps: [] },
-    { provide: EventService, useFactory: getBgService<EventService>("eventService"), deps: [] },
+    {
+      provide: EventUploadService,
+      useFactory: getBgService<EventUploadService>("eventUploadService"),
+      deps: [],
+    },
+    {
+      provide: EventCollectionService,
+      useFactory: getBgService<EventCollectionService>("eventCollectionService"),
+      deps: [],
+    },
     {
       provide: PolicyService,
       useFactory: (

apps/browser/src/popup/settings/export.component.ts

@@ -4,7 +4,7 @@ import { Router } from "@angular/router";
 
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -23,7 +23,7 @@ export class ExportComponent extends BaseExportComponent {
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     exportService: ExportService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     private router: Router,
     logService: LogService,
@@ -36,7 +36,7 @@ export class ExportComponent extends BaseExportComponent {
       i18nService,
       platformUtilsService,
       exportService,
-      eventService,
+      eventCollectionService,
       policyService,
       window,
       logService,

apps/browser/src/popup/vault/add-edit-custom-fields.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 @Component({
@@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
   templateUrl: "add-edit-custom-fields.component.html",
 })
 export class AddEditCustomFieldsComponent extends BaseAddEditCustomFieldsComponent {
-  constructor(i18nService: I18nService, eventService: EventService) {
-    super(i18nService, eventService);
+  constructor(i18nService: I18nService, eventCollectionService: EventCollectionService) {
+    super(i18nService, eventCollectionService);
   }
 }

apps/browser/src/popup/vault/add-edit.component.ts

@@ -7,7 +7,7 @@ import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/com
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -46,7 +46,7 @@ export class AddEditComponent extends BaseAddEditComponent {
     private route: ActivatedRoute,
     private router: Router,
     private location: Location,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     private popupUtilsService: PopupUtilsService,
     organizationService: OrganizationService,
@@ -62,7 +62,7 @@ export class AddEditComponent extends BaseAddEditComponent {
       stateService,
       collectionService,
       messagingService,
-      eventService,
+      eventCollectionService,
       policyService,
       logService,
       passwordRepromptService,

apps/browser/src/popup/vault/view-custom-fields.component.ts

@@ -1,14 +1,14 @@
 import { Component } from "@angular/core";
 
 import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 
 @Component({
   selector: "app-vault-view-custom-fields",
   templateUrl: "view-custom-fields.component.html",
 })
 export class ViewCustomFieldsComponent extends BaseViewCustomFieldsComponent {
-  constructor(eventService: EventService) {
-    super(eventService);
+  constructor(eventCollectionService: EventCollectionService) {
+    super(eventCollectionService);
   }
 }

apps/browser/src/popup/vault/view.component.ts

@@ -9,7 +9,7 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -58,7 +58,7 @@ export class ViewComponent extends BaseViewComponent {
     ngZone: NgZone,
     changeDetectorRef: ChangeDetectorRef,
     stateService: StateService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     private autofillService: AutofillService,
     private messagingService: MessagingService,
     private popupUtilsService: PopupUtilsService,
@@ -80,7 +80,7 @@ export class ViewComponent extends BaseViewComponent {
       broadcasterService,
       ngZone,
       changeDetectorRef,
-      eventService,
+      eventCollectionService,
       apiService,
       passwordRepromptService,
       logService,

apps/browser/src/services/autofill.service.ts

@@ -1,5 +1,5 @@
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
@@ -41,7 +41,7 @@ export default class AutofillService implements AutofillServiceInterface {
     private cipherService: CipherService,
     private stateService: BrowserStateService,
     private totpService: TotpService,
-    private eventService: EventService,
+    private eventCollectionService: EventCollectionService,
     private logService: LogService
   ) {}
 
@@ -148,7 +148,7 @@ export default class AutofillService implements AutofillServiceInterface {
     });
 
     if (didAutofill) {
-      this.eventService.collect(EventType.Cipher_ClientAutofilled, options.cipher.id);
+      this.eventCollectionService.collect(EventType.Cipher_ClientAutofilled, options.cipher.id);
       if (totpPromise != null) {
         return await totpPromise;
       } else {

apps/desktop/src/app/app.component.ts

@@ -20,7 +20,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
@@ -125,7 +125,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private platformUtilsService: PlatformUtilsService,
     private systemService: SystemService,
     private stateService: StateService,
-    private eventService: EventService,
+    private eventUploadService: EventUploadService,
     private policyService: InternalPolicyService,
     private modalService: ModalService,
     private keyConnectorService: KeyConnectorService
@@ -465,7 +465,7 @@ export class AppComponent implements OnInit, OnDestroy {
   private async logOut(expired: boolean, userId?: string) {
     const userBeingLoggedOut = await this.stateService.getUserId({ userId: userId });
     await Promise.all([
-      this.eventService.uploadEvents(userBeingLoggedOut),
+      this.eventUploadService.uploadEvents(userBeingLoggedOut),
       this.syncService.setLastSync(new Date(0), userBeingLoggedOut),
       this.cryptoService.clearKeys(userBeingLoggedOut),
       this.settingsService.clear(userBeingLoggedOut),

apps/desktop/src/app/services/init.service.ts

@@ -5,7 +5,7 @@ import { AbstractThemingService } from "@bitwarden/angular/services/theming/them
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
 import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/common/abstractions/environment.service";
-import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service";
+import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -14,7 +14,7 @@ import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstrac
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
-import { EventService } from "@bitwarden/common/services/event.service";
+import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 
 import { I18nService } from "../../services/i18n.service";
@@ -28,7 +28,7 @@ export class InitService {
     private syncService: SyncServiceAbstraction,
     private vaultTimeoutService: VaultTimeoutServiceAbstraction,
     private i18nService: I18nServiceAbstraction,
-    private eventService: EventServiceAbstraction,
+    private eventUploadService: EventUploadServiceAbstraction,
     private twoFactorService: TwoFactorServiceAbstraction,
     private notificationsService: NotificationsServiceAbstraction,
     private platformUtilsService: PlatformUtilsServiceAbstraction,
@@ -48,7 +48,7 @@ export class InitService {
       (this.vaultTimeoutService as VaultTimeoutService).init(true);
       const locale = await this.stateService.getLocale();
       await (this.i18nService as I18nService).init(locale);
-      (this.eventService as EventService).init(true);
+      (this.eventUploadService as EventUploadService).init(true);
       this.twoFactorService.init();
       setTimeout(() => this.notificationsService.init(), 3000);
       const htmlEl = this.win.document.documentElement;

apps/desktop/src/app/vault/add-edit-custom-fields.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 @Component({
@@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
   templateUrl: "add-edit-custom-fields.component.html",
 })
 export class AddEditCustomFieldsComponent extends BaseAddEditCustomFieldsComponent {
-  constructor(i18nService: I18nService, eventService: EventService) {
-    super(i18nService, eventService);
+  constructor(i18nService: I18nService, eventCollectionService: EventCollectionService) {
+    super(i18nService, eventCollectionService);
   }
 }

apps/desktop/src/app/vault/add-edit.component.ts

@@ -6,7 +6,7 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -35,7 +35,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges,
     stateService: StateService,
     collectionService: CollectionService,
     messagingService: MessagingService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     passwordRepromptService: PasswordRepromptService,
     private broadcasterService: BroadcasterService,
@@ -52,7 +52,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges,
       stateService,
       collectionService,
       messagingService,
-      eventService,
+      eventCollectionService,
       policyService,
       logService,
       passwordRepromptService,

apps/desktop/src/app/vault/export.component.ts

@@ -6,7 +6,7 @@ import { UntypedFormBuilder } from "@angular/forms";
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -27,7 +27,7 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     exportService: ExportService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     userVerificationService: UserVerificationService,
     formBuilder: UntypedFormBuilder,
@@ -40,7 +40,7 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
       i18nService,
       platformUtilsService,
       exportService,
-      eventService,
+      eventCollectionService,
       policyService,
       window,
       logService,

apps/desktop/src/app/vault/vault.component.ts

@@ -14,7 +14,7 @@ import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
@@ -94,7 +94,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     private syncService: SyncService,
     private messagingService: MessagingService,
     private platformUtilsService: PlatformUtilsService,
-    private eventService: EventService,
+    private eventCollectionService: EventCollectionService,
     private totpService: TotpService,
     private passwordRepromptService: PasswordRepromptService,
     private stateService: StateService,
@@ -309,7 +309,7 @@ export class VaultComponent implements OnInit, OnDestroy {
             label: this.i18nService.t("copyPassword"),
             click: () => {
               this.copyValue(cipher, cipher.login.password, "password", "Password");
-              this.eventService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+              this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
             },
           });
         }
@@ -338,7 +338,7 @@ export class VaultComponent implements OnInit, OnDestroy {
             label: this.i18nService.t("copySecurityCode"),
             click: () => {
               this.copyValue(cipher, cipher.card.code, "securityCode", "Security Code");
-              this.eventService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
+              this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
             },
           });
         }

apps/desktop/src/app/vault/view-custom-fields.component.ts

@@ -1,14 +1,14 @@
 import { Component } from "@angular/core";
 
 import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 
 @Component({
   selector: "app-vault-view-custom-fields",
   templateUrl: "view-custom-fields.component.html",
 })
 export class ViewCustomFieldsComponent extends BaseViewCustomFieldsComponent {
-  constructor(eventService: EventService) {
-    super(eventService);
+  constructor(eventCollectionService: EventCollectionService) {
+    super(eventCollectionService);
   }
 }

apps/desktop/src/app/vault/view.component.ts

@@ -13,7 +13,7 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -47,7 +47,7 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
     broadcasterService: BroadcasterService,
     ngZone: NgZone,
     changeDetectorRef: ChangeDetectorRef,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     apiService: ApiService,
     private messagingService: MessagingService,
     passwordRepromptService: PasswordRepromptService,
@@ -68,7 +68,7 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
       broadcasterService,
       ngZone,
       changeDetectorRef,
-      eventService,
+      eventCollectionService,
       apiService,
       passwordRepromptService,
       logService,

apps/web/src/app/app.component.ts

@@ -12,7 +12,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
@@ -74,7 +74,7 @@ export class AppComponent implements OnDestroy, OnInit {
     private notificationsService: NotificationsService,
     private routerService: RouterService,
     private stateService: StateService,
-    private eventService: EventService,
+    private eventUploadService: EventUploadService,
     private policyService: InternalPolicyService,
     protected policyListService: PolicyListService,
     private keyConnectorService: KeyConnectorService
@@ -221,10 +221,9 @@ export class AppComponent implements OnDestroy, OnInit {
   }
 
   private async logOut(expired: boolean) {
-    await this.eventService.uploadEvents();
+    await this.eventUploadService.uploadEvents();
     const userId = await this.stateService.getUserId();
     await Promise.all([
-      this.eventService.clearEvents(),
       this.syncService.setLastSync(new Date(0)),
       this.cryptoService.clearKeys(),
       this.settingsService.clear(userId),

apps/web/src/app/core/init.service.ts

@@ -8,14 +8,14 @@ import {
   EnvironmentService as EnvironmentServiceAbstraction,
   Urls,
 } from "@bitwarden/common/abstractions/environment.service";
-import { EventService as EventLoggingServiceAbstraction } from "@bitwarden/common/abstractions/event.service";
+import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
-import { EventService as EventLoggingService } from "@bitwarden/common/services/event.service";
+import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 
 import { I18nService } from "./i18n.service";
@@ -28,7 +28,7 @@ export class InitService {
     private notificationsService: NotificationsServiceAbstraction,
     private vaultTimeoutService: VaultTimeoutServiceAbstraction,
     private i18nService: I18nServiceAbstraction,
-    private eventLoggingService: EventLoggingServiceAbstraction,
+    private eventUploadService: EventUploadServiceAbstraction,
     private twoFactorService: TwoFactorServiceAbstraction,
     private stateService: StateServiceAbstraction,
     private cryptoService: CryptoServiceAbstraction,
@@ -48,7 +48,7 @@ export class InitService {
       (this.vaultTimeoutService as VaultTimeoutService).init(true);
       const locale = await this.stateService.getLocale();
       await (this.i18nService as I18nService).init(locale);
-      (this.eventLoggingService as EventLoggingService).init(true);
+      (this.eventUploadService as EventUploadService).init(true);
       this.twoFactorService.init();
       const htmlEl = this.win.document.documentElement;
       htmlEl.classList.add("locale_" + this.i18nService.translationLocale);

apps/web/src/app/organizations/tools/import-export/org-export.component.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute } from "@angular/router";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -27,7 +27,7 @@ export class OrganizationExportComponent extends ExportComponent {
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     exportService: ExportService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     private route: ActivatedRoute,
     policyService: PolicyService,
     logService: LogService,
@@ -41,7 +41,7 @@ export class OrganizationExportComponent extends ExportComponent {
       i18nService,
       platformUtilsService,
       exportService,
-      eventService,
+      eventCollectionService,
       policyService,
       logService,
       userVerificationService,
@@ -76,7 +76,7 @@ export class OrganizationExportComponent extends ExportComponent {
   }
 
   async collectEvent(): Promise<void> {
-    await this.eventService.collect(
+    await this.eventCollectionService.collect(
       EventType.Organization_ClientExportedVault,
       null,
       null,

apps/web/src/app/organizations/vault/add-edit.component.ts

@@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -42,7 +42,7 @@ export class AddEditComponent extends BaseAddEditComponent {
     passwordGenerationService: PasswordGenerationService,
     private apiService: ApiService,
     messagingService: MessagingService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     logService: LogService,
     passwordRepromptService: PasswordRepromptService,
@@ -59,7 +59,7 @@ export class AddEditComponent extends BaseAddEditComponent {
       totpService,
       passwordGenerationService,
       messagingService,
-      eventService,
+      eventCollectionService,
       policyService,
       organizationService,
       logService,

apps/web/src/app/organizations/vault/vault-items.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Output } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
@@ -30,7 +30,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent {
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     cipherService: CipherService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     totpService: TotpService,
     passwordRepromptService: PasswordRepromptService,
     logService: LogService,
@@ -44,7 +44,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent {
       i18nService,
       platformUtilsService,
       cipherService,
-      eventService,
+      eventCollectionService,
       totpService,
       stateService,
       passwordRepromptService,

apps/web/src/app/settings/emergency-add-edit.component.ts

@@ -3,7 +3,7 @@ import { Component } from "@angular/core";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -38,7 +38,7 @@ export class EmergencyAddEditComponent extends BaseAddEditComponent {
     totpService: TotpService,
     passwordGenerationService: PasswordGenerationService,
     messagingService: MessagingService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     passwordRepromptService: PasswordRepromptService,
     organizationService: OrganizationService,
@@ -55,7 +55,7 @@ export class EmergencyAddEditComponent extends BaseAddEditComponent {
       totpService,
       passwordGenerationService,
       messagingService,
-      eventService,
+      eventCollectionService,
       policyService,
       organizationService,
       logService,

apps/web/src/app/tools/import-export/export.component.ts

@@ -4,7 +4,7 @@ import { UntypedFormBuilder } from "@angular/forms";
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -29,7 +29,7 @@ export class ExportComponent extends BaseExportComponent {
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     exportService: ExportService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     policyService: PolicyService,
     logService: LogService,
     userVerificationService: UserVerificationService,
@@ -42,7 +42,7 @@ export class ExportComponent extends BaseExportComponent {
       i18nService,
       platformUtilsService,
       exportService,
-      eventService,
+      eventCollectionService,
       policyService,
       window,
       logService,

apps/web/src/app/vault/add-edit-custom-fields.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input } from "@angular/core";
 
 import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 @Component({
@@ -12,7 +12,7 @@ export class AddEditCustomFieldsComponent extends BaseAddEditCustomFieldsCompone
   @Input() viewOnly: boolean;
   @Input() copy: (value: string, typeI18nKey: string, aType: string) => void;
 
-  constructor(i18nService: I18nService, eventService: EventService) {
-    super(i18nService, eventService);
+  constructor(i18nService: I18nService, eventCollectionService: EventCollectionService) {
+    super(i18nService, eventCollectionService);
   }
 }

apps/web/src/app/vault/add-edit.component.ts

@@ -4,7 +4,7 @@ import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/com
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -49,7 +49,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
     protected totpService: TotpService,
     protected passwordGenerationService: PasswordGenerationService,
     protected messagingService: MessagingService,
-    eventService: EventService,
+    eventCollectionService: EventCollectionService,
     protected policyService: PolicyService,
     organizationService: OrganizationService,
     logService: LogService,
@@ -64,7 +64,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
       stateService,
       collectionService,
       messagingService,
-      eventService,
+      eventCollectionService,
       policyService,
       logService,
       passwordRepromptService,
@@ -125,11 +125,17 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
 
     if (this.editMode) {
       if (typeI18nKey === "password") {
-        this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, this.cipherId);
+        this.eventCollectionService.collect(
+          EventType.Cipher_ClientToggledHiddenFieldVisible,
+          this.cipherId
+        );
       } else if (typeI18nKey === "securityCode") {
-        this.eventService.collect(EventType.Cipher_ClientCopiedCardCode, this.cipherId);
+        this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, this.cipherId);
       } else if (aType === "H_Field") {
-        this.eventService.collect(EventType.Cipher_ClientCopiedHiddenField, this.cipherId);
+        this.eventCollectionService.collect(
+          EventType.Cipher_ClientCopiedHiddenField,
+          this.cipherId
+        );
       }
     }
   }

apps/web/src/app/vault/vault-items.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core
 
 import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/components/vault-items.component";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
-import { EventService } from "@bitwarden/common/abstractions/event.service";
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
@@ -51,7 +51,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
     protected i18nService: I18nService,
     protected platformUtilsService: PlatformUtilsService,
     protected cipherService: CipherService,
-    protected eventService: EventService,
+    protected eventCollectionService: EventCollectionService,
     protected totpService: TotpService,
     protected stateService: StateService,
     protected passwordRepromptService: PasswordRepromptService,
@@ -241,9 +241,12 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
     );
 
     if (typeI18nKey === "password" || typeI18nKey === "verificationCodeTotp") {
-      this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, cipher.id);
+      this.eventCollectionService.collect(
+        EventType.Cipher_ClientToggledHiddenFieldVisible,
+        cipher.id
+      );
     } else if (typeI18nKey === "securityCode") {
-      this.eventService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
+      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
     }
   }