From 577bfbb2316d9803208ae188bc863bc81452777a Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Wed, 25 Mar 2026 06:00:39 +1000 Subject: [PATCH] Update all event import statements and remove re-exporting files (#19545) Final import statement update after moving files to DIRT ownership --- apps/browser/src/background/main.background.ts | 10 ++++++---- apps/browser/src/popup/services/services.module.ts | 2 +- apps/cli/src/commands/get.command.ts | 3 +-- apps/cli/src/commands/list.command.ts | 3 +-- apps/cli/src/service-container/service-container.ts | 10 ++++++---- apps/desktop/src/app/app.component.ts | 2 +- apps/desktop/src/app/services/init.service.ts | 4 ++-- .../app/admin-console/common/base.events.component.ts | 2 -- .../organizations/collections/vault.component.ts | 5 ++--- .../organizations/manage/entity-events.component.ts | 2 -- .../organizations/manage/events.component.ts | 2 -- .../organizations/manage/placeholder-events.ts | 2 -- .../member-dialog-manager.service.spec.ts | 2 +- .../member-dialog-manager.service.ts | 2 +- .../reporting/organization-reporting-routing.module.ts | 2 +- apps/web/src/app/app.component.ts | 2 +- apps/web/src/app/core/core.module.ts | 2 +- apps/web/src/app/core/event.service.ts | 2 -- apps/web/src/app/core/index.ts | 1 - apps/web/src/app/core/init.service.ts | 4 ++-- .../providers/manage/members.component.ts | 2 +- .../projects/projects/projects.component.ts | 2 +- .../app/secrets-manager/secrets/secrets.component.ts | 2 +- .../service-account-event-log-api.service.ts | 2 +- .../event-logs/service-accounts-events.component.ts | 3 +-- .../service-accounts-list.component.ts | 2 +- .../service-accounts/service-accounts.component.ts | 2 +- .../secrets-manager/shared/projects-list.component.ts | 2 +- .../secrets-manager/shared/secrets-list.component.ts | 2 +- libs/angular/src/services/jslib-services.module.ts | 10 ++++++---- libs/common/src/abstractions/api.service.ts | 3 +-- .../src/abstractions/event/event-collection.service.ts | 2 -- .../src/abstractions/event/event-upload.service.ts | 2 -- libs/common/src/enums/event-category.enum.ts | 2 -- libs/common/src/enums/event-system-user.enum.ts | 2 -- libs/common/src/enums/event-type.enum.ts | 2 -- libs/common/src/enums/index.ts | 2 -- libs/common/src/models/data/event.data.ts | 2 -- libs/common/src/models/request/event.request.ts | 2 -- libs/common/src/models/response/event.response.ts | 2 -- libs/common/src/models/view/event.view.ts | 2 -- libs/common/src/services/api.service.ts | 3 +-- .../src/services/event/event-collection.service.ts | 2 -- libs/common/src/services/event/event-upload.service.ts | 2 -- libs/common/src/services/event/key-definitions.ts | 2 -- 45 files changed, 44 insertions(+), 81 deletions(-) delete mode 100644 apps/web/src/app/admin-console/common/base.events.component.ts delete mode 100644 apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts delete mode 100644 apps/web/src/app/admin-console/organizations/manage/events.component.ts delete mode 100644 apps/web/src/app/admin-console/organizations/manage/placeholder-events.ts delete mode 100644 apps/web/src/app/core/event.service.ts delete mode 100644 libs/common/src/abstractions/event/event-collection.service.ts delete mode 100644 libs/common/src/abstractions/event/event-upload.service.ts delete mode 100644 libs/common/src/enums/event-category.enum.ts delete mode 100644 libs/common/src/enums/event-system-user.enum.ts delete mode 100644 libs/common/src/enums/event-type.enum.ts delete mode 100644 libs/common/src/models/data/event.data.ts delete mode 100644 libs/common/src/models/request/event.request.ts delete mode 100644 libs/common/src/models/response/event.response.ts delete mode 100644 libs/common/src/models/view/event.view.ts delete mode 100644 libs/common/src/services/event/event-collection.service.ts delete mode 100644 libs/common/src/services/event/event-upload.service.ts delete mode 100644 libs/common/src/services/event/key-definitions.ts diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 6d9f5b306d9..37a49d376e6 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -40,8 +40,6 @@ import { } from "@bitwarden/auto-confirm"; import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.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 { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @@ -92,6 +90,12 @@ import { import { isUrlInList } from "@bitwarden/common/autofill/utils"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service"; +import { + EventUploadService as EventUploadServiceAbstraction, + EventCollectionService as EventCollectionServiceAbstraction, +} from "@bitwarden/common/dirt/event-logs"; +import { EventCollectionService } from "@bitwarden/common/dirt/event-logs/services/event-collection.service"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs/services/event-upload.service"; import { PhishingDetectionSettingsServiceAbstraction } from "@bitwarden/common/dirt/services/abstractions/phishing-detection-settings.service.abstraction"; import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service"; import { PhishingDetectionSettingsService } from "@bitwarden/common/dirt/services/phishing-detection/phishing-detection-settings.service"; @@ -193,8 +197,6 @@ import { UnsupportedSystemNotificationsService } from "@bitwarden/common/platfor import { DefaultThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service"; import { ApiService } from "@bitwarden/common/services/api.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; -import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { KeyServiceLegacyEncryptorProvider } from "@bitwarden/common/tools/cryptography/key-service-legacy-encryptor-provider"; import { buildExtensionRegistry } from "@bitwarden/common/tools/extension/factory"; import { diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 969d0a34cad..e748f605834 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -49,7 +49,6 @@ import { ExtensionAuthRequestAnsweringService } from "@bitwarden/browser/auth/se import { ExtensionNewDeviceVerificationComponentService } from "@bitwarden/browser/auth/services/new-device-verification/extension-new-device-verification-component.service"; import { BrowserRouterService } from "@bitwarden/browser/platform/popup/services/browser-router.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { @@ -77,6 +76,7 @@ import { UserNotificationSettingsServiceAbstraction, } from "@bitwarden/common/autofill/services/user-notification-settings.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; +import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/dirt/event-logs"; import { PhishingDetectionSettingsServiceAbstraction } from "@bitwarden/common/dirt/services/abstractions/phishing-detection-settings.service.abstraction"; import { PhishingDetectionSettingsService } from "@bitwarden/common/dirt/services/phishing-detection/phishing-detection-settings.service"; import { ClientType } from "@bitwarden/common/enums"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index cc01c21e0d0..3f68808bc1e 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -5,14 +5,13 @@ import { filter, firstValueFrom, map, switchMap } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CollectionView } from "@bitwarden/common/admin-console/models/collections"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; -import { EventType } from "@bitwarden/common/enums"; +import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { CardExport } from "@bitwarden/common/models/export/card.export"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 2430035e34a..eef0d275376 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -2,7 +2,6 @@ import { firstValueFrom, map } from "rxjs"; import { OrganizationUserApiService, CollectionService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CollectionData, @@ -12,7 +11,7 @@ import { } from "@bitwarden/common/admin-console/models/collections"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { EventType } from "@bitwarden/common/enums"; +import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service"; diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index 5575f3462a0..dc60aef58a1 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -24,8 +24,6 @@ import { DefaultLogoutService, LockService, } from "@bitwarden/auth/common"; -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 { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction"; @@ -68,6 +66,12 @@ import { } from "@bitwarden/common/autofill/services/domain-settings.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service"; +import { + EventUploadService as EventUploadServiceAbstraction, + EventCollectionService as EventCollectionServiceAbstraction, +} from "@bitwarden/common/dirt/event-logs"; +import { EventCollectionService } from "@bitwarden/common/dirt/event-logs/services/event-collection.service"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs/services/event-upload.service"; import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service"; import { ClientType } from "@bitwarden/common/enums"; import { DefaultAccountCryptographicStateService } from "@bitwarden/common/key-management/account-cryptography/default-account-cryptographic-state.service"; @@ -135,8 +139,6 @@ import { SyncService } from "@bitwarden/common/platform/sync"; // eslint-disable-next-line no-restricted-imports -- Needed for service construction import { DefaultSyncService } from "@bitwarden/common/platform/sync/internal"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; -import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { KeyServiceLegacyEncryptorProvider } from "@bitwarden/common/tools/cryptography/key-service-legacy-encryptor-provider"; import { buildExtensionRegistry } from "@bitwarden/common/tools/extension/factory"; import { diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 7e3e63d8619..427859f494a 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -36,7 +36,6 @@ import { LogoutReason, UserDecryptionOptionsServiceAbstraction, } from "@bitwarden/auth/common"; -import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthRequestAnsweringService } from "@bitwarden/common/auth/abstractions/auth-request-answering/auth-request-answering.service.abstraction"; @@ -46,6 +45,7 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { PendingAuthRequestsStateService } from "@bitwarden/common/auth/services/auth-request-answering/pending-auth-requests.state"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service"; import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction"; diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index 74b4eb42880..2ad0a97c06e 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -3,9 +3,10 @@ import { firstValueFrom } from "rxjs"; import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { WINDOW } from "@bitwarden/angular/services/injection-tokens"; -import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { TwoFactorService } from "@bitwarden/common/auth/two-factor"; +import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/dirt/event-logs"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs/services/event-upload.service"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -17,7 +18,6 @@ import { ContainerService } from "@bitwarden/common/platform/services/container. import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner"; import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service"; import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/platform/sync"; -import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { UserId } from "@bitwarden/common/types/guid"; import { KeyService as KeyServiceAbstraction } from "@bitwarden/key-management"; diff --git a/apps/web/src/app/admin-console/common/base.events.component.ts b/apps/web/src/app/admin-console/common/base.events.component.ts deleted file mode 100644 index 032158f88e0..00000000000 --- a/apps/web/src/app/admin-console/common/base.events.component.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/components/base-events/base-events.component"; diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts index 1d9178e6fed..60b5b290284 100644 --- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts @@ -31,7 +31,6 @@ import { CollectionAdminService, CollectionService } from "@bitwarden/admin-cons import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { NoResults } from "@bitwarden/assets/svg"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CollectionView, @@ -46,7 +45,7 @@ import { import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction"; -import { EventType } from "@bitwarden/common/enums"; +import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -97,6 +96,7 @@ import { OrganizationResellerRenewalWarningComponent, } from "@bitwarden/web-vault/app/billing/organizations/warnings/components"; import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { VaultItemsComponent } from "@bitwarden/web-vault/app/vault/components/vault-items/vault-items.component"; import { SharedModule } from "../../../shared"; @@ -114,7 +114,6 @@ import { } from "../../../vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service"; import { GroupApiService, GroupView } from "../core"; -import { openEntityEventsDialog } from "../manage/entity-events.component"; import { CollectionPermission } from "../shared/components/access-selector"; import { CollectionDialogAction, diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts deleted file mode 100644 index e4525c00e29..00000000000 --- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../../dirt/event-logs/components/entity-events/entity-events.component"; diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts deleted file mode 100644 index f94c7e15fc7..00000000000 --- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../../dirt/event-logs/components/organization-events/events.component"; diff --git a/apps/web/src/app/admin-console/organizations/manage/placeholder-events.ts b/apps/web/src/app/admin-console/organizations/manage/placeholder-events.ts deleted file mode 100644 index 5122fa91e65..00000000000 --- a/apps/web/src/app/admin-console/organizations/manage/placeholder-events.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../../dirt/event-logs/components/placeholder-events"; diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts index e478f8bbb41..2ed6c93655f 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts @@ -9,8 +9,8 @@ import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/m import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogService, ToastService } from "@bitwarden/components"; +import { EntityEventsComponent } from "../../../../../dirt/event-logs"; import { OrganizationUserView } from "../../../core/views/organization-user.view"; -import { EntityEventsComponent } from "../../../manage/entity-events.component"; import { AccountRecoveryDialogComponent } from "../../components/account-recovery/account-recovery-dialog.component"; import { BulkConfirmDialogComponent } from "../../components/bulk/bulk-confirm-dialog.component"; import { BulkDeleteDialogComponent } from "../../components/bulk/bulk-delete-dialog.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts index 6c367692376..07006c36d1e 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts @@ -10,9 +10,9 @@ import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/m import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { OrganizationId } from "@bitwarden/common/types/guid"; import { CenterPositionStrategy, DialogService, ToastService } from "@bitwarden/components"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { OrganizationUserView } from "../../../core/views/organization-user.view"; -import { openEntityEventsDialog } from "../../../manage/entity-events.component"; import { AccountRecoveryDialogComponent, AccountRecoveryDialogResultType, diff --git a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts index 9e33986b87d..75b9c64f423 100644 --- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts @@ -5,6 +5,7 @@ import { RouterModule, Routes } from "@angular/router"; import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { EventsComponent } from "@bitwarden/web-vault/app/dirt/event-logs"; // eslint-disable-next-line no-restricted-imports import { ExposedPasswordsReportComponent } from "../../../dirt/reports/pages/organizations/exposed-passwords-report.component"; @@ -19,7 +20,6 @@ import { WeakPasswordsReportComponent } from "../../../dirt/reports/pages/organi import { isPaidOrgGuard } from "../guards/is-paid-org.guard"; import { organizationPermissionsGuard } from "../guards/org-permissions.guard"; import { organizationRedirectGuard } from "../guards/org-redirect.guard"; -import { EventsComponent } from "../manage/events.component"; import { ReportsHomeComponent } from "./reports-home.component"; diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index c312b4edd7e..005b1565a2c 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -9,13 +9,13 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction"; import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n"; import { LockService } from "@bitwarden/auth/common"; -import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs"; import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 6819cdf3d41..8b6cdd81a10 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -156,6 +156,7 @@ import { WebPremiumInterestStateService } from "../billing/services/premium-inte import { HtmlStorageService } from "../core/html-storage.service"; import { I18nService } from "../core/i18n.service"; import { WebFileDownloadService } from "../core/web-file-download.service"; +import { EventService } from "../dirt/event-logs"; import { UserKeyRotationService } from "../key-management/key-rotation/user-key-rotation.service"; import { WebLockComponentService } from "../key-management/lock/services/web-lock-component.service"; import { WebProcessReloadService } from "../key-management/services/web-process-reload.service"; @@ -168,7 +169,6 @@ import { WebSdkLoadService } from "../platform/web-sdk-load.service"; import { WebStorageServiceProvider } from "../platform/web-storage-service.provider"; import { WebSystemService } from "../platform/web-system.service"; -import { EventService } from "./event.service"; import { InitService } from "./init.service"; import { ENV_URLS } from "./injection-tokens"; import { RouterService } from "./router.service"; diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts deleted file mode 100644 index bf5e934ed69..00000000000 --- a/apps/web/src/app/core/event.service.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../dirt/event-logs/services/event.service"; diff --git a/apps/web/src/app/core/index.ts b/apps/web/src/app/core/index.ts index abbbfd2231a..1831cc7cc86 100644 --- a/apps/web/src/app/core/index.ts +++ b/apps/web/src/app/core/index.ts @@ -1,3 +1,2 @@ export * from "./core.module"; -export * from "./event.service"; export * from "./router.service"; diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts index 9322d149e42..9fbd36c117d 100644 --- a/apps/web/src/app/core/init.service.ts +++ b/apps/web/src/app/core/init.service.ts @@ -3,9 +3,10 @@ import { firstValueFrom } from "rxjs"; import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { WINDOW } from "@bitwarden/angular/services/injection-tokens"; -import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { TwoFactorService } from "@bitwarden/common/auth/two-factor"; +import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/dirt/event-logs"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs/services/event-upload.service"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -15,7 +16,6 @@ import { ServerNotificationsService } from "@bitwarden/common/platform/server-no import { ContainerService } from "@bitwarden/common/platform/services/container.service"; import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner"; import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service"; -import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { TaskService } from "@bitwarden/common/vault/tasks"; import { KeyService as KeyServiceAbstraction } from "@bitwarden/key-management"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts index d4a6ba92451..d9813861cd0 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts @@ -35,9 +35,9 @@ import { ProvidersTableDataSource, showConfirmBanner, } from "@bitwarden/web-vault/app/admin-console/common/people-table-data-source"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component"; import { MemberActionsService } from "@bitwarden/web-vault/app/admin-console/organizations/members/services/member-actions/member-actions.service"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { AddEditMemberDialogComponent, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts index 10e75cfb75a..74f707038ac 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts @@ -19,7 +19,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogRef, DialogService, ToastService } from "@bitwarden/components"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { ProjectListView } from "../../models/view/project-list.view"; import { ProjectView } from "../../models/view/project.view"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts index 92b33a06d4f..5f99c9fadc0 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts @@ -19,7 +19,7 @@ import { DialogService, ToastService, } from "@bitwarden/components"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { SecretListView } from "../models/view/secret-list.view"; import { SecretsListComponent } from "../shared/secrets-list.component"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts index c7278479bc8..fcd7ec05ef4 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { EventResponse } from "@bitwarden/common/models/response/event.response"; +import { EventResponse } from "@bitwarden/common/dirt/event-logs"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; @Injectable({ diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts index 2711abe92c9..bc4a45383a5 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts @@ -13,8 +13,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ToastService } from "@bitwarden/components"; -import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/common/base.events.component"; -import { EventService } from "@bitwarden/web-vault/app/core"; +import { EventService, BaseEventsComponent } from "@bitwarden/web-vault/app/dirt/event-logs"; import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export"; import { ServiceAccountEventLogApiService } from "./service-account-event-log-api.service"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts index 4febda9ea28..d97b66bf185 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts @@ -14,7 +14,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components"; import { LogService } from "@bitwarden/logging"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { ServiceAccountSecretsDetailsView, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts index 5d6b4fd49de..4e48c484c1d 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts @@ -12,7 +12,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogRef, DialogService, ToastService } from "@bitwarden/components"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { ServiceAccountSecretsDetailsView, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts index 5d3c806f386..ae31f0ec64a 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts @@ -15,7 +15,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components"; import { LogService } from "@bitwarden/logging"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { ProjectListView } from "../models/view/project-list.view"; import { ProjectView } from "../models/view/project.view"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts index 05e38baff69..03a0d49134f 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts @@ -15,7 +15,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components"; -import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; +import { openEntityEventsDialog } from "@bitwarden/web-vault/app/dirt/event-logs/components/entity-events/entity-events.component"; import { SecretListView } from "../models/view/secret-list.view"; import { SecretView } from "../models/view/secret.view"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index aac0729e0d0..1c15516a666 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -62,8 +62,6 @@ import { } from "@bitwarden/auto-confirm"; import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.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 { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { InternalOrganizationServiceAbstraction, @@ -170,6 +168,12 @@ import { DefaultOrganizationMetadataService } from "@bitwarden/common/billing/se import { OrganizationSponsorshipApiService } from "@bitwarden/common/billing/services/organization/organization-sponsorship-api.service"; import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service"; import { DefaultSubscriptionPricingService } from "@bitwarden/common/billing/services/subscription-pricing.service"; +import { + EventUploadService as EventUploadServiceAbstraction, + EventCollectionService as EventCollectionServiceAbstraction, +} from "@bitwarden/common/dirt/event-logs"; +import { EventCollectionService } from "@bitwarden/common/dirt/event-logs/services/event-collection.service"; +import { EventUploadService } from "@bitwarden/common/dirt/event-logs/services/event-upload.service"; import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service"; import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service"; import { AccountCryptographicStateService } from "@bitwarden/common/key-management/account-cryptography/account-cryptographic-state.service"; @@ -289,8 +293,6 @@ import { } from "@bitwarden/common/platform/theming/theme-state.service"; import { ApiService } from "@bitwarden/common/services/api.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; -import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { PasswordStrengthService, PasswordStrengthServiceAbstraction, diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 5b9136b3349..74cbc03775c 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -58,10 +58,10 @@ import { BillingHistoryResponse } from "../billing/models/response/billing-histo import { PaymentResponse } from "../billing/models/response/payment.response"; import { PlanResponse } from "../billing/models/response/plan.response"; import { SubscriptionResponse } from "../billing/models/response/subscription.response"; +import { EventRequest, EventResponse } from "../dirt/event-logs"; import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/models/key-connector-user-key.request"; import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; -import { EventRequest } from "../models/request/event.request"; import { KdfRequest } from "../models/request/kdf.request"; import { KeysRequest } from "../models/request/keys.request"; import { PreloginRequest } from "../models/request/prelogin.request"; @@ -71,7 +71,6 @@ import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { DomainsResponse } from "../models/response/domains.response"; -import { EventResponse } from "../models/response/event.response"; import { ListResponse } from "../models/response/list.response"; import { ProfileResponse } from "../models/response/profile.response"; import { UserKeyResponse } from "../models/response/user-key.response"; diff --git a/libs/common/src/abstractions/event/event-collection.service.ts b/libs/common/src/abstractions/event/event-collection.service.ts deleted file mode 100644 index 6e82b480388..00000000000 --- a/libs/common/src/abstractions/event/event-collection.service.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/abstractions/event-collection.service"; diff --git a/libs/common/src/abstractions/event/event-upload.service.ts b/libs/common/src/abstractions/event/event-upload.service.ts deleted file mode 100644 index 299a8173c04..00000000000 --- a/libs/common/src/abstractions/event/event-upload.service.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/abstractions/event-upload.service"; diff --git a/libs/common/src/enums/event-category.enum.ts b/libs/common/src/enums/event-category.enum.ts deleted file mode 100644 index 01838feaae9..00000000000 --- a/libs/common/src/enums/event-category.enum.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../dirt/event-logs/enums/event-category.enum"; diff --git a/libs/common/src/enums/event-system-user.enum.ts b/libs/common/src/enums/event-system-user.enum.ts deleted file mode 100644 index 71f3b2ca856..00000000000 --- a/libs/common/src/enums/event-system-user.enum.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../dirt/event-logs/enums/event-system-user.enum"; diff --git a/libs/common/src/enums/event-type.enum.ts b/libs/common/src/enums/event-type.enum.ts deleted file mode 100644 index 23be73a46e6..00000000000 --- a/libs/common/src/enums/event-type.enum.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../dirt/event-logs/enums/event-type.enum"; diff --git a/libs/common/src/enums/index.ts b/libs/common/src/enums/index.ts index 000f2a074d8..4a409353e16 100644 --- a/libs/common/src/enums/index.ts +++ b/libs/common/src/enums/index.ts @@ -1,7 +1,5 @@ export * from "./client-type.enum"; export * from "./device-type.enum"; -export * from "./event-system-user.enum"; -export * from "./event-type.enum"; export * from "./http-status-code.enum"; export * from "./integration-type.enum"; export * from "./native-messaging-version.enum"; diff --git a/libs/common/src/models/data/event.data.ts b/libs/common/src/models/data/event.data.ts deleted file mode 100644 index c554f1aae96..00000000000 --- a/libs/common/src/models/data/event.data.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/models/data/event.data"; diff --git a/libs/common/src/models/request/event.request.ts b/libs/common/src/models/request/event.request.ts deleted file mode 100644 index 4658fb82270..00000000000 --- a/libs/common/src/models/request/event.request.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/models/request/event.request"; diff --git a/libs/common/src/models/response/event.response.ts b/libs/common/src/models/response/event.response.ts deleted file mode 100644 index af5e3fe71e3..00000000000 --- a/libs/common/src/models/response/event.response.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/models/response/event.response"; diff --git a/libs/common/src/models/view/event.view.ts b/libs/common/src/models/view/event.view.ts deleted file mode 100644 index a91a7229d08..00000000000 --- a/libs/common/src/models/view/event.view.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/models/view/event.view"; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 3828d618552..496765a8e25 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -71,13 +71,13 @@ import { BillingHistoryResponse } from "../billing/models/response/billing-histo import { PaymentResponse } from "../billing/models/response/payment.response"; import { PlanResponse } from "../billing/models/response/plan.response"; import { SubscriptionResponse } from "../billing/models/response/subscription.response"; +import { EventRequest, EventResponse } from "../dirt/event-logs"; import { ClientType, DeviceType, HttpStatusCode } from "../enums"; import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/models/key-connector-user-key.request"; import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request"; import { VaultTimeoutSettingsService } from "../key-management/vault-timeout"; import { VaultTimeoutAction } from "../key-management/vault-timeout/enums/vault-timeout-action.enum"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; -import { EventRequest } from "../models/request/event.request"; import { KdfRequest } from "../models/request/kdf.request"; import { KeysRequest } from "../models/request/keys.request"; import { PreloginRequest } from "../models/request/prelogin.request"; @@ -88,7 +88,6 @@ import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-reco import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { DomainsResponse } from "../models/response/domains.response"; import { ErrorResponse } from "../models/response/error.response"; -import { EventResponse } from "../models/response/event.response"; import { ListResponse } from "../models/response/list.response"; import { ProfileResponse } from "../models/response/profile.response"; import { UserKeyResponse } from "../models/response/user-key.response"; diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts deleted file mode 100644 index f7bf4dfaf7e..00000000000 --- a/libs/common/src/services/event/event-collection.service.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/services/event-collection.service"; diff --git a/libs/common/src/services/event/event-upload.service.ts b/libs/common/src/services/event/event-upload.service.ts deleted file mode 100644 index f5478433e36..00000000000 --- a/libs/common/src/services/event/event-upload.service.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/services/event-upload.service"; diff --git a/libs/common/src/services/event/key-definitions.ts b/libs/common/src/services/event/key-definitions.ts deleted file mode 100644 index f695a6abed4..00000000000 --- a/libs/common/src/services/event/key-definitions.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Re-export from new location for backward compatibility -export * from "../../dirt/event-logs/services/key-definitions";