From a5e3432f853550739ac2595fdbd1905d1b361ddc Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 27 Nov 2023 21:59:44 +0100 Subject: [PATCH] Assign ownership to many libs files (#6928) Assign ownership to many of the remaining libs/common files. Criteria for ownership: * Files used by a single team, is now owned by that team. * Files related to a domain owned by a team is now owned by that team. * Where ownership is unclear the "lowest level" service takes ownership. --- .github/whitelist-capital-letters.txt | 9 --------- .../popup/login-via-auth-request.component.ts | 2 +- .../abstractions/overlay.background.ts | 2 +- .../background/notification.background.ts | 4 ++-- .../background/overlay.background.spec.ts | 4 ++-- .../autofill/background/overlay.background.ts | 4 ++-- .../autofill-service.factory.ts | 8 ++++---- .../browser/cipher-context-menu-handler.spec.ts | 2 +- .../browser/cipher-context-menu-handler.ts | 2 +- .../browser/context-menu-clicked-handler.spec.ts | 4 ++-- .../browser/context-menu-clicked-handler.ts | 6 +++--- .../browser/main-context-menu-handler.spec.ts | 2 +- .../browser/main-context-menu-handler.ts | 2 +- apps/browser/src/autofill/jest/autofill-mocks.ts | 3 +-- .../services/abstractions/autofill.service.ts | 3 +-- .../autofill/services/autofill.service.spec.ts | 14 +++++++------- .../src/autofill/services/autofill.service.ts | 6 +++--- apps/browser/src/autofill/types/index.ts | 2 +- apps/browser/src/background/main.background.ts | 4 ++-- .../background/models/addLoginQueueMessage.ts | 2 +- .../browser/src/background/runtime.background.ts | 2 +- .../src/background/webRequest.background.ts | 2 +- .../src/models/browserGroupingsComponentState.ts | 2 +- .../service-factories/log-service.factory.ts | 2 +- .../platform/services/browser-crypto.service.ts | 2 +- apps/browser/src/popup/app-routing.module.ts | 2 +- apps/browser/src/popup/services/init.service.ts | 2 +- .../src/popup/services/services.module.ts | 8 ++++---- .../src/popup/settings/autofill.component.ts | 2 +- .../src/popup/settings/options.component.ts | 7 ++++--- .../service_factories}/totp-service.factory.ts | 4 ++-- .../popup/components/action-buttons.component.ts | 4 ++-- .../popup/components/fido2/fido2.component.ts | 3 +-- .../popup/components/vault/add-edit.component.ts | 2 +- .../components/vault/current-tab.component.ts | 2 +- .../components/vault/vault-filter.component.ts | 4 ++-- .../components/vault/vault-items.component.ts | 4 ++-- .../popup/components/vault/view.component.ts | 4 ++-- .../popup/utils/vault-popout-window.spec.ts | 2 +- .../src/vault/popup/utils/vault-popout-window.ts | 2 +- apps/cli/src/auth/commands/login.command.ts | 2 +- apps/cli/src/auth/commands/unlock.command.ts | 2 +- apps/cli/src/bw.ts | 5 +++-- apps/cli/src/commands/get.command.ts | 4 ++-- .../src/platform/services/console-log.service.ts | 2 +- .../platform/services/lowdb-storage.service.ts | 2 +- .../src/tools/send/commands/create.command.ts | 2 +- .../src/tools/send/commands/receive.command.ts | 2 +- apps/cli/src/utils.ts | 2 +- apps/cli/src/vault/models/cipher.response.ts | 2 +- .../src/app/accounts/settings.component.ts | 5 +++-- apps/desktop/src/app/app-routing.module.ts | 2 +- apps/desktop/src/app/app.component.ts | 2 +- .../src/app/services/desktop-theming.service.ts | 4 ++-- apps/desktop/src/app/services/init.service.ts | 2 +- apps/desktop/src/app/services/services.module.ts | 2 +- .../desktop/src/auth/delete-account.component.ts | 2 +- .../login/login-via-auth-request.component.ts | 2 +- apps/desktop/src/platform/preload.ts | 3 ++- .../platform/services/electron-crypto.service.ts | 2 +- .../platform/services/electron-log.service.ts | 2 +- .../services/electron-storage.service.ts | 2 +- .../services/electron-main-messaging.service.ts | 2 +- .../encrypted-message-handler.service.ts | 2 +- .../src/services/native-messaging.service.ts | 2 +- .../src/vault/app/vault/vault.component.ts | 4 ++-- .../src/vault/app/vault/view.component.ts | 2 +- apps/desktop/tsconfig.json | 1 + .../delete-organization-dialog.component.ts | 4 ++-- .../enroll-master-password-reset.component.ts | 2 +- .../providers/providers.component.ts | 2 +- .../settings/sponsored-families.component.ts | 2 +- .../webauthn-login-admin.service.ts | 2 +- .../emergency-access/models/emergency-access.ts | 2 +- .../response/emergency-access.response.ts | 2 +- .../services/emergency-access.service.spec.ts | 2 +- .../login/login-via-auth-request.component.ts | 2 +- .../migrate-legacy-encryption.service.spec.ts | 2 +- .../settings/deauthorize-sessions.component.ts | 2 +- .../emergency-access-takeover.component.ts | 2 +- .../view/emergency-add-edit-cipher.component.ts | 2 +- .../auth/settings/two-factor-verify.component.ts | 2 +- .../create-credential-dialog.component.ts | 2 +- .../delete-credential-dialog.component.ts | 2 +- .../billing-sync-api-key.component.ts | 2 +- .../src/app/billing/shared/payment.component.ts | 2 +- apps/web/src/app/core/html-storage.service.ts | 2 +- apps/web/src/app/core/init.service.ts | 2 +- apps/web/src/app/core/state/global-state.ts | 2 +- apps/web/src/app/layouts/navbar.component.ts | 2 +- apps/web/src/app/oss-routing.module.ts | 2 +- .../pages/exposed-passwords-report.component.ts | 2 +- .../inactive-two-factor-report.component.ts | 2 +- .../pages/reused-passwords-report.component.ts | 2 +- .../pages/unsecured-websites-report.component.ts | 2 +- .../pages/weak-passwords-report.component.ts | 2 +- apps/web/src/app/settings/api-key.component.ts | 2 +- .../change-kdf-confirmation.component.ts | 2 +- .../settings/change-kdf/change-kdf.component.ts | 4 ++-- .../src/app/settings/delete-account.component.ts | 2 +- .../src/app/settings/preferences.component.ts | 4 ++-- .../src/app/settings/purge-vault.component.ts | 2 +- apps/web/src/app/tools/send/access.component.ts | 2 +- .../app/tools/vault-export/export.component.ts | 2 +- .../vault-items/vault-cipher-row.component.ts | 2 +- .../vault-items/vault-items.stories.ts | 2 +- .../vault/individual-vault/add-edit.component.ts | 4 ++-- .../components/vault-filter.component.ts | 4 ++-- .../abstractions/vault-filter.service.ts | 2 +- .../routed-vault-filter-bridge.service.ts | 4 ++-- .../services/vault-filter.service.ts | 6 +++--- .../components/vault-filter-section.component.ts | 2 +- .../shared/models/filter-function.spec.ts | 2 +- .../shared/models/filter-function.ts | 2 +- .../models/routed-vault-filter-bridge.model.ts | 4 ++-- .../shared/models/vault-filter-section.type.ts | 2 +- .../shared/models/vault-filter.model.spec.ts | 4 ++-- .../shared/models/vault-filter.model.ts | 4 ++-- .../shared/models/vault-filter.type.ts | 6 +++--- .../vault-header/vault-header.component.ts | 2 +- .../vault/individual-vault/vault.component.ts | 9 +++++---- .../app/vault/org-vault/add-edit.component.ts | 2 +- .../vault-filter/vault-filter.component.ts | 2 +- .../vault-filter/vault-filter.service.ts | 2 +- .../vault-header/vault-header.component.ts | 2 +- .../src/app/vault/org-vault/vault.component.ts | 6 +++--- apps/web/src/app/vault/utils/collection-utils.ts | 4 ++-- .../organizations-routing.module.ts | 2 +- .../clients/add-organization.component.ts | 2 +- .../guards/provider-permissions.guard.spec.ts | 2 +- .../guards/provider-permissions.guard.ts | 2 +- .../providers/manage/manage.component.ts | 2 +- .../providers/providers-layout.component.ts | 2 +- .../providers/providers-routing.module.ts | 2 +- .../not-allowed-value-async.validator.ts} | 0 .../auth/components/change-password.component.ts | 2 +- .../src/auth/components/lock.component.ts | 2 +- .../login-via-auth-request.component.ts | 2 +- .../src/auth/components/register.component.ts | 4 ++-- .../auth/components/set-password.component.ts | 6 +++++- .../src/auth/components/set-pin.component.ts | 2 +- .../auth/components/update-password.component.ts | 2 +- .../components/update-temp-password.component.ts | 2 +- .../user-verification-prompt.component.ts | 2 +- .../components/user-verification.component.ts | 2 +- .../validators/inputs-field-match.validator.ts} | 2 +- .../guard/feature-flag.guard.spec.ts | 0 .../{ => platform}/guard/feature-flag.guard.ts | 0 .../services/theming/theme-builder.ts} | 2 +- .../src/{ => platform}/services/theming/theme.ts | 2 +- .../theming/theming.service.abstraction.ts | 2 +- .../services/theming/theming.service.ts | 6 +++--- .../src/services/jslib-services.module.ts | 12 ++++++------ .../tools/export/components/export.component.ts | 3 ++- .../generator/components/generator.component.ts | 2 +- .../add-edit-custom-fields.component.ts | 4 ++-- .../src/vault/components/add-edit.component.ts | 4 ++-- .../components/view-custom-fields.component.ts | 3 ++- .../src/vault/components/view.component.ts | 6 +++--- .../components/collection-filter.component.ts | 2 +- .../components/folder-filter.component.ts | 2 +- .../components/organization-filter.component.ts | 2 +- .../components/type-filter.component.ts | 4 ++-- .../components/vault-filter.component.ts | 2 +- .../models/dynamic-tree-node.model.ts | 2 +- .../models/top-level-tree-node.model.ts | 2 +- .../models/vault-filter.model.spec.ts | 2 +- .../vault-filter/models/vault-filter.model.ts | 2 +- .../services/vault-filter.service.ts | 4 ++-- .../responses/organization-user.response.ts | 2 +- .../abstractions/provider.service.ts | 2 +- libs/common/src/admin-console/enums/index.ts | 1 + .../enums/provider-type.enum.ts | 0 .../models/data/organization.data.ts | 4 ++-- .../admin-console/models/domain/organization.ts | 4 ++-- .../models/domain/provider.ts | 4 ++-- .../response/profile-organization.response.ts | 4 ++-- .../admin-console/services/provider.service.ts | 2 +- .../src/auth/abstractions/account-api.service.ts | 2 +- .../abstractions/anonymous-hub.service.ts} | 0 .../user-verification.service.abstraction.ts | 2 +- libs/common/src/auth/captcha-iframe.ts | 3 ++- .../iframe-component.ts} | 0 .../password-login.strategy.spec.ts | 2 +- .../login-strategies/password-login.strategy.ts | 2 +- .../request/set-key-connector-key.request.ts | 2 +- .../auth/models/request/set-password.request.ts | 2 +- .../models/response/identity-token.response.ts | 2 +- .../auth/models/response/prelogin.response.ts | 2 +- .../src/auth/services/account-api.service.ts | 2 +- .../services/anonymous-hub.service.ts} | 11 +++++------ libs/common/src/auth/services/auth.service.ts | 2 +- .../services/device-trust-crypto.service.spec.ts | 2 +- .../user-verification.service.ts | 2 +- libs/common/src/{ => auth}/types/verification.ts | 2 +- libs/common/src/enums/index.ts | 15 --------------- libs/common/src/models/export/field.export.ts | 2 +- .../common/src/models/export/login-uri.export.ts | 2 +- .../src/models/export/secure-note.export.ts | 2 +- libs/common/src/models/request/kdf.request.ts | 2 +- .../src/models/request/register.request.ts | 2 +- .../src/platform/abstractions/crypto.service.ts | 2 +- .../file-upload/file-upload.service.ts | 2 +- .../src/platform/abstractions/log.service.ts | 2 +- .../src/platform/abstractions/state.service.ts | 3 ++- .../{ => platform}/enums/encryption-type.enum.ts | 0 .../enums/file-upload-type.enum.ts | 0 .../{ => platform}/enums/hash-purpose.enum.ts | 0 .../enums/html-storage-location.enum.ts | 0 libs/common/src/platform/enums/index.ts | 9 +++++++++ .../src/{ => platform}/enums/kdf-type.enum.ts | 3 +-- .../enums/key-suffix-options.enum.ts | 0 .../{ => platform}/enums/log-level-type.enum.ts | 0 .../enums/storage-location.enum.ts | 0 .../src/{ => platform}/enums/theme-type.enum.ts | 0 libs/common/src/platform/interfaces/encrypted.ts | 2 +- .../common/src/platform/models/domain/account.ts | 3 ++- .../models/domain/enc-array-buffer.spec.ts | 2 +- .../platform/models/domain/enc-array-buffer.ts | 2 +- .../platform/models/domain/enc-string.spec.ts | 2 +- .../src/platform/models/domain/enc-string.ts | 4 ++-- .../src/platform/models/domain/global-state.ts | 2 +- .../platform/models/domain/storage-options.ts | 2 +- .../models/domain/symmetric-crypto-key.spec.ts | 2 +- .../models/domain/symmetric-crypto-key.ts | 2 +- .../src/platform/services/app-id.service.ts | 2 +- .../src/platform/services/console-log.service.ts | 2 +- .../src/platform/services/crypto.service.ts | 16 ++++++++-------- .../encrypt.service.implementation.ts | 2 +- .../platform/services/encrypt.service.spec.ts | 2 +- .../services/file-upload/file-upload.service.ts | 2 +- .../src/platform/services/state.service.ts | 9 ++------- libs/common/src/services/search.service.ts | 2 +- .../enums/encrypted-export-type.enum.ts | 0 .../models/domain/email-forwarder-options.ts | 0 .../response/send-file-upload-data.response.ts | 2 +- libs/common/src/tools/send/send-kdf.ts | 1 + .../src/tools/send/services/send.service.ts | 2 +- .../src/vault/abstractions/cipher.service.ts | 2 +- .../src/vault/abstractions/collection.service.ts | 2 +- .../src/{ => vault}/abstractions/totp.service.ts | 0 .../src/{ => vault}/enums/field-type.enum.ts | 0 libs/common/src/vault/enums/index.ts | 6 ++++++ .../src/{ => vault}/enums/linked-id-type.enum.ts | 0 .../{ => vault}/enums/secure-note-type.enum.ts | 0 .../src/{ => vault}/enums/uri-match-type.enum.ts | 0 .../linked-field-option.decorator.ts} | 4 ++-- .../src/{ => vault}/models/api/card.api.ts | 2 +- .../{ => models}/api/fido2-credential.api.ts | 2 +- .../src/{ => vault}/models/api/field.api.ts | 2 +- .../src/{ => vault}/models/api/identity.api.ts | 2 +- .../src/{ => vault}/models/api/login-uri.api.ts | 2 +- .../src/{ => vault}/models/api/login.api.ts | 4 ++-- .../{ => vault}/models/api/secure-note.api.ts | 2 +- libs/common/src/vault/models/data/card.data.ts | 2 +- .../vault/models/data/fido2-credential.data.ts | 2 +- libs/common/src/vault/models/data/field.data.ts | 4 ++-- .../src/vault/models/data/identity.data.ts | 2 +- .../src/vault/models/data/login-uri.data.ts | 4 ++-- libs/common/src/vault/models/data/login.data.ts | 2 +- .../src/vault/models/data/secure-note.data.ts | 4 ++-- .../src/vault/models/domain/cipher.spec.ts | 2 +- .../vault/models/domain/fido2-credential.spec.ts | 2 +- .../common/src/vault/models/domain/field.spec.ts | 2 +- libs/common/src/vault/models/domain/field.ts | 2 +- .../src/vault/models/domain/login-uri.spec.ts | 2 +- libs/common/src/vault/models/domain/login-uri.ts | 2 +- .../common/src/vault/models/domain/login.spec.ts | 4 ++-- .../src/vault/models/domain/secure-note.spec.ts | 2 +- .../src/vault/models/domain/secure-note.ts | 2 +- .../src/{ => vault}/models/domain/tree-node.ts | 0 .../src/vault/models/request/cipher.request.ts | 14 +++++++------- .../response/attachment-upload-data.response.ts | 2 +- .../src/vault/models/response/cipher.response.ts | 10 +++++----- libs/common/src/vault/models/view/card.view.ts | 4 ++-- libs/common/src/vault/models/view/cipher.view.ts | 2 +- .../src/vault/models/view/collection.view.ts | 2 +- libs/common/src/vault/models/view/field.view.ts | 2 +- libs/common/src/vault/models/view/folder.view.ts | 2 +- .../src/vault/models/view/identity.view.ts | 4 ++-- libs/common/src/vault/models/view/item.view.ts | 2 +- .../src/vault/models/view/login-uri-view.spec.ts | 2 +- .../src/vault/models/view/login-uri.view.ts | 2 +- libs/common/src/vault/models/view/login.view.ts | 4 ++-- .../src/vault/models/view/secure-note.view.ts | 2 +- .../service-utils.spec.ts} | 5 ++--- .../serviceUtils.ts => vault/service-utils.ts} | 2 +- .../src/vault/services/cipher.service.spec.ts | 2 +- libs/common/src/vault/services/cipher.service.ts | 2 +- .../src/vault/services/collection.service.ts | 4 ++-- .../src/{ => vault}/services/totp.service.ts | 6 +++--- .../services/vault-export.service.spec.ts | 4 ++-- .../services/vault-export.service.ts | 4 ++-- libs/importer/spec/base-importer.spec.ts | 2 +- ...bitwarden-password-protected-importer.spec.ts | 2 +- libs/importer/spec/dashlane-csv-importer.spec.ts | 2 +- libs/importer/spec/enpass-json-importer.spec.ts | 2 +- libs/importer/spec/lastpass-csv-importer.spec.ts | 3 +-- libs/importer/spec/myki-csv-importer.spec.ts | 2 +- libs/importer/spec/nordpass-csv-importer.spec.ts | 3 +-- .../spec/onepassword-1pif-importer.spec.ts | 2 +- .../spec/onepassword-1pux-importer.spec.ts | 3 +-- .../spec/onepassword-mac-csv-importer.spec.ts | 2 +- .../spec/onepassword-win-csv-importer.spec.ts | 3 +-- .../spec/protonpass-json-importer.spec.ts | 3 +-- libs/importer/spec/psono-json-importer.spec.ts | 3 +-- .../dialog/import-success-dialog.component.ts | 2 +- .../src/importers/avast/avast-json-importer.ts | 3 +-- libs/importer/src/importers/base-importer.ts | 3 +-- .../bitwarden/bitwarden-csv-importer.ts | 3 +-- .../bitwarden-password-protected-importer.ts | 2 +- .../importers/dashlane/dashlane-csv-importer.ts | 3 +-- .../importers/dashlane/dashlane-json-importer.ts | 3 +-- .../src/importers/encryptr-csv-importer.ts | 2 +- .../src/importers/enpass/enpass-csv-importer.ts | 3 +-- .../src/importers/enpass/enpass-json-importer.ts | 3 +-- .../fsecure/fsecure-fsk-importer.spec.ts | 2 +- .../importers/fsecure/fsecure-fsk-importer.ts | 2 +- .../src/importers/keepass2-xml-importer.ts | 2 +- .../src/importers/lastpass-csv-importer.ts | 3 +-- .../src/importers/msecure-csv-importer.ts | 3 +-- libs/importer/src/importers/myki-csv-importer.ts | 3 +-- .../src/importers/nordpass-csv-importer.ts | 3 +-- .../onepassword/onepassword-1pif-importer.ts | 3 +-- .../onepassword/onepassword-1pux-importer.ts | 3 +-- .../onepassword/onepassword-csv-importer.ts | 3 +-- .../onepassword/onepassword-mac-csv-importer.ts | 2 +- .../onepassword/onepassword-win-csv-importer.ts | 2 +- .../src/importers/passwordboss-json-importer.ts | 2 +- .../protonpass/protonpass-json-importer.ts | 3 +-- .../src/importers/psono/psono-json-importer.ts | 3 +-- .../src/importers/remembear-csv-importer.ts | 2 +- .../src/importers/safeincloud-xml-importer.ts | 3 +-- .../src/importers/truekey-csv-importer.ts | 3 +-- libs/importer/src/services/import.service.ts | 2 +- .../misc/nodeUtils.ts => node/src/node-utils.ts} | 0 336 files changed, 446 insertions(+), 473 deletions(-) rename apps/browser/src/{auth/background/service-factories => vault/background/service_factories}/totp-service.factory.ts (89%) rename libs/angular/src/{validators/notAllowedValueAsync.validator.ts => admin-console/validators/not-allowed-value-async.validator.ts} (100%) rename libs/angular/src/{validators/inputsFieldMatch.validator.ts => auth/validators/inputs-field-match.validator.ts} (94%) rename libs/angular/src/{ => platform}/guard/feature-flag.guard.spec.ts (100%) rename libs/angular/src/{ => platform}/guard/feature-flag.guard.ts (100%) rename libs/angular/src/{services/theming/themeBuilder.ts => platform/services/theming/theme-builder.ts} (90%) rename libs/angular/src/{ => platform}/services/theming/theme.ts (58%) rename libs/angular/src/{ => platform}/services/theming/theming.service.abstraction.ts (83%) rename libs/angular/src/{ => platform}/services/theming/theming.service.ts (93%) rename libs/common/src/{ => admin-console}/enums/provider-type.enum.ts (100%) rename libs/common/src/{ => admin-console}/models/domain/provider.ts (90%) rename libs/common/src/{abstractions/anonymousHub.service.ts => auth/abstractions/anonymous-hub.service.ts} (100%) rename libs/common/src/{misc/iframe_component.ts => auth/iframe-component.ts} (100%) rename libs/common/src/{services/anonymousHub.service.ts => auth/services/anonymous-hub.service.ts} (83%) rename libs/common/src/{ => auth}/types/verification.ts (53%) rename libs/common/src/{ => platform}/enums/encryption-type.enum.ts (100%) rename libs/common/src/{ => platform}/enums/file-upload-type.enum.ts (100%) rename libs/common/src/{ => platform}/enums/hash-purpose.enum.ts (100%) rename libs/common/src/{ => platform}/enums/html-storage-location.enum.ts (100%) create mode 100644 libs/common/src/platform/enums/index.ts rename libs/common/src/{ => platform}/enums/kdf-type.enum.ts (78%) rename libs/common/src/{ => platform}/enums/key-suffix-options.enum.ts (100%) rename libs/common/src/{ => platform}/enums/log-level-type.enum.ts (100%) rename libs/common/src/{ => platform}/enums/storage-location.enum.ts (100%) rename libs/common/src/{ => platform}/enums/theme-type.enum.ts (100%) rename libs/common/src/{ => tools}/enums/encrypted-export-type.enum.ts (100%) rename libs/common/src/{ => tools}/models/domain/email-forwarder-options.ts (100%) create mode 100644 libs/common/src/tools/send/send-kdf.ts rename libs/common/src/{ => vault}/abstractions/totp.service.ts (100%) rename libs/common/src/{ => vault}/enums/field-type.enum.ts (100%) create mode 100644 libs/common/src/vault/enums/index.ts rename libs/common/src/{ => vault}/enums/linked-id-type.enum.ts (100%) rename libs/common/src/{ => vault}/enums/secure-note-type.enum.ts (100%) rename libs/common/src/{ => vault}/enums/uri-match-type.enum.ts (100%) rename libs/common/src/{misc/linkedFieldOption.decorator.ts => vault/linked-field-option.decorator.ts} (90%) rename libs/common/src/{ => vault}/models/api/card.api.ts (89%) rename libs/common/src/vault/{ => models}/api/fido2-credential.api.ts (94%) rename libs/common/src/{ => vault}/models/api/field.api.ts (87%) rename libs/common/src/{ => vault}/models/api/identity.api.ts (95%) rename libs/common/src/{ => vault}/models/api/login-uri.api.ts (84%) rename libs/common/src/{ => vault}/models/api/login.api.ts (89%) rename libs/common/src/{ => vault}/models/api/secure-note.api.ts (79%) rename libs/common/src/{ => vault}/models/domain/tree-node.ts (100%) rename libs/common/src/{misc/serviceUtils.spec.ts => vault/service-utils.spec.ts} (95%) rename libs/common/src/{misc/serviceUtils.ts => vault/service-utils.ts} (98%) rename libs/common/src/{ => vault}/services/totp.service.ts (95%) rename libs/{common/src/misc/nodeUtils.ts => node/src/node-utils.ts} (100%) diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index c02b437e52..dcabbd2226 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -15,15 +15,6 @@ ./libs/angular/src/scss/webfonts/Open_Sans-normal-600.woff ./libs/angular/src/scss/webfonts/Open_Sans-normal-800.woff ./libs/angular/src/scss/webfonts/Open_Sans-normal-400.woff -./libs/angular/src/validators/inputsFieldMatch.validator.ts -./libs/angular/src/validators/notAllowedValueAsync.validator.ts -./libs/angular/src/services/theming/themeBuilder.ts -./libs/common/src/misc/nodeUtils.ts -./libs/common/src/misc/linkedFieldOption.decorator.ts -./libs/common/src/misc/serviceUtils.ts -./libs/common/src/misc/serviceUtils.spec.ts -./libs/common/src/abstractions/anonymousHub.service.ts -./libs/common/src/services/anonymousHub.service.ts ./libs/auth/README.md ./libs/tools/README.md ./libs/vault/README.md diff --git a/apps/browser/src/auth/popup/login-via-auth-request.component.ts b/apps/browser/src/auth/popup/login-via-auth-request.component.ts index 82451cd1c1..b041f3fdd6 100644 --- a/apps/browser/src/auth/popup/login-via-auth-request.component.ts +++ b/apps/browser/src/auth/popup/login-via-auth-request.component.ts @@ -3,8 +3,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component"; -import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service"; import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts index 2e5eb1bfa6..58aaa425ac 100644 --- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts +++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts @@ -1,5 +1,5 @@ +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import AutofillPageDetails from "../../models/autofill-page-details"; diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index c60bc666d3..b4768e10e7 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -4,12 +4,12 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { ThemeType } from "@bitwarden/common/enums"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window"; diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts index 6f103b9c65..bc9c2374d5 100644 --- a/apps/browser/src/autofill/background/overlay.background.spec.ts +++ b/apps/browser/src/autofill/background/overlay.background.spec.ts @@ -2,12 +2,12 @@ import { mock, mockReset } from "jest-mock-extended"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { AuthService } from "@bitwarden/common/auth/services/auth.service"; -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { EnvironmentService } from "@bitwarden/common/platform/services/environment.service"; import { I18nService } from "@bitwarden/common/platform/services/i18n.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts index b80974eda2..38554ee8ac 100644 --- a/apps/browser/src/autofill/background/overlay.background.ts +++ b/apps/browser/src/autofill/background/overlay.background.ts @@ -1,13 +1,13 @@ import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { ThemeType } from "@bitwarden/common/enums"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { buildCipherIcon } from "@bitwarden/common/vault/icon/build-cipher-icon"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts index efa5bdcffb..4050d00081 100644 --- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts +++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts @@ -1,7 +1,3 @@ -import { - TotpServiceInitOptions, - totpServiceFactory, -} from "../../../auth/background/service-factories/totp-service.factory"; import { UserVerificationServiceInitOptions, userVerificationServiceFactory, @@ -31,6 +27,10 @@ import { cipherServiceFactory, CipherServiceInitOptions, } from "../../../vault/background/service_factories/cipher-service.factory"; +import { + TotpServiceInitOptions, + totpServiceFactory, +} from "../../../vault/background/service_factories/totp-service.factory"; import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service"; import AutofillService from "../../services/autofill.service"; diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts index 4532718809..70820f23ce 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts @@ -3,8 +3,8 @@ import { mock, MockProxy } from "jest-mock-extended"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherContextMenuHandler } from "./cipher-context-menu-handler"; import { MainContextMenuHandler } from "./main-context-menu-handler"; diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts index f46442c419..ae2f22e244 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts @@ -4,7 +4,7 @@ import { StateFactory } from "@bitwarden/common/platform/factories/state-factory import { Utils } from "@bitwarden/common/platform/misc/utils"; import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts index f1b2fe3339..ae5436f71a 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts @@ -1,13 +1,13 @@ import { mock, MockProxy } from "jest-mock-extended"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts index a2e139fbee..19643eb5e5 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts @@ -1,5 +1,4 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; @@ -8,15 +7,15 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { authServiceFactory, AuthServiceInitOptions, } from "../../auth/background/service-factories/auth-service.factory"; -import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory"; import { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory"; import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window"; import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; @@ -30,6 +29,7 @@ import { cipherServiceFactory, CipherServiceInitOptions, } from "../../vault/background/service_factories/cipher-service.factory"; +import { totpServiceFactory } from "../../vault/background/service_factories/totp-service.factory"; import { openAddEditVaultItemPopout, openVaultItemPasswordRepromptPopout, diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts index 95916d2e6f..aa5f43fbc9 100644 --- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts @@ -2,7 +2,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts index 20e176cf5c..1e90e90d0d 100644 --- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts @@ -3,7 +3,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { Account } from "../../models/account"; diff --git a/apps/browser/src/autofill/jest/autofill-mocks.ts b/apps/browser/src/autofill/jest/autofill-mocks.ts index aec61f9df5..6d8c727dd5 100644 --- a/apps/browser/src/autofill/jest/autofill-mocks.ts +++ b/apps/browser/src/autofill/jest/autofill-mocks.ts @@ -1,9 +1,8 @@ import { mock } from "jest-mock-extended"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { UriMatchType } from "@bitwarden/common/enums"; +import { UriMatchType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { OverlayCipherData } from "../background/abstractions/overlay.background"; diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts index 04beb2e4c4..3e8472f2c1 100644 --- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts +++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts @@ -1,5 +1,4 @@ -import { UriMatchType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { UriMatchType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import AutofillField from "../../models/autofill-field"; diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts index f923f3f1f8..c4bea144d2 100644 --- a/apps/browser/src/autofill/services/autofill.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill.service.spec.ts @@ -1,19 +1,18 @@ import { mock, mockReset } from "jest-mock-extended"; import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service"; +import { EventType } from "@bitwarden/common/enums"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; +import { SettingsService } from "@bitwarden/common/services/settings.service"; import { - EventType, FieldType, LinkedIdType, LoginLinkedId, UriMatchType, -} from "@bitwarden/common/enums"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; -import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { TotpService } from "@bitwarden/common/services/totp.service"; + CipherType, +} from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; @@ -21,6 +20,7 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view" import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; +import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { BrowserApi } from "../../platform/browser/browser-api"; import { BrowserStateService } from "../../platform/services/browser-state.service"; diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index ebd67abe43..b2672e8676 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -1,12 +1,12 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { EventType, FieldType, UriMatchType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { FieldType, UriMatchType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/apps/browser/src/autofill/types/index.ts b/apps/browser/src/autofill/types/index.ts index 880ce3ca1e..b3b803b7ab 100644 --- a/apps/browser/src/autofill/types/index.ts +++ b/apps/browser/src/autofill/types/index.ts @@ -1,7 +1,7 @@ import { Region } from "@bitwarden/common/platform/abstractions/environment.service"; import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { VaultTimeoutAction } from "@bitwarden/common/src/enums/vault-timeout-action.enum"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; export type UserSettings = { avatarColor: string | null; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index c04bef0fd8..bb61bb6465 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -6,7 +6,6 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/ import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; -import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.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"; @@ -72,7 +71,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service"; import { PasswordGenerationService, @@ -99,6 +97,7 @@ import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstraction import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction"; import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/services/collection.service"; @@ -108,6 +107,7 @@ import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-u import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { VaultExportService, VaultExportServiceAbstraction, diff --git a/apps/browser/src/background/models/addLoginQueueMessage.ts b/apps/browser/src/background/models/addLoginQueueMessage.ts index d5db5db135..1f727f40a5 100644 --- a/apps/browser/src/background/models/addLoginQueueMessage.ts +++ b/apps/browser/src/background/models/addLoginQueueMessage.ts @@ -1,5 +1,5 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index 4099b161cc..a5c101fa96 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -6,7 +6,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { SystemService } from "@bitwarden/common/platform/abstractions/system.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { closeUnlockPopout, diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index 6dd50c23e2..a4ad0d37dc 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/background/webRequest.background.ts @@ -1,8 +1,8 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { UriMatchType } from "@bitwarden/common/enums"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { UriMatchType } from "@bitwarden/common/vault/enums"; import { BrowserApi } from "../platform/browser/browser-api"; diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index 57e80216c2..73cc2a3231 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,6 +1,6 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/browser/src/platform/background/service-factories/log-service.factory.ts b/apps/browser/src/platform/background/service-factories/log-service.factory.ts index 69e49fabb7..4dd5f7dd78 100644 --- a/apps/browser/src/platform/background/service-factories/log-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/log-service.factory.ts @@ -1,5 +1,5 @@ -import { LogLevelType } from "@bitwarden/common/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum"; import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { FactoryOptions, CachedServices, factory } from "./factory-options"; diff --git a/apps/browser/src/platform/services/browser-crypto.service.ts b/apps/browser/src/platform/services/browser-crypto.service.ts index a6dce0f39e..0166fd439b 100644 --- a/apps/browser/src/platform/services/browser-crypto.service.ts +++ b/apps/browser/src/platform/services/browser-crypto.service.ts @@ -1,4 +1,4 @@ -import { KeySuffixOptions } from "@bitwarden/common/enums"; +import { KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SymmetricCryptoKey, diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 54e600a574..33ac4558ec 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -8,7 +8,7 @@ import { tdeDecryptionRequiredGuard, UnauthGuard, } from "@bitwarden/angular/auth/guards"; -import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard"; +import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard"; diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts index 5dd76ebe18..78fbdfaa9f 100644 --- a/apps/browser/src/popup/services/init.service.ts +++ b/apps/browser/src/popup/services/init.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 0059bcaa8e..2cd0166f94 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -1,15 +1,15 @@ import { APP_INITIALIZER, LOCALE_ID, NgModule } from "@angular/core"; import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards"; +import { ThemingService } from "@bitwarden/angular/platform/services/theming/theming.service"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { MEMORY_STORAGE, + SECURE_STORAGE, OBSERVABLE_DISK_STORAGE, OBSERVABLE_MEMORY_STORAGE, - SECURE_STORAGE, } from "@bitwarden/angular/services/injection-tokens"; import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module"; -import { ThemingService } from "@bitwarden/angular/services/theming/theming.service"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; 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"; @@ -17,7 +17,6 @@ import { EventUploadService } from "@bitwarden/common/abstractions/event/event-u import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @@ -87,6 +86,7 @@ import { InternalFolderService, } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; import { DialogService } from "@bitwarden/components"; import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export"; diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/popup/settings/autofill.component.ts index 17cbf60502..fb544d7526 100644 --- a/apps/browser/src/popup/settings/autofill.component.ts +++ b/apps/browser/src/popup/settings/autofill.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { UriMatchType } from "@bitwarden/common/enums"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { UriMatchType } from "@bitwarden/common/vault/enums"; import { DialogService } from "@bitwarden/components"; import { AutofillOverlayVisibility } from "../../autofill/utils/autofill-overlay.enum"; diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index 159bd100e8..4f943a857b 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit } from "@angular/core"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { ThemeType, UriMatchType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { UriMatchType } from "@bitwarden/common/vault/enums"; import { flagEnabled } from "../../platform/flags"; diff --git a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts similarity index 89% rename from apps/browser/src/auth/background/service-factories/totp-service.factory.ts rename to apps/browser/src/vault/background/service_factories/totp-service.factory.ts index 48331576cd..21e042370b 100644 --- a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts @@ -1,5 +1,5 @@ -import { TotpService as AbstractTotpService } from "@bitwarden/common/abstractions/totp.service"; -import { TotpService } from "@bitwarden/common/services/totp.service"; +import { TotpService as AbstractTotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { CryptoFunctionServiceInitOptions, diff --git a/apps/browser/src/vault/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts index ff8b7cab0d..e9ed209bb2 100644 --- a/apps/browser/src/vault/popup/components/action-buttons.component.ts +++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts @@ -1,13 +1,13 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts index c0862ab508..e0a81d760e 100644 --- a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts +++ b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts @@ -14,13 +14,12 @@ import { import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { SecureNoteType } from "@bitwarden/common/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts index 519a8a680e..f7daa8e40a 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -18,7 +18,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { DialogService } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts index f64f26d0bd..86c6551fb4 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -12,8 +12,8 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts index f6d0ae96fd..c2bfb262fd 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts @@ -6,13 +6,13 @@ import { first } from "rxjs/operators"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts index 32e7a9eacd..70d9d079c6 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts @@ -7,13 +7,13 @@ import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angul import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/browser/src/vault/popup/components/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts index f65659d9e6..2fef48b9bb 100644 --- a/apps/browser/src/vault/popup/components/vault/view.component.ts +++ b/apps/browser/src/vault/popup/components/vault/view.component.ts @@ -8,7 +8,6 @@ import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/com 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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -20,7 +19,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts index 76f0cce4b8..d4a8b87c52 100644 --- a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts +++ b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts @@ -1,6 +1,6 @@ import { mock } from "jest-mock-extended"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils"; diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.ts index 008daeec42..9812bc550e 100644 --- a/apps/browser/src/vault/popup/utils/vault-popout-window.ts +++ b/apps/browser/src/vault/popup/utils/vault-popout-window.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { BrowserApi } from "../../../platform/browser/browser-api"; import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils"; diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index a10b3f05db..4ce81dbd4c 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -24,7 +24,6 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -37,6 +36,7 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/sym import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { NodeUtils } from "@bitwarden/node/node-utils"; import { Response } from "../../models/response"; import { MessageResponse } from "../../models/response/message.response"; diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts index 9901fe2930..edd1dea043 100644 --- a/apps/cli/src/auth/commands/unlock.command.ts +++ b/apps/cli/src/auth/commands/unlock.command.ts @@ -2,11 +2,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; -import { HashPurpose } from "@bitwarden/common/enums"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { HashPurpose } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 640b6a194b..ceed0f2865 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -29,8 +29,9 @@ import { TokenService } from "@bitwarden/common/auth/services/token.service"; import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service"; import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service"; import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service"; -import { ClientType, KeySuffixOptions, LogLevelType } from "@bitwarden/common/enums"; +import { ClientType } from "@bitwarden/common/enums"; import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction"; +import { KeySuffixOptions, LogLevelType } from "@bitwarden/common/platform/enums"; import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; import { Account } from "@bitwarden/common/platform/models/domain/account"; import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; @@ -53,7 +54,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service"; import { @@ -74,6 +74,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { VaultExportService, VaultExportServiceAbstraction, diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 1c7f37706c..f1f6da7b6f 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -2,7 +2,6 @@ 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 { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { EventType } from "@bitwarden/common/enums"; @@ -24,7 +23,8 @@ import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/cli/src/platform/services/console-log.service.ts b/apps/cli/src/platform/services/console-log.service.ts index cf3aec036f..a35dae71fc 100644 --- a/apps/cli/src/platform/services/console-log.service.ts +++ b/apps/cli/src/platform/services/console-log.service.ts @@ -1,4 +1,4 @@ -import { LogLevelType } from "@bitwarden/common/enums"; +import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum"; import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; export class ConsoleLogService extends BaseConsoleLogService { diff --git a/apps/cli/src/platform/services/lowdb-storage.service.ts b/apps/cli/src/platform/services/lowdb-storage.service.ts index 5e3072ea5e..6beea9945d 100644 --- a/apps/cli/src/platform/services/lowdb-storage.service.ts +++ b/apps/cli/src/platform/services/lowdb-storage.service.ts @@ -7,7 +7,6 @@ import * as lock from "proper-lockfile"; import { OperationOptions } from "retry"; import { Subject } from "rxjs"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { AbstractStorageService, @@ -15,6 +14,7 @@ import { } from "@bitwarden/common/platform/abstractions/storage.service"; import { sequentialize } from "@bitwarden/common/platform/misc/sequentialize"; import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { NodeUtils } from "@bitwarden/node/node-utils"; const retries: OperationOptions = { retries: 50, diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts index 54e8340bdb..fd3b9428b2 100644 --- a/apps/cli/src/tools/send/commands/create.command.ts +++ b/apps/cli/src/tools/send/commands/create.command.ts @@ -1,12 +1,12 @@ import * as fs from "fs"; import * as path from "path"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; +import { NodeUtils } from "@bitwarden/node/node-utils"; import { Response } from "../../../models/response"; import { CliUtils } from "../../../utils"; diff --git a/apps/cli/src/tools/send/commands/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts index 52cff0b462..f5f3578327 100644 --- a/apps/cli/src/tools/send/commands/receive.command.ts +++ b/apps/cli/src/tools/send/commands/receive.command.ts @@ -2,7 +2,6 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -15,6 +14,7 @@ import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-acce import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { NodeUtils } from "@bitwarden/node/node-utils"; import { DownloadCommand } from "../../../commands/download.command"; import { Response } from "../../../models/response"; diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index 5d77f6d373..77efbb80d4 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -5,11 +5,11 @@ import * as inquirer from "inquirer"; import * as JSZip from "jszip"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { NodeUtils } from "@bitwarden/node/node-utils"; import { Response } from "./models/response"; import { MessageResponse } from "./models/response/message.response"; diff --git a/apps/cli/src/vault/models/cipher.response.ts b/apps/cli/src/vault/models/cipher.response.ts index a730894366..8df1b42f1e 100644 --- a/apps/cli/src/vault/models/cipher.response.ts +++ b/apps/cli/src/vault/models/cipher.response.ts @@ -1,5 +1,5 @@ import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { BaseResponse } from "../../models/response/base.response"; diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts index 8d6ef07a51..07210ea493 100644 --- a/apps/desktop/src/app/accounts/settings.component.ts +++ b/apps/desktop/src/app/accounts/settings.component.ts @@ -3,19 +3,20 @@ import { FormBuilder } from "@angular/forms"; import { BehaviorSubject, firstValueFrom, Observable, Subject } from "rxjs"; import { concatMap, debounceTime, filter, map, switchMap, takeUntil, tap } from "rxjs/operators"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { DeviceType, ThemeType, KeySuffixOptions } from "@bitwarden/common/enums"; +import { DeviceType } from "@bitwarden/common/enums"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { ThemeType, KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 0525c6259d..372f8b14da 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -7,7 +7,7 @@ import { redirectGuard, tdeDecryptionRequiredGuard, } from "@bitwarden/angular/auth/guards"; -import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard"; +import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 5167154258..5216960654 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -43,7 +43,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { DialogService } from "@bitwarden/components"; import { DeleteAccountComponent } from "../auth/delete-account.component"; diff --git a/apps/desktop/src/app/services/desktop-theming.service.ts b/apps/desktop/src/app/services/desktop-theming.service.ts index 3157ad9f66..2d0e19eae3 100644 --- a/apps/desktop/src/app/services/desktop-theming.service.ts +++ b/apps/desktop/src/app/services/desktop-theming.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; -import { ThemingService } from "@bitwarden/angular/services/theming/theming.service"; -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemingService } from "@bitwarden/angular/platform/services/theming/theming.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; @Injectable() export class DesktopThemingService extends ThemingService { diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index f45a60cadc..f49f0f5fb1 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from "@angular/core"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { WINDOW } from "@bitwarden/angular/services/injection-tokens"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 7d5f3615ea..8ff79c7a15 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -1,5 +1,6 @@ import { APP_INITIALIZER, InjectionToken, NgModule } from "@angular/core"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { SECURE_STORAGE, STATE_FACTORY, @@ -11,7 +12,6 @@ import { OBSERVABLE_DISK_STORAGE, } from "@bitwarden/angular/services/injection-tokens"; import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; diff --git a/apps/desktop/src/auth/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts index a6e3775b63..6efd380950 100644 --- a/apps/desktop/src/auth/delete-account.component.ts +++ b/apps/desktop/src/auth/delete-account.component.ts @@ -2,10 +2,10 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-delete-account", diff --git a/apps/desktop/src/auth/login/login-via-auth-request.component.ts b/apps/desktop/src/auth/login/login-via-auth-request.component.ts index 0fd426bc85..0b8f97aaf3 100644 --- a/apps/desktop/src/auth/login/login-via-auth-request.component.ts +++ b/apps/desktop/src/auth/login/login-via-auth-request.component.ts @@ -4,8 +4,8 @@ import { Router } from "@angular/router"; import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service"; import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; diff --git a/apps/desktop/src/platform/preload.ts b/apps/desktop/src/platform/preload.ts index de572122ee..0808a63438 100644 --- a/apps/desktop/src/platform/preload.ts +++ b/apps/desktop/src/platform/preload.ts @@ -1,6 +1,7 @@ import { ipcRenderer } from "electron"; -import { DeviceType, ThemeType, KeySuffixOptions } from "@bitwarden/common/enums"; +import { DeviceType } from "@bitwarden/common/enums"; +import { ThemeType, KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { diff --git a/apps/desktop/src/platform/services/electron-crypto.service.ts b/apps/desktop/src/platform/services/electron-crypto.service.ts index e21d200197..6ebe8d963f 100644 --- a/apps/desktop/src/platform/services/electron-crypto.service.ts +++ b/apps/desktop/src/platform/services/electron-crypto.service.ts @@ -1,8 +1,8 @@ -import { KeySuffixOptions } from "@bitwarden/common/enums"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { diff --git a/apps/desktop/src/platform/services/electron-log.service.ts b/apps/desktop/src/platform/services/electron-log.service.ts index 55d4c62f94..163e082185 100644 --- a/apps/desktop/src/platform/services/electron-log.service.ts +++ b/apps/desktop/src/platform/services/electron-log.service.ts @@ -2,7 +2,7 @@ import * as path from "path"; import log from "electron-log"; -import { LogLevelType } from "@bitwarden/common/enums"; +import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum"; import { ConsoleLogService as BaseLogService } from "@bitwarden/common/platform/services/console-log.service"; import { isDev } from "../../utils"; diff --git a/apps/desktop/src/platform/services/electron-storage.service.ts b/apps/desktop/src/platform/services/electron-storage.service.ts index e9dc066424..dc145fc2f7 100644 --- a/apps/desktop/src/platform/services/electron-storage.service.ts +++ b/apps/desktop/src/platform/services/electron-storage.service.ts @@ -3,11 +3,11 @@ import * as fs from "fs"; import { ipcMain } from "electron"; import { Subject } from "rxjs"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { AbstractStorageService, StorageUpdate, } from "@bitwarden/common/platform/abstractions/storage.service"; +import { NodeUtils } from "@bitwarden/node/node-utils"; // See: https://github.com/sindresorhus/electron-store/blob/main/index.d.ts interface ElectronStoreOptions { diff --git a/apps/desktop/src/services/electron-main-messaging.service.ts b/apps/desktop/src/services/electron-main-messaging.service.ts index 1c029edc7f..e666665e2e 100644 --- a/apps/desktop/src/services/electron-main-messaging.service.ts +++ b/apps/desktop/src/services/electron-main-messaging.service.ts @@ -12,8 +12,8 @@ import { shell, } from "electron"; -import { ThemeType } from "@bitwarden/common/enums"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { SafeUrls } from "@bitwarden/common/platform/misc/safe-urls"; import { WindowMain } from "../main/window.main"; diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index 1ce52cfecc..1178150cff 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -7,7 +7,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; diff --git a/apps/desktop/src/services/native-messaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts index d4f465dca9..cfb4c651c6 100644 --- a/apps/desktop/src/services/native-messaging.service.ts +++ b/apps/desktop/src/services/native-messaging.service.ts @@ -1,7 +1,6 @@ import { Injectable, NgZone } from "@angular/core"; import { firstValueFrom } from "rxjs"; -import { KeySuffixOptions } from "@bitwarden/common/enums"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -9,6 +8,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index 7930663499..d45b7971b4 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -15,7 +15,6 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType } from "@bitwarden/common/enums"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -23,8 +22,9 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts index adb72dbfe3..9d7c4db7c7 100644 --- a/apps/desktop/src/vault/app/vault/view.component.ts +++ b/apps/desktop/src/vault/app/vault/view.component.ts @@ -11,7 +11,6 @@ import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/com 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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -23,6 +22,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index b479905f89..6f220dd26a 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -17,6 +17,7 @@ "@bitwarden/exporter/*": ["../../libs/exporter/src/*"], "@bitwarden/importer/core": ["../../libs/importer/src"], "@bitwarden/importer/ui": ["../../libs/importer/src/components"], + "@bitwarden/node/*": ["../../libs/node/src/*"], "@bitwarden/vault": ["../../libs/vault/src"] }, "useDefineForClassFields": false diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts index 389514d35f..f846838bf4 100644 --- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts @@ -7,12 +7,12 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { Verification } from "@bitwarden/common/types/verification"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts index fd09078e78..437af95e70 100644 --- a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts @@ -7,12 +7,12 @@ import { OrganizationUserService } from "@bitwarden/common/admin-console/abstrac import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { Verification } from "@bitwarden/common/types/verification"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/admin-console/providers/providers.component.ts b/apps/web/src/app/admin-console/providers/providers.component.ts index f7e707b7f6..dcd486242e 100644 --- a/apps/web/src/app/admin-console/providers/providers.component.ts +++ b/apps/web/src/app/admin-console/providers/providers.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; diff --git a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts index 0a95773def..5b934692fe 100644 --- a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts +++ b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; import { map, Observable, Subject, takeUntil } from "rxjs"; -import { notAllowedValueAsync } from "@bitwarden/angular/validators/notAllowedValueAsync.validator"; +import { notAllowedValueAsync } from "@bitwarden/angular/admin-console/validators/not-allowed-value-async.validator"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts index 891d403b43..6dfe4e2656 100644 --- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts +++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts @@ -4,8 +4,8 @@ import { BehaviorSubject, filter, from, map, Observable, shareReplay, switchMap, import { PrfKeySet } from "@bitwarden/auth"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { WebAuthnLoginPrfCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-crypto.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { CredentialCreateOptionsView } from "../../views/credential-create-options.view"; import { PendingWebauthnLoginCredentialView } from "../../views/pending-webauthn-login-credential.view"; diff --git a/apps/web/src/app/auth/emergency-access/models/emergency-access.ts b/apps/web/src/app/auth/emergency-access/models/emergency-access.ts index 28d9476c03..adf77ed573 100644 --- a/apps/web/src/app/auth/emergency-access/models/emergency-access.ts +++ b/apps/web/src/app/auth/emergency-access/models/emergency-access.ts @@ -1,4 +1,4 @@ -import { KdfType } from "@bitwarden/common/enums"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response"; import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type"; diff --git a/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts b/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts index 1a9c1388f7..2d50da8fe3 100644 --- a/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts +++ b/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts @@ -1,5 +1,5 @@ -import { KdfType } from "@bitwarden/common/enums"; import { BaseResponse } from "@bitwarden/common/models/response/base.response"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response"; import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type"; diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts index 596f3c1a5d..582370d93c 100644 --- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts +++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts @@ -2,12 +2,12 @@ import { MockProxy } from "jest-mock-extended"; import mock from "jest-mock-extended/lib/Mock"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { EncryptionType, KdfType } from "@bitwarden/common/enums"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { UserKeyResponse } from "@bitwarden/common/models/response/user-key.response"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { EncryptionType, KdfType } from "@bitwarden/common/platform/enums"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { UserKey, diff --git a/apps/web/src/app/auth/login/login-via-auth-request.component.ts b/apps/web/src/app/auth/login/login-via-auth-request.component.ts index 447e53bc17..118565a476 100644 --- a/apps/web/src/app/auth/login/login-via-auth-request.component.ts +++ b/apps/web/src/app/auth/login/login-via-auth-request.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component"; -import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service"; import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts index 08f433cf5a..16f2e9ca62 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts @@ -8,10 +8,10 @@ import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/commo import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; -import { EncryptionType, KdfType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { EncryptionType, KdfType } from "@bitwarden/common/platform/enums"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MasterKey, diff --git a/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts index 6c64933629..7b8b7c8a6f 100644 --- a/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts +++ b/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-deauthorize-sessions", diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts index cbf32b8698..1fec68d091 100644 --- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts @@ -3,13 +3,13 @@ import { takeUntil } from "rxjs"; import { ChangePasswordComponent } from "@bitwarden/angular/auth/components/change-password.component"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { KdfType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts index 91de00f43f..a70c6386d5 100644 --- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts @@ -3,7 +3,6 @@ import { Component } from "@angular/core"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -16,6 +15,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { DialogService } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/auth/settings/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor-verify.component.ts index 71a7772c8e..f9ee53f54f 100644 --- a/apps/web/src/app/auth/settings/two-factor-verify.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-verify.component.ts @@ -7,8 +7,8 @@ import { VerificationType } from "@bitwarden/common/auth/enums/verification-type import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-two-factor-verify", diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts index a4ca5b7521..9aef82df58 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts @@ -4,11 +4,11 @@ import { FormBuilder, Validators } from "@angular/forms"; import { firstValueFrom, map, Observable } from "rxjs"; import { PrfKeySet } from "@bitwarden/auth"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { DialogService } from "@bitwarden/components"; import { WebauthnLoginAdminService } from "../../../core"; diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts index 6a90655aba..a268e48673 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts @@ -3,11 +3,11 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { Subject, takeUntil } from "rxjs"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { DialogService } from "@bitwarden/components"; import { WebauthnLoginAdminService } from "../../../core"; diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts index 800f144b74..a36cc8727f 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts @@ -8,10 +8,10 @@ import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums"; import { OrganizationApiKeyRequest } from "@bitwarden/common/admin-console/models/request/organization-api-key.request"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { DialogService } from "@bitwarden/components"; export interface BillingSyncApiModalData { diff --git a/apps/web/src/app/billing/shared/payment.component.ts b/apps/web/src/app/billing/shared/payment.component.ts index 68cc93c270..b3f5ee3a24 100644 --- a/apps/web/src/app/billing/shared/payment.component.ts +++ b/apps/web/src/app/billing/shared/payment.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnDestroy, OnInit } from "@angular/core"; import { Subject, takeUntil } from "rxjs"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { PaymentMethodType } from "@bitwarden/common/billing/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; diff --git a/apps/web/src/app/core/html-storage.service.ts b/apps/web/src/app/core/html-storage.service.ts index 5a7cd2bbc5..d83d4c6fad 100644 --- a/apps/web/src/app/core/html-storage.service.ts +++ b/apps/web/src/app/core/html-storage.service.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; import { Subject } from "rxjs"; -import { HtmlStorageLocation } from "@bitwarden/common/enums"; import { AbstractStorageService, StorageUpdate, } from "@bitwarden/common/platform/abstractions/storage.service"; +import { HtmlStorageLocation } from "@bitwarden/common/platform/enums"; import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; @Injectable() diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts index f171217d3c..fa1d2a94f8 100644 --- a/apps/web/src/app/core/init.service.ts +++ b/apps/web/src/app/core/init.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from "@angular/core"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { WINDOW } from "@bitwarden/angular/services/injection-tokens"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service"; diff --git a/apps/web/src/app/core/state/global-state.ts b/apps/web/src/app/core/state/global-state.ts index 79d3712c9c..9bdcb2f879 100644 --- a/apps/web/src/app/core/state/global-state.ts +++ b/apps/web/src/app/core/state/global-state.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { GlobalState as BaseGlobalState } from "@bitwarden/common/platform/models/domain/global-state"; export class GlobalState extends BaseGlobalState { diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts index 8dc36e4fb3..2f79931f37 100644 --- a/apps/web/src/app/layouts/navbar.component.ts +++ b/apps/web/src/app/layouts/navbar.component.ts @@ -8,9 +8,9 @@ import { } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; -import { Provider } from "@bitwarden/common/models/domain/provider"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index b22d941943..87b599425a 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -8,7 +8,7 @@ import { tdeDecryptionRequiredGuard, UnauthGuard, } from "@bitwarden/angular/auth/guards"; -import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard"; +import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { flagEnabled, Flags } from "../utils/flags"; diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts index 54a634b251..4553745267 100644 --- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts @@ -4,7 +4,7 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts index b1ca1f654d..e01a4d590f 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts @@ -5,7 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts index c8aa305b8d..1587fc08de 100644 --- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts index c1d91cf0bf..53beccdcc5 100644 --- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts +++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts index 6ae7b15bac..cd2c8fb2fd 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts @@ -5,7 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Utils } from "@bitwarden/common/platform/misc/utils"; import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { BadgeTypes } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/settings/api-key.component.ts index bdb74845c4..067cadd091 100644 --- a/apps/web/src/app/settings/api-key.component.ts +++ b/apps/web/src/app/settings/api-key.component.ts @@ -3,8 +3,8 @@ import { Component } from "@angular/core"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-api-key", diff --git a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts index 169b1bbdfa..9b948e8166 100644 --- a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts +++ b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts @@ -4,7 +4,6 @@ import { FormGroup, FormControl, Validators } from "@angular/forms"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums"; import { KdfRequest } from "@bitwarden/common/models/request/kdf.request"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -12,6 +11,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; @Component({ selector: "app-change-kdf-confirmation", diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts index 3da4c5ea1d..5734b216bd 100644 --- a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts +++ b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from "@angular/core"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { DEFAULT_KDF_CONFIG, DEFAULT_PBKDF2_ITERATIONS, @@ -8,8 +9,7 @@ import { DEFAULT_ARGON2_MEMORY, DEFAULT_ARGON2_PARALLELISM, KdfType, -} from "@bitwarden/common/enums"; -import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +} from "@bitwarden/common/platform/enums"; import { DialogService } from "@bitwarden/components"; import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component"; diff --git a/apps/web/src/app/settings/delete-account.component.ts b/apps/web/src/app/settings/delete-account.component.ts index 61423d0e4f..b76ff7d7bf 100644 --- a/apps/web/src/app/settings/delete-account.component.ts +++ b/apps/web/src/app/settings/delete-account.component.ts @@ -2,10 +2,10 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-delete-account", diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts index 9412a3e8b6..949a8db431 100644 --- a/apps/web/src/app/settings/preferences.component.ts +++ b/apps/web/src/app/settings/preferences.component.ts @@ -2,17 +2,17 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { concatMap, filter, firstValueFrom, map, Observable, Subject, takeUntil, tap } from "rxjs"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; +import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; -import { ThemeType } from "@bitwarden/common/enums"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/settings/purge-vault.component.ts b/apps/web/src/app/settings/purge-vault.component.ts index 83e8c2a8df..88bea9b51e 100644 --- a/apps/web/src/app/settings/purge-vault.component.ts +++ b/apps/web/src/app/settings/purge-vault.component.ts @@ -3,10 +3,10 @@ import { Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ diff --git a/apps/web/src/app/tools/send/access.component.ts b/apps/web/src/app/tools/send/access.component.ts index d01bc9c52f..86dfb017ec 100644 --- a/apps/web/src/app/tools/send/access.component.ts +++ b/apps/web/src/app/tools/send/access.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -15,6 +14,7 @@ import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-acce import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response/send-access.response"; import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; +import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { NoItemsModule } from "@bitwarden/components"; diff --git a/apps/web/src/app/tools/vault-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts index b4c2038421..7f2a20cddc 100644 --- a/apps/web/src/app/tools/vault-export/export.component.ts +++ b/apps/web/src/app/tools/vault-export/export.component.ts @@ -6,12 +6,12 @@ import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/tools import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { EncryptedExportType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { EncryptedExportType } from "@bitwarden/common/tools/enums/encrypted-export-type.enum"; import { DialogService } from "@bitwarden/components"; import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export"; diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts index 7c70a79743..49ec8ddd52 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts +++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, HostBinding, HostListener, Input, Output } fro import { ActivatedRoute, Router } from "@angular/router"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts index e3eed298d7..33486fcbb8 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts +++ b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts @@ -12,7 +12,7 @@ import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstraction import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index cf998c5c8f..2a9d92f415 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -4,7 +4,6 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.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 { EventType, ProductType } from "@bitwarden/common/enums"; @@ -18,7 +17,8 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { Launchable } from "@bitwarden/common/vault/interfaces/launchable"; import { DialogService } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts index 084573446f..41f5e661db 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts @@ -3,10 +3,10 @@ import { firstValueFrom, Subject } from "rxjs"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { VaultFilterService } from "../services/abstractions/vault-filter.service"; import { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts index 0c8ced7df3..1acd0ef812 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts @@ -1,9 +1,9 @@ import { Observable } from "rxjs"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { TreeNode } from "@bitwarden/common/src/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/src/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherTypeFilter, diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts index cce5a5e24a..e1acabc63b 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts @@ -2,8 +2,8 @@ import { Injectable } from "@angular/core"; import { Router } from "@angular/router"; import { combineLatest, map, Observable } from "rxjs"; -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { RoutedVaultFilterBridge } from "../shared/models/routed-vault-filter-bridge.model"; import { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts index db0dffbdd7..7bbc0839e9 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -15,15 +15,15 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { CollectionAdminView } from "../../../core/views/collection-admin.view"; import { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts index 21e6ef727d..38f5577da6 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts @@ -3,7 +3,7 @@ import { Observable, Subject, takeUntil } from "rxjs"; import { map } from "rxjs/operators"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { ITreeNodeObject, TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { VaultFilterService } from "../../services/abstractions/vault-filter.service"; import { VaultFilterSection, VaultFilterType } from "../models/vault-filter-section.type"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts index adb0d5d4f8..786b2b1c7a 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { createFilterFunction } from "./filter-function"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts index c8d21e314d..4716eb631b 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { All, RoutedVaultFilterModel, Unassigned } from "./routed-vault-filter.model"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts index 07a901c8eb..4ad34257da 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts @@ -1,5 +1,5 @@ -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { RoutedVaultFilterBridgeService } from "../../services/routed-vault-filter-bridge.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts index 48a687b4a2..f89a72b5d2 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts @@ -1,6 +1,6 @@ import { Observable } from "rxjs"; -import { TreeNode } from "@bitwarden/common/src/models/domain/tree-node"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherTypeFilter, diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts index a754f0151b..0abd4cf50a 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts @@ -1,6 +1,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts index 45b06232da..b6fbb0838c 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts @@ -1,5 +1,5 @@ -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts index 8f459f8c8c..fd349069aa 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts @@ -1,7 +1,7 @@ -import { Organization } from "@bitwarden/common/src/admin-console/models/domain/organization"; -import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionAdminView } from "../../../../core/views/collection-admin.view"; diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts index 4b7d708c62..fa89aa7c30 100644 --- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts @@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { CollectionDialogTabType } from "../../components/collection-dialog"; diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index 9396d6b181..e6df03577c 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -33,15 +33,12 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { DEFAULT_PBKDF2_ITERATIONS, EventType, KdfType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -50,15 +47,19 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionDetailsResponse } from "@bitwarden/common/vault/models/response/collection.response"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { DialogService, Icons } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts index 93be56f1a0..d8b9d6c74a 100644 --- a/apps/web/src/app/vault/org-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts @@ -4,7 +4,6 @@ import { Component } from "@angular/core"; 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 { TotpService } from "@bitwarden/common/abstractions/totp.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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -17,6 +16,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts index a5508491ca..6fb73083e9 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit } from "@angular/core"; import { firstValueFrom, Subject } from "rxjs"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { VaultFilterComponent as BaseVaultFilterComponent } from "../../individual-vault/vault-filter/components/vault-filter.component"; //../../vault/vault-filter/components/vault-filter.component"; import { diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts index e38d66a581..05928f6ae2 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts @@ -3,10 +3,10 @@ import { map, Observable, ReplaySubject, Subject } from "rxjs"; 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 { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { StateService } from "../../../core"; import { CollectionAdminView } from "../../../vault/core/views/collection-admin.view"; diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts index 3272b3588e..593b2bd99d 100644 --- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts @@ -6,9 +6,9 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { ProductType } from "@bitwarden/common/enums"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { DialogService, SimpleDialogOptions } from "@bitwarden/components"; import { CollectionAdminView } from "../../../vault/core/views/collection-admin.view"; diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts index bc6d3bb751..5284e7e2fb 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -34,13 +34,10 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { EventType } from "@bitwarden/common/enums"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -50,9 +47,12 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { DialogService, Icons } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; diff --git a/apps/web/src/app/vault/utils/collection-utils.ts b/apps/web/src/app/vault/utils/collection-utils.ts index c25e5a3738..71aa045e18 100644 --- a/apps/web/src/app/vault/utils/collection-utils.ts +++ b/apps/web/src/app/vault/utils/collection-utils.ts @@ -1,9 +1,9 @@ -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView, NestingDelimiter, } from "@bitwarden/common/vault/models/view/collection.view"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { CollectionAdminView } from "../../vault/core/views/collection-admin.view"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts index 5c6c10724c..ba6a5f64e0 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; -import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard"; +import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard"; import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts index 0d61c264e2..b2f8bf8dcf 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts @@ -3,7 +3,7 @@ import { Component, Inject, OnInit } from "@angular/core"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts index c584dc3753..badcaf8331 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts @@ -3,7 +3,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { ProviderUserType } from "@bitwarden/common/admin-console/enums"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts index 6c903fce6e..7c0d0ce249 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts index 94d4490933..dcc6cd06da 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @Component({ selector: "provider-manage", diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts index de8ce219e6..c357ced0bd 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @Component({ selector: "providers-layout", diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts index 5bc2764038..0643bde872 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; -import { Provider } from "@bitwarden/common/models/domain/provider"; +import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { ProvidersComponent } from "@bitwarden/web-vault/app/admin-console/providers/providers.component"; import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component"; diff --git a/libs/angular/src/validators/notAllowedValueAsync.validator.ts b/libs/angular/src/admin-console/validators/not-allowed-value-async.validator.ts similarity index 100% rename from libs/angular/src/validators/notAllowedValueAsync.validator.ts rename to libs/angular/src/admin-console/validators/not-allowed-value-async.validator.ts diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts index b9c2d1be4f..2b5c16aca0 100644 --- a/libs/angular/src/auth/components/change-password.component.ts +++ b/libs/angular/src/auth/components/change-password.component.ts @@ -4,12 +4,12 @@ import { Subject, takeUntil } from "rxjs"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; diff --git a/libs/angular/src/auth/components/lock.component.ts b/libs/angular/src/auth/components/lock.component.ts index f4bdd163eb..e23ca2d100 100644 --- a/libs/angular/src/auth/components/lock.component.ts +++ b/libs/angular/src/auth/components/lock.component.ts @@ -14,7 +14,6 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { MasterPasswordPolicyResponse } from "@bitwarden/common/auth/models/response/master-password-policy.response"; -import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/enums"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; @@ -23,6 +22,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/platform/enums"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { PinLockType } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service"; diff --git a/libs/angular/src/auth/components/login-via-auth-request.component.ts b/libs/angular/src/auth/components/login-via-auth-request.component.ts index 6703bdccf0..e3042a675d 100644 --- a/libs/angular/src/auth/components/login-via-auth-request.component.ts +++ b/libs/angular/src/auth/components/login-via-auth-request.component.ts @@ -2,8 +2,8 @@ import { Directive, OnDestroy, OnInit } from "@angular/core"; import { IsActiveMatchOptions, Router } from "@angular/router"; import { Subject, takeUntil } from "rxjs"; -import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service"; import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; diff --git a/libs/angular/src/auth/components/register.component.ts b/libs/angular/src/auth/components/register.component.ts index a56498bdf0..2d55d41175 100644 --- a/libs/angular/src/auth/components/register.component.ts +++ b/libs/angular/src/auth/components/register.component.ts @@ -7,7 +7,6 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { PasswordLoginCredentials } from "@bitwarden/common/auth/models/domain/login-credentials"; import { RegisterResponse } from "@bitwarden/common/auth/models/response/register.response"; -import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RegisterRequest } from "@bitwarden/common/models/request/register.request"; @@ -17,6 +16,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 { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { DialogService } from "@bitwarden/components"; @@ -26,7 +26,7 @@ import { FormValidationErrorsService, } from "../../platform/abstractions/form-validation-errors.service"; import { PasswordColorText } from "../../shared/components/password-strength/password-strength.component"; -import { InputsFieldMatch } from "../../validators/inputsFieldMatch.validator"; +import { InputsFieldMatch } from "../validators/inputs-field-match.validator"; import { CaptchaProtectedComponent } from "./captcha-protected.component"; diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts index f7650204d2..7477340bea 100644 --- a/libs/angular/src/auth/components/set-password.component.ts +++ b/libs/angular/src/auth/components/set-password.component.ts @@ -13,13 +13,17 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod import { OrganizationAutoEnrollStatusResponse } from "@bitwarden/common/admin-console/models/response/organization-auto-enroll-status.response"; import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason"; import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request"; -import { HashPurpose, DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { + HashPurpose, + DEFAULT_KDF_TYPE, + DEFAULT_KDF_CONFIG, +} from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { AccountDecryptionOptions } from "@bitwarden/common/platform/models/domain/account"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; diff --git a/libs/angular/src/auth/components/set-pin.component.ts b/libs/angular/src/auth/components/set-pin.component.ts index 9219535ff7..b6f77803fd 100644 --- a/libs/angular/src/auth/components/set-pin.component.ts +++ b/libs/angular/src/auth/components/set-pin.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { KeySuffixOptions } from "@bitwarden/common/enums/key-suffix-options.enum"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KeySuffixOptions } from "@bitwarden/common/platform/enums/key-suffix-options.enum"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ModalRef } from "../../components/modal/modal.ref"; diff --git a/libs/angular/src/auth/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts index 81bdbb31cb..f86189c32d 100644 --- a/libs/angular/src/auth/components/update-password.component.ts +++ b/libs/angular/src/auth/components/update-password.component.ts @@ -7,6 +7,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -16,7 +17,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { Verification } from "@bitwarden/common/types/verification"; import { DialogService } from "@bitwarden/components"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts index 4c27bfa4f0..fd705e94f4 100644 --- a/libs/angular/src/auth/components/update-temp-password.component.ts +++ b/libs/angular/src/auth/components/update-temp-password.component.ts @@ -9,6 +9,7 @@ import { VerificationType } from "@bitwarden/common/auth/enums/verification-type import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason"; import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -18,7 +19,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { Verification } from "@bitwarden/common/types/verification"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { DialogService } from "@bitwarden/components"; diff --git a/libs/angular/src/auth/components/user-verification-prompt.component.ts b/libs/angular/src/auth/components/user-verification-prompt.component.ts index 1b0a1dbed8..666b890c04 100644 --- a/libs/angular/src/auth/components/user-verification-prompt.component.ts +++ b/libs/angular/src/auth/components/user-verification-prompt.component.ts @@ -2,9 +2,9 @@ import { Directive } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Verification } from "@bitwarden/common/types/verification"; import { ModalRef } from "../../components/modal/modal.ref"; import { ModalConfig } from "../../services/modal.service"; diff --git a/libs/angular/src/auth/components/user-verification.component.ts b/libs/angular/src/auth/components/user-verification.component.ts index 9f512fb350..ae0e37055c 100644 --- a/libs/angular/src/auth/components/user-verification.component.ts +++ b/libs/angular/src/auth/components/user-verification.component.ts @@ -4,10 +4,10 @@ import { Subject, takeUntil } from "rxjs"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; +import { Verification } from "@bitwarden/common/auth/types/verification"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { Verification } from "@bitwarden/common/types/verification"; /** * Used for general-purpose user verification throughout the app. diff --git a/libs/angular/src/validators/inputsFieldMatch.validator.ts b/libs/angular/src/auth/validators/inputs-field-match.validator.ts similarity index 94% rename from libs/angular/src/validators/inputsFieldMatch.validator.ts rename to libs/angular/src/auth/validators/inputs-field-match.validator.ts index f360b5e5ee..9c91007d0c 100644 --- a/libs/angular/src/validators/inputsFieldMatch.validator.ts +++ b/libs/angular/src/auth/validators/inputs-field-match.validator.ts @@ -1,6 +1,6 @@ import { AbstractControl, UntypedFormGroup, ValidatorFn } from "@angular/forms"; -import { FormGroupControls } from "../platform/abstractions/form-validation-errors.service"; +import { FormGroupControls } from "../../platform/abstractions/form-validation-errors.service"; export class InputsFieldMatch { //check to ensure two fields do not have the same value diff --git a/libs/angular/src/guard/feature-flag.guard.spec.ts b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts similarity index 100% rename from libs/angular/src/guard/feature-flag.guard.spec.ts rename to libs/angular/src/platform/guard/feature-flag.guard.spec.ts diff --git a/libs/angular/src/guard/feature-flag.guard.ts b/libs/angular/src/platform/guard/feature-flag.guard.ts similarity index 100% rename from libs/angular/src/guard/feature-flag.guard.ts rename to libs/angular/src/platform/guard/feature-flag.guard.ts diff --git a/libs/angular/src/services/theming/themeBuilder.ts b/libs/angular/src/platform/services/theming/theme-builder.ts similarity index 90% rename from libs/angular/src/services/theming/themeBuilder.ts rename to libs/angular/src/platform/services/theming/theme-builder.ts index 1dd9ad6b38..f970baea15 100644 --- a/libs/angular/src/services/theming/themeBuilder.ts +++ b/libs/angular/src/platform/services/theming/theme-builder.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { Theme } from "./theme"; diff --git a/libs/angular/src/services/theming/theme.ts b/libs/angular/src/platform/services/theming/theme.ts similarity index 58% rename from libs/angular/src/services/theming/theme.ts rename to libs/angular/src/platform/services/theming/theme.ts index b5a1c83d7c..87b9f0c216 100644 --- a/libs/angular/src/services/theming/theme.ts +++ b/libs/angular/src/platform/services/theming/theme.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemeType } from "@bitwarden/common/platform/enums"; export interface Theme { configuredTheme: ThemeType; diff --git a/libs/angular/src/services/theming/theming.service.abstraction.ts b/libs/angular/src/platform/services/theming/theming.service.abstraction.ts similarity index 83% rename from libs/angular/src/services/theming/theming.service.abstraction.ts rename to libs/angular/src/platform/services/theming/theming.service.abstraction.ts index 0118e2f0c5..aaf67a9252 100644 --- a/libs/angular/src/services/theming/theming.service.abstraction.ts +++ b/libs/angular/src/platform/services/theming/theming.service.abstraction.ts @@ -1,6 +1,6 @@ import { Observable } from "rxjs"; -import { ThemeType } from "@bitwarden/common/enums"; +import { ThemeType } from "@bitwarden/common/platform/enums"; import { Theme } from "./theme"; diff --git a/libs/angular/src/services/theming/theming.service.ts b/libs/angular/src/platform/services/theming/theming.service.ts similarity index 93% rename from libs/angular/src/services/theming/theming.service.ts rename to libs/angular/src/platform/services/theming/theming.service.ts index 91760e07fe..9c1b19ddb2 100644 --- a/libs/angular/src/services/theming/theming.service.ts +++ b/libs/angular/src/platform/services/theming/theming.service.ts @@ -2,13 +2,13 @@ import { DOCUMENT } from "@angular/common"; import { Inject, Injectable } from "@angular/core"; import { BehaviorSubject, filter, fromEvent, Observable } from "rxjs"; -import { ThemeType } from "@bitwarden/common/enums"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { ThemeType } from "@bitwarden/common/platform/enums"; -import { WINDOW } from "../injection-tokens"; +import { WINDOW } from "../../../services/injection-tokens"; import { Theme } from "./theme"; -import { ThemeBuilder } from "./themeBuilder"; +import { ThemeBuilder } from "./theme-builder"; import { AbstractThemingService } from "./theming.service.abstraction"; @Injectable() diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index fedbf43391..97d8099b95 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -1,7 +1,6 @@ import { LOCALE_ID, NgModule } from "@angular/core"; import { AvatarUpdateService as AccountUpdateServiceAbstraction } from "@bitwarden/common/abstractions/account/avatar-update.service"; -import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/abstractions/anonymousHub.service"; 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"; @@ -9,7 +8,6 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/ import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; -import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @@ -42,6 +40,7 @@ import { AccountService as AccountServiceAbstraction, InternalAccountService, } from "@bitwarden/common/auth/abstractions/account.service"; +import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/auth/abstractions/anonymous-hub.service"; import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; @@ -59,6 +58,7 @@ import { WebAuthnLoginPrfCryptoServiceAbstraction } from "@bitwarden/common/auth import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login.service.abstraction"; import { AccountApiServiceImplementation } from "@bitwarden/common/auth/services/account-api.service"; import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service"; +import { AnonymousHubService } from "@bitwarden/common/auth/services/anonymous-hub.service"; import { AuthRequestCryptoServiceImplementation } from "@bitwarden/common/auth/services/auth-request-crypto.service.implementation"; import { AuthService } from "@bitwarden/common/auth/services/auth.service"; import { DeviceTrustCryptoService } from "@bitwarden/common/auth/services/device-trust-crypto.service.implementation"; @@ -111,7 +111,6 @@ import { GlobalStateProvider } from "@bitwarden/common/platform/state"; // eslint-disable-next-line import/no-restricted-paths -- We need the implementation to inject, but generally this should not be accessed import { DefaultGlobalStateProvider } from "@bitwarden/common/platform/state/implementations/default-global-state.provider"; import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service"; -import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.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"; @@ -119,7 +118,6 @@ import { EventUploadService } from "@bitwarden/common/services/event/event-uploa import { NotificationsService } from "@bitwarden/common/services/notifications.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service"; import { @@ -148,6 +146,7 @@ import { } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction"; import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/services/collection.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service"; @@ -155,6 +154,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { VaultExportService, VaultExportServiceAbstraction, @@ -172,6 +172,8 @@ import { UnauthGuard } from "../auth/guards/unauth.guard"; import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service"; import { BroadcasterService } from "../platform/services/broadcaster.service"; import { FormValidationErrorsService } from "../platform/services/form-validation-errors.service"; +import { ThemingService } from "../platform/services/theming/theming.service"; +import { AbstractThemingService } from "../platform/services/theming/theming.service.abstraction"; import { LOCALES_DIRECTORY, @@ -188,8 +190,6 @@ import { WINDOW, } from "./injection-tokens"; import { ModalService } from "./modal.service"; -import { ThemingService } from "./theming/theming.service"; -import { AbstractThemingService } from "./theming/theming.service.abstraction"; @NgModule({ declarations: [], diff --git a/libs/angular/src/tools/export/components/export.component.ts b/libs/angular/src/tools/export/components/export.component.ts index 9d782d2822..5cd567e49f 100644 --- a/libs/angular/src/tools/export/components/export.component.ts +++ b/libs/angular/src/tools/export/components/export.component.ts @@ -6,12 +6,13 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { EncryptedExportType, EventType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { EncryptedExportType } from "@bitwarden/common/tools/enums/encrypted-export-type.enum"; import { DialogService } from "@bitwarden/components"; import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export"; diff --git a/libs/angular/src/tools/generator/components/generator.component.ts b/libs/angular/src/tools/generator/components/generator.component.ts index b0a5d13915..eb8c6e8c82 100644 --- a/libs/angular/src/tools/generator/components/generator.component.ts +++ b/libs/angular/src/tools/generator/components/generator.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/admin-console/models/domain/password-generator-policy-options"; -import { EmailForwarderOptions } from "@bitwarden/common/models/domain/email-forwarder-options"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @@ -17,6 +16,7 @@ import { UsernameGenerationServiceAbstraction, UsernameGeneratorOptions, } from "@bitwarden/common/tools/generator/username"; +import { EmailForwarderOptions } from "@bitwarden/common/tools/models/domain/email-forwarder-options"; @Directive() export class GeneratorComponent implements OnInit { diff --git a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts index 7d696e99a1..357e218615 100644 --- a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts +++ b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts @@ -2,10 +2,10 @@ import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop"; import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { EventType, FieldType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts index f99b96d1c2..c4bfb47daa 100644 --- a/libs/angular/src/vault/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -10,7 +10,7 @@ import { import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { EventType, SecureNoteType, UriMatchType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; @@ -21,8 +21,8 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { SecureNoteType, UriMatchType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/angular/src/vault/components/view-custom-fields.component.ts b/libs/angular/src/vault/components/view-custom-fields.component.ts index 5ec247a09e..c32fd798f9 100644 --- a/libs/angular/src/vault/components/view-custom-fields.component.ts +++ b/libs/angular/src/vault/components/view-custom-fields.component.ts @@ -1,7 +1,8 @@ import { Directive, Input } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { EventType, FieldType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; +import { FieldType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts index 90032617b4..831cf31cec 100644 --- a/libs/angular/src/vault/components/view.component.ts +++ b/libs/angular/src/vault/components/view.component.ts @@ -13,9 +13,8 @@ import { firstValueFrom } from "rxjs"; 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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { EventType, FieldType } from "@bitwarden/common/enums"; +import { EventType } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; @@ -27,8 +26,9 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { Launchable } from "@bitwarden/common/vault/interfaces/launchable"; import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts index f752f9a9a9..6318cfd2a2 100644 --- a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts @@ -1,6 +1,6 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts index b023944241..1836518942 100644 --- a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts @@ -1,6 +1,6 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts index 26fd477271..c45b42310c 100644 --- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { DisplayMode } from "../models/display-mode"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts index 6ff5d21330..1613912d69 100644 --- a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts index 7c37436492..3745924166 100644 --- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts @@ -2,7 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { firstValueFrom, Observable } from "rxjs"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts index 9898cf4ce3..593df96f17 100644 --- a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts +++ b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject, TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; export class DynamicTreeNode { fullList: T[]; diff --git a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts index 8930e05132..c3176d4191 100644 --- a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts +++ b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node"; export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders"; export class TopLevelTreeNode implements ITreeNodeObject { diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts index 1fab9727a5..f5a49e2561 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { VaultFilter } from "./vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts index ae4151f964..52d7707005 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherStatus } from "./cipher-status.model"; diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts index b4fb8f62e0..841198dc73 100644 --- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts +++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts @@ -8,14 +8,14 @@ import { import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { ServiceUtils } from "@bitwarden/common/vault/service-utils"; import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "../../abstractions/deprecated-vault-filter.service"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; diff --git a/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts index b526fa1fcf..413ee58732 100644 --- a/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts +++ b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts @@ -1,5 +1,5 @@ -import { KdfType } from "../../../../enums"; import { BaseResponse } from "../../../../models/response/base.response"; +import { KdfType } from "../../../../platform/enums"; import { OrganizationUserStatusType, OrganizationUserType } from "../../../enums"; import { PermissionsApi } from "../../../models/api/permissions.api"; import { SelectionReadOnlyResponse } from "../../../models/response/selection-read-only.response"; diff --git a/libs/common/src/admin-console/abstractions/provider.service.ts b/libs/common/src/admin-console/abstractions/provider.service.ts index 3c62776a90..d843154f3f 100644 --- a/libs/common/src/admin-console/abstractions/provider.service.ts +++ b/libs/common/src/admin-console/abstractions/provider.service.ts @@ -1,5 +1,5 @@ -import { Provider } from "../../models/domain/provider"; import { ProviderData } from "../models/data/provider.data"; +import { Provider } from "../models/domain/provider"; export abstract class ProviderService { get: (id: string) => Promise; diff --git a/libs/common/src/admin-console/enums/index.ts b/libs/common/src/admin-console/enums/index.ts index d624ffd885..0cbdf65805 100644 --- a/libs/common/src/admin-console/enums/index.ts +++ b/libs/common/src/admin-console/enums/index.ts @@ -3,6 +3,7 @@ export * from "./organization-connection-type.enum"; export * from "./organization-user-status-type.enum"; export * from "./organization-user-type.enum"; export * from "./policy-type.enum"; +export * from "./provider-type.enum"; export * from "./provider-user-status-type.enum"; export * from "./provider-user-type.enum"; export * from "./scim-provider-type.enum"; diff --git a/libs/common/src/enums/provider-type.enum.ts b/libs/common/src/admin-console/enums/provider-type.enum.ts similarity index 100% rename from libs/common/src/enums/provider-type.enum.ts rename to libs/common/src/admin-console/enums/provider-type.enum.ts diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts index 2eba957660..36f2c4ce66 100644 --- a/libs/common/src/admin-console/models/data/organization.data.ts +++ b/libs/common/src/admin-console/models/data/organization.data.ts @@ -1,5 +1,5 @@ -import { ProductType, ProviderType } from "../../../enums"; -import { OrganizationUserStatusType, OrganizationUserType } from "../../enums"; +import { ProductType } from "../../../enums"; +import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums"; import { PermissionsApi } from "../api/permissions.api"; import { ProfileOrganizationResponse } from "../response/profile-organization.response"; diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts index c7d8ee4924..802fe6fcf8 100644 --- a/libs/common/src/admin-console/models/domain/organization.ts +++ b/libs/common/src/admin-console/models/domain/organization.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; -import { ProductType, ProviderType } from "../../../enums"; -import { OrganizationUserStatusType, OrganizationUserType } from "../../enums"; +import { ProductType } from "../../../enums"; +import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums"; import { PermissionsApi } from "../api/permissions.api"; import { OrganizationData } from "../data/organization.data"; diff --git a/libs/common/src/models/domain/provider.ts b/libs/common/src/admin-console/models/domain/provider.ts similarity index 90% rename from libs/common/src/models/domain/provider.ts rename to libs/common/src/admin-console/models/domain/provider.ts index 3afd01649a..d6d3d3c462 100644 --- a/libs/common/src/models/domain/provider.ts +++ b/libs/common/src/admin-console/models/domain/provider.ts @@ -1,5 +1,5 @@ -import { ProviderUserStatusType, ProviderUserType } from "../../admin-console/enums"; -import { ProviderData } from "../../admin-console/models/data/provider.data"; +import { ProviderUserStatusType, ProviderUserType } from "../../enums"; +import { ProviderData } from "../data/provider.data"; export class Provider { id: string; diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts index 83187082e5..7cae701de5 100644 --- a/libs/common/src/admin-console/models/response/profile-organization.response.ts +++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts @@ -1,6 +1,6 @@ -import { ProductType, ProviderType } from "../../../enums"; +import { ProductType } from "../../../enums"; import { BaseResponse } from "../../../models/response/base.response"; -import { OrganizationUserStatusType, OrganizationUserType } from "../../enums"; +import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums"; import { PermissionsApi } from "../api/permissions.api"; export class ProfileOrganizationResponse extends BaseResponse { diff --git a/libs/common/src/admin-console/services/provider.service.ts b/libs/common/src/admin-console/services/provider.service.ts index 99a2d463d8..dce35c5789 100644 --- a/libs/common/src/admin-console/services/provider.service.ts +++ b/libs/common/src/admin-console/services/provider.service.ts @@ -1,7 +1,7 @@ -import { Provider } from "../../models/domain/provider"; import { StateService } from "../../platform/abstractions/state.service"; import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service"; import { ProviderData } from "../models/data/provider.data"; +import { Provider } from "../models/domain/provider"; export class ProviderService implements ProviderServiceAbstraction { constructor(private stateService: StateService) {} diff --git a/libs/common/src/auth/abstractions/account-api.service.ts b/libs/common/src/auth/abstractions/account-api.service.ts index 751a020b15..a897dcd5ce 100644 --- a/libs/common/src/auth/abstractions/account-api.service.ts +++ b/libs/common/src/auth/abstractions/account-api.service.ts @@ -1,4 +1,4 @@ -import { Verification } from "../../types/verification"; +import { Verification } from "../types/verification"; export abstract class AccountApiService { abstract deleteAccount(verification: Verification): Promise; diff --git a/libs/common/src/abstractions/anonymousHub.service.ts b/libs/common/src/auth/abstractions/anonymous-hub.service.ts similarity index 100% rename from libs/common/src/abstractions/anonymousHub.service.ts rename to libs/common/src/auth/abstractions/anonymous-hub.service.ts diff --git a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts index 46b8d753c9..9eb1024e73 100644 --- a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts +++ b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts @@ -1,5 +1,5 @@ -import { Verification } from "../../../types/verification"; import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; +import { Verification } from "../../types/verification"; export abstract class UserVerificationService { buildRequest: ( diff --git a/libs/common/src/auth/captcha-iframe.ts b/libs/common/src/auth/captcha-iframe.ts index 6fb0f5a43a..db97865606 100644 --- a/libs/common/src/auth/captcha-iframe.ts +++ b/libs/common/src/auth/captcha-iframe.ts @@ -1,6 +1,7 @@ -import { IFrameComponent } from "../misc/iframe_component"; import { I18nService } from "../platform/abstractions/i18n.service"; +import { IFrameComponent } from "./iframe-component"; + export class CaptchaIFrame extends IFrameComponent { constructor( win: Window, diff --git a/libs/common/src/misc/iframe_component.ts b/libs/common/src/auth/iframe-component.ts similarity index 100% rename from libs/common/src/misc/iframe_component.ts rename to libs/common/src/auth/iframe-component.ts diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts index a0f8091bca..0fe0147f24 100644 --- a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts +++ b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts @@ -2,13 +2,13 @@ import { mock, MockProxy } from "jest-mock-extended"; import { ApiService } from "../../abstractions/api.service"; import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction"; -import { HashPurpose } from "../../enums"; import { AppIdService } from "../../platform/abstractions/app-id.service"; import { CryptoService } from "../../platform/abstractions/crypto.service"; import { LogService } from "../../platform/abstractions/log.service"; import { MessagingService } from "../../platform/abstractions/messaging.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; import { StateService } from "../../platform/abstractions/state.service"; +import { HashPurpose } from "../../platform/enums"; import { Utils } from "../../platform/misc/utils"; import { MasterKey, diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.ts b/libs/common/src/auth/login-strategies/password-login.strategy.ts index 6475bbe5a7..d05f5451e7 100644 --- a/libs/common/src/auth/login-strategies/password-login.strategy.ts +++ b/libs/common/src/auth/login-strategies/password-login.strategy.ts @@ -1,13 +1,13 @@ import { ApiService } from "../../abstractions/api.service"; import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "../../admin-console/models/domain/master-password-policy-options"; -import { HashPurpose } from "../../enums"; import { AppIdService } from "../../platform/abstractions/app-id.service"; import { CryptoService } from "../../platform/abstractions/crypto.service"; import { LogService } from "../../platform/abstractions/log.service"; import { MessagingService } from "../../platform/abstractions/messaging.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; import { StateService } from "../../platform/abstractions/state.service"; +import { HashPurpose } from "../../platform/enums"; import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key"; import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength"; import { AuthService } from "../abstractions/auth.service"; diff --git a/libs/common/src/auth/models/request/set-key-connector-key.request.ts b/libs/common/src/auth/models/request/set-key-connector-key.request.ts index 5215288dc3..4ff19dc2c1 100644 --- a/libs/common/src/auth/models/request/set-key-connector-key.request.ts +++ b/libs/common/src/auth/models/request/set-key-connector-key.request.ts @@ -1,5 +1,5 @@ -import { KdfType } from "../../../enums"; import { KeysRequest } from "../../../models/request/keys.request"; +import { KdfType } from "../../../platform/enums"; import { KdfConfig } from "../domain/kdf-config"; export class SetKeyConnectorKeyRequest { diff --git a/libs/common/src/auth/models/request/set-password.request.ts b/libs/common/src/auth/models/request/set-password.request.ts index 30fa05662f..74a36938d0 100644 --- a/libs/common/src/auth/models/request/set-password.request.ts +++ b/libs/common/src/auth/models/request/set-password.request.ts @@ -1,5 +1,5 @@ -import { KdfType } from "../../../enums"; import { KeysRequest } from "../../../models/request/keys.request"; +import { KdfType } from "../../../platform/enums"; export class SetPasswordRequest { masterPasswordHash: string; diff --git a/libs/common/src/auth/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts index d080341ed4..b0132f5747 100644 --- a/libs/common/src/auth/models/response/identity-token.response.ts +++ b/libs/common/src/auth/models/response/identity-token.response.ts @@ -1,5 +1,5 @@ -import { KdfType } from "../../../enums"; import { BaseResponse } from "../../../models/response/base.response"; +import { KdfType } from "../../../platform/enums"; import { MasterPasswordPolicyResponse } from "./master-password-policy.response"; import { UserDecryptionOptionsResponse } from "./user-decryption-options/user-decryption-options.response"; diff --git a/libs/common/src/auth/models/response/prelogin.response.ts b/libs/common/src/auth/models/response/prelogin.response.ts index 83262f904b..c6762e2237 100644 --- a/libs/common/src/auth/models/response/prelogin.response.ts +++ b/libs/common/src/auth/models/response/prelogin.response.ts @@ -1,5 +1,5 @@ -import { KdfType } from "../../../enums"; import { BaseResponse } from "../../../models/response/base.response"; +import { KdfType } from "../../../platform/enums"; export class PreloginResponse extends BaseResponse { kdf: KdfType; diff --git a/libs/common/src/auth/services/account-api.service.ts b/libs/common/src/auth/services/account-api.service.ts index 270ec1a201..8db1a18f8e 100644 --- a/libs/common/src/auth/services/account-api.service.ts +++ b/libs/common/src/auth/services/account-api.service.ts @@ -1,9 +1,9 @@ import { ApiService } from "../../abstractions/api.service"; import { LogService } from "../../platform/abstractions/log.service"; -import { Verification } from "../../types/verification"; import { AccountApiService } from "../abstractions/account-api.service"; import { InternalAccountService } from "../abstractions/account.service"; import { UserVerificationService } from "../abstractions/user-verification/user-verification.service.abstraction"; +import { Verification } from "../types/verification"; export class AccountApiServiceImplementation implements AccountApiService { constructor( diff --git a/libs/common/src/services/anonymousHub.service.ts b/libs/common/src/auth/services/anonymous-hub.service.ts similarity index 83% rename from libs/common/src/services/anonymousHub.service.ts rename to libs/common/src/auth/services/anonymous-hub.service.ts index 31b394ae58..4cb4aafcca 100644 --- a/libs/common/src/services/anonymousHub.service.ts +++ b/libs/common/src/auth/services/anonymous-hub.service.ts @@ -6,15 +6,14 @@ import { } from "@microsoft/signalr"; import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack"; -import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymousHub.service"; -import { AuthService } from "../auth/abstractions/auth.service"; -import { EnvironmentService } from "../platform/abstractions/environment.service"; -import { LogService } from "../platform/abstractions/log.service"; - import { AuthRequestPushNotification, NotificationResponse, -} from "./../models/response/notification.response"; +} from "../../models/response/notification.response"; +import { EnvironmentService } from "../../platform/abstractions/environment.service"; +import { LogService } from "../../platform/abstractions/log.service"; +import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymous-hub.service"; +import { AuthService } from "../abstractions/auth.service"; export class AnonymousHubService implements AnonymousHubServiceAbstraction { private anonHubConnection: HubConnection; diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts index 1c5f066d3a..c4474a534d 100644 --- a/libs/common/src/auth/services/auth.service.ts +++ b/libs/common/src/auth/services/auth.service.ts @@ -2,7 +2,6 @@ import { Observable, Subject } from "rxjs"; import { ApiService } from "../../abstractions/api.service"; import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction"; -import { KdfType, KeySuffixOptions } from "../../enums"; import { PreloginRequest } from "../../models/request/prelogin.request"; import { ErrorResponse } from "../../models/response/error.response"; import { AuthRequestPushNotification } from "../../models/response/notification.response"; @@ -15,6 +14,7 @@ import { LogService } from "../../platform/abstractions/log.service"; import { MessagingService } from "../../platform/abstractions/messaging.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; import { StateService } from "../../platform/abstractions/state.service"; +import { KdfType, KeySuffixOptions } from "../../platform/enums"; import { Utils } from "../../platform/misc/utils"; import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key"; import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength"; diff --git a/libs/common/src/auth/services/device-trust-crypto.service.spec.ts b/libs/common/src/auth/services/device-trust-crypto.service.spec.ts index 66a14ac87c..c7e8b3865a 100644 --- a/libs/common/src/auth/services/device-trust-crypto.service.spec.ts +++ b/libs/common/src/auth/services/device-trust-crypto.service.spec.ts @@ -1,7 +1,6 @@ import { matches, mock } from "jest-mock-extended"; import { DeviceType } from "../../enums"; -import { EncryptionType } from "../../enums/encryption-type.enum"; import { AppIdService } from "../../platform/abstractions/app-id.service"; import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service"; import { CryptoService } from "../../platform/abstractions/crypto.service"; @@ -9,6 +8,7 @@ import { EncryptService } from "../../platform/abstractions/encrypt.service"; import { I18nService } from "../../platform/abstractions/i18n.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; import { StateService } from "../../platform/abstractions/state.service"; +import { EncryptionType } from "../../platform/enums/encryption-type.enum"; import { EncString } from "../../platform/models/domain/enc-string"; import { SymmetricCryptoKey, diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts index 5e20eb7645..75bd88a2d0 100644 --- a/libs/common/src/auth/services/user-verification/user-verification.service.ts +++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts @@ -1,12 +1,12 @@ import { CryptoService } from "../../../platform/abstractions/crypto.service"; import { I18nService } from "../../../platform/abstractions/i18n.service"; import { StateService } from "../../../platform/abstractions/state.service"; -import { Verification } from "../../../types/verification"; import { UserVerificationApiServiceAbstraction } from "../../abstractions/user-verification/user-verification-api.service.abstraction"; import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/user-verification/user-verification.service.abstraction"; import { VerificationType } from "../../enums/verification-type"; import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; import { VerifyOTPRequest } from "../../models/request/verify-otp.request"; +import { Verification } from "../../types/verification"; /** * Used for general-purpose user verification throughout the app. diff --git a/libs/common/src/types/verification.ts b/libs/common/src/auth/types/verification.ts similarity index 53% rename from libs/common/src/types/verification.ts rename to libs/common/src/auth/types/verification.ts index b3e229cbd6..5a3ec9a6c7 100644 --- a/libs/common/src/types/verification.ts +++ b/libs/common/src/auth/types/verification.ts @@ -1,4 +1,4 @@ -import { VerificationType } from "../auth/enums/verification-type"; +import { VerificationType } from "../enums/verification-type"; export type Verification = { type: VerificationType; diff --git a/libs/common/src/enums/index.ts b/libs/common/src/enums/index.ts index b62b3ecfa8..378af213e6 100644 --- a/libs/common/src/enums/index.ts +++ b/libs/common/src/enums/index.ts @@ -1,23 +1,8 @@ export * from "./client-type.enum"; export * from "./device-type.enum"; -export * from "./encrypted-export-type.enum"; -export * from "./encryption-type.enum"; export * from "./event-system-user.enum"; export * from "./event-type.enum"; -export * from "./field-type.enum"; -export * from "./file-upload-type.enum"; -export * from "./hash-purpose.enum"; -export * from "./html-storage-location.enum"; export * from "./http-status-code.enum"; -export * from "./kdf-type.enum"; -export * from "./key-suffix-options.enum"; -export * from "./linked-id-type.enum"; -export * from "./log-level-type.enum"; export * from "./native-messaging-version.enum"; export * from "./notification-type.enum"; export * from "./product-type.enum"; -export * from "./provider-type.enum"; -export * from "./secure-note-type.enum"; -export * from "./storage-location.enum"; -export * from "./theme-type.enum"; -export * from "./uri-match-type.enum"; diff --git a/libs/common/src/models/export/field.export.ts b/libs/common/src/models/export/field.export.ts index b30ce64eeb..098249312c 100644 --- a/libs/common/src/models/export/field.export.ts +++ b/libs/common/src/models/export/field.export.ts @@ -1,5 +1,5 @@ -import { FieldType, LinkedIdType } from "../../enums"; import { EncString } from "../../platform/models/domain/enc-string"; +import { FieldType, LinkedIdType } from "../../vault/enums"; import { Field as FieldDomain } from "../../vault/models/domain/field"; import { FieldView } from "../../vault/models/view/field.view"; diff --git a/libs/common/src/models/export/login-uri.export.ts b/libs/common/src/models/export/login-uri.export.ts index af9c362e44..9c8a96e99d 100644 --- a/libs/common/src/models/export/login-uri.export.ts +++ b/libs/common/src/models/export/login-uri.export.ts @@ -1,5 +1,5 @@ -import { UriMatchType } from "../../enums"; import { EncString } from "../../platform/models/domain/enc-string"; +import { UriMatchType } from "../../vault/enums"; import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri"; import { LoginUriView } from "../../vault/models/view/login-uri.view"; diff --git a/libs/common/src/models/export/secure-note.export.ts b/libs/common/src/models/export/secure-note.export.ts index 4cef8f88a0..a9a0f78182 100644 --- a/libs/common/src/models/export/secure-note.export.ts +++ b/libs/common/src/models/export/secure-note.export.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "../../enums"; +import { SecureNoteType } from "../../vault/enums"; import { SecureNote as SecureNoteDomain } from "../../vault/models/domain/secure-note"; import { SecureNoteView } from "../../vault/models/view/secure-note.view"; diff --git a/libs/common/src/models/request/kdf.request.ts b/libs/common/src/models/request/kdf.request.ts index 0ae4ac8f00..8f27b0ec10 100644 --- a/libs/common/src/models/request/kdf.request.ts +++ b/libs/common/src/models/request/kdf.request.ts @@ -1,5 +1,5 @@ import { PasswordRequest } from "../../auth/models/request/password.request"; -import { KdfType } from "../../enums"; +import { KdfType } from "../../platform/enums"; export class KdfRequest extends PasswordRequest { kdf: KdfType; diff --git a/libs/common/src/models/request/register.request.ts b/libs/common/src/models/request/register.request.ts index 30f0518093..a29b5f84d4 100644 --- a/libs/common/src/models/request/register.request.ts +++ b/libs/common/src/models/request/register.request.ts @@ -1,5 +1,5 @@ import { CaptchaProtectedRequest } from "../../auth/models/request/captcha-protected.request"; -import { KdfType } from "../../enums"; +import { KdfType } from "../../platform/enums"; import { KeysRequest } from "./keys.request"; import { ReferenceEventRequest } from "./reference-event.request"; diff --git a/libs/common/src/platform/abstractions/crypto.service.ts b/libs/common/src/platform/abstractions/crypto.service.ts index 8f1d9c4866..84b4d2f13e 100644 --- a/libs/common/src/platform/abstractions/crypto.service.ts +++ b/libs/common/src/platform/abstractions/crypto.service.ts @@ -2,7 +2,7 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response"; import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response"; import { KdfConfig } from "../../auth/models/domain/kdf-config"; -import { KeySuffixOptions, KdfType, HashPurpose } from "../../enums"; +import { KeySuffixOptions, KdfType, HashPurpose } from "../enums"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; import { diff --git a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts index 29fde21645..eff5a018a2 100644 --- a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts +++ b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts @@ -1,4 +1,4 @@ -import { FileUploadType } from "../../../enums"; +import { FileUploadType } from "../../enums"; import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; import { EncString } from "../../models/domain/enc-string"; diff --git a/libs/common/src/platform/abstractions/log.service.ts b/libs/common/src/platform/abstractions/log.service.ts index e825806017..17db597687 100644 --- a/libs/common/src/platform/abstractions/log.service.ts +++ b/libs/common/src/platform/abstractions/log.service.ts @@ -1,4 +1,4 @@ -import { LogLevelType } from "../../enums"; +import { LogLevelType } from "../enums/log-level-type.enum"; export abstract class LogService { debug: (message: string) => void; diff --git a/libs/common/src/platform/abstractions/state.service.ts b/libs/common/src/platform/abstractions/state.service.ts index f4f86cb859..61e361ad6d 100644 --- a/libs/common/src/platform/abstractions/state.service.ts +++ b/libs/common/src/platform/abstractions/state.service.ts @@ -10,7 +10,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls"; import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason"; import { KdfConfig } from "../../auth/models/domain/kdf-config"; import { BiometricKey } from "../../auth/types/biometric-key"; -import { KdfType, ThemeType, UriMatchType } from "../../enums"; import { EventData } from "../../models/data/event.data"; import { WindowState } from "../../models/domain/window-state"; import { GeneratorOptions } from "../../tools/generator/generator-options"; @@ -18,6 +17,7 @@ import { GeneratedPasswordHistory, PasswordGeneratorOptions } from "../../tools/ import { UsernameGeneratorOptions } from "../../tools/generator/username"; import { SendData } from "../../tools/send/models/data/send.data"; import { SendView } from "../../tools/send/models/view/send.view"; +import { UriMatchType } from "../../vault/enums"; import { CipherData } from "../../vault/models/data/cipher.data"; import { CollectionData } from "../../vault/models/data/collection.data"; import { FolderData } from "../../vault/models/data/folder.data"; @@ -25,6 +25,7 @@ import { LocalData } from "../../vault/models/data/local.data"; import { CipherView } from "../../vault/models/view/cipher.view"; import { CollectionView } from "../../vault/models/view/collection.view"; import { AddEditCipherInfo } from "../../vault/types/add-edit-cipher-info"; +import { KdfType, ThemeType } from "../enums"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, diff --git a/libs/common/src/enums/encryption-type.enum.ts b/libs/common/src/platform/enums/encryption-type.enum.ts similarity index 100% rename from libs/common/src/enums/encryption-type.enum.ts rename to libs/common/src/platform/enums/encryption-type.enum.ts diff --git a/libs/common/src/enums/file-upload-type.enum.ts b/libs/common/src/platform/enums/file-upload-type.enum.ts similarity index 100% rename from libs/common/src/enums/file-upload-type.enum.ts rename to libs/common/src/platform/enums/file-upload-type.enum.ts diff --git a/libs/common/src/enums/hash-purpose.enum.ts b/libs/common/src/platform/enums/hash-purpose.enum.ts similarity index 100% rename from libs/common/src/enums/hash-purpose.enum.ts rename to libs/common/src/platform/enums/hash-purpose.enum.ts diff --git a/libs/common/src/enums/html-storage-location.enum.ts b/libs/common/src/platform/enums/html-storage-location.enum.ts similarity index 100% rename from libs/common/src/enums/html-storage-location.enum.ts rename to libs/common/src/platform/enums/html-storage-location.enum.ts diff --git a/libs/common/src/platform/enums/index.ts b/libs/common/src/platform/enums/index.ts new file mode 100644 index 0000000000..bac3f4ec41 --- /dev/null +++ b/libs/common/src/platform/enums/index.ts @@ -0,0 +1,9 @@ +export * from "./encryption-type.enum"; +export * from "./file-upload-type.enum"; +export * from "./hash-purpose.enum"; +export * from "./html-storage-location.enum"; +export * from "./kdf-type.enum"; +export * from "./key-suffix-options.enum"; +export * from "./log-level-type.enum"; +export * from "./storage-location.enum"; +export * from "./theme-type.enum"; diff --git a/libs/common/src/enums/kdf-type.enum.ts b/libs/common/src/platform/enums/kdf-type.enum.ts similarity index 78% rename from libs/common/src/enums/kdf-type.enum.ts rename to libs/common/src/platform/enums/kdf-type.enum.ts index eb8702437c..13f671dfda 100644 --- a/libs/common/src/enums/kdf-type.enum.ts +++ b/libs/common/src/platform/enums/kdf-type.enum.ts @@ -1,4 +1,4 @@ -import { KdfConfig } from "../auth/models/domain/kdf-config"; +import { KdfConfig } from "../../auth/models/domain/kdf-config"; export enum KdfType { PBKDF2_SHA256 = 0, @@ -12,4 +12,3 @@ export const DEFAULT_ARGON2_ITERATIONS = 3; export const DEFAULT_KDF_TYPE = KdfType.PBKDF2_SHA256; export const DEFAULT_PBKDF2_ITERATIONS = 600000; export const DEFAULT_KDF_CONFIG = new KdfConfig(DEFAULT_PBKDF2_ITERATIONS); -export const SEND_KDF_ITERATIONS = 100000; diff --git a/libs/common/src/enums/key-suffix-options.enum.ts b/libs/common/src/platform/enums/key-suffix-options.enum.ts similarity index 100% rename from libs/common/src/enums/key-suffix-options.enum.ts rename to libs/common/src/platform/enums/key-suffix-options.enum.ts diff --git a/libs/common/src/enums/log-level-type.enum.ts b/libs/common/src/platform/enums/log-level-type.enum.ts similarity index 100% rename from libs/common/src/enums/log-level-type.enum.ts rename to libs/common/src/platform/enums/log-level-type.enum.ts diff --git a/libs/common/src/enums/storage-location.enum.ts b/libs/common/src/platform/enums/storage-location.enum.ts similarity index 100% rename from libs/common/src/enums/storage-location.enum.ts rename to libs/common/src/platform/enums/storage-location.enum.ts diff --git a/libs/common/src/enums/theme-type.enum.ts b/libs/common/src/platform/enums/theme-type.enum.ts similarity index 100% rename from libs/common/src/enums/theme-type.enum.ts rename to libs/common/src/platform/enums/theme-type.enum.ts diff --git a/libs/common/src/platform/interfaces/encrypted.ts b/libs/common/src/platform/interfaces/encrypted.ts index 26a49a32ec..6f9d3a191d 100644 --- a/libs/common/src/platform/interfaces/encrypted.ts +++ b/libs/common/src/platform/interfaces/encrypted.ts @@ -1,4 +1,4 @@ -import { EncryptionType } from "../../enums"; +import { EncryptionType } from "../enums"; export interface Encrypted { encryptionType?: EncryptionType; diff --git a/libs/common/src/platform/models/domain/account.ts b/libs/common/src/platform/models/domain/account.ts index 359e765f79..d3964bd116 100644 --- a/libs/common/src/platform/models/domain/account.ts +++ b/libs/common/src/platform/models/domain/account.ts @@ -11,7 +11,6 @@ import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-pa import { KeyConnectorUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/key-connector-user-decryption-option"; import { TrustedDeviceUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/trusted-device-user-decryption-option"; import { IdentityTokenResponse } from "../../../auth/models/response/identity-token.response"; -import { KdfType, UriMatchType } from "../../../enums"; import { EventData } from "../../../models/data/event.data"; import { GeneratorOptions } from "../../../tools/generator/generator-options"; import { @@ -22,11 +21,13 @@ import { UsernameGeneratorOptions } from "../../../tools/generator/username/user import { SendData } from "../../../tools/send/models/data/send.data"; import { SendView } from "../../../tools/send/models/view/send.view"; import { DeepJsonify } from "../../../types/deep-jsonify"; +import { UriMatchType } from "../../../vault/enums"; import { CipherData } from "../../../vault/models/data/cipher.data"; import { CollectionData } from "../../../vault/models/data/collection.data"; import { FolderData } from "../../../vault/models/data/folder.data"; import { CipherView } from "../../../vault/models/view/cipher.view"; import { CollectionView } from "../../../vault/models/view/collection.view"; +import { KdfType } from "../../enums"; import { Utils } from "../../misc/utils"; import { ServerConfigData } from "../../models/data/server-config.data"; diff --git a/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts b/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts index 4e0464fd62..45a45ffe08 100644 --- a/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts +++ b/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts @@ -1,5 +1,5 @@ import { makeStaticByteArray } from "../../../../spec"; -import { EncryptionType } from "../../../enums"; +import { EncryptionType } from "../../enums"; import { EncArrayBuffer } from "./enc-array-buffer"; diff --git a/libs/common/src/platform/models/domain/enc-array-buffer.ts b/libs/common/src/platform/models/domain/enc-array-buffer.ts index afe9bad57f..9b7f7cd036 100644 --- a/libs/common/src/platform/models/domain/enc-array-buffer.ts +++ b/libs/common/src/platform/models/domain/enc-array-buffer.ts @@ -1,5 +1,5 @@ -import { EncryptionType } from "../../../enums"; import { Utils } from "../../../platform/misc/utils"; +import { EncryptionType } from "../../enums"; import { Encrypted } from "../../interfaces/encrypted"; const ENC_TYPE_LENGTH = 1; diff --git a/libs/common/src/platform/models/domain/enc-string.spec.ts b/libs/common/src/platform/models/domain/enc-string.spec.ts index a2b8be6d55..3f2c508ce8 100644 --- a/libs/common/src/platform/models/domain/enc-string.spec.ts +++ b/libs/common/src/platform/models/domain/enc-string.spec.ts @@ -1,7 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; import { makeStaticByteArray } from "../../../../spec"; -import { EncryptionType } from "../../../enums"; import { EncryptService } from "../../../platform/abstractions/encrypt.service"; import { OrgKey, @@ -9,6 +8,7 @@ import { UserKey, } from "../../../platform/models/domain/symmetric-crypto-key"; import { CryptoService } from "../../abstractions/crypto.service"; +import { EncryptionType } from "../../enums"; import { ContainerService } from "../../services/container.service"; import { EncString } from "./enc-string"; diff --git a/libs/common/src/platform/models/domain/enc-string.ts b/libs/common/src/platform/models/domain/enc-string.ts index 60b59fa4d8..75206d640d 100644 --- a/libs/common/src/platform/models/domain/enc-string.ts +++ b/libs/common/src/platform/models/domain/enc-string.ts @@ -1,8 +1,8 @@ import { Jsonify, Opaque } from "type-fest"; -import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../../enums"; -import { Utils } from "../../../platform/misc/utils"; +import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../enums"; import { Encrypted } from "../../interfaces/encrypted"; +import { Utils } from "../../misc/utils"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/platform/models/domain/global-state.ts b/libs/common/src/platform/models/domain/global-state.ts index ab52115a7e..c5bba532cc 100644 --- a/libs/common/src/platform/models/domain/global-state.ts +++ b/libs/common/src/platform/models/domain/global-state.ts @@ -1,6 +1,6 @@ import { EnvironmentUrls } from "../../../auth/models/domain/environment-urls"; -import { ThemeType } from "../../../enums"; import { WindowState } from "../../../models/domain/window-state"; +import { ThemeType } from "../../enums"; export class GlobalState { enableAlwaysOnTop?: boolean; diff --git a/libs/common/src/platform/models/domain/storage-options.ts b/libs/common/src/platform/models/domain/storage-options.ts index 767c4ba237..6ed430ac50 100644 --- a/libs/common/src/platform/models/domain/storage-options.ts +++ b/libs/common/src/platform/models/domain/storage-options.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { HtmlStorageLocation, StorageLocation } from "../../../enums"; +import { HtmlStorageLocation, StorageLocation } from "../../enums"; export type StorageOptions = { storageLocation?: StorageLocation; diff --git a/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts b/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts index 13d5835c91..f39b298a27 100644 --- a/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts +++ b/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts @@ -1,5 +1,5 @@ import { makeStaticByteArray } from "../../../../spec"; -import { EncryptionType } from "../../../enums"; +import { EncryptionType } from "../../enums"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts index ea5e4e8aa1..8ac3b0d711 100644 --- a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts +++ b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts @@ -1,7 +1,7 @@ import { Jsonify, Opaque } from "type-fest"; -import { EncryptionType } from "../../../enums"; import { Utils } from "../../../platform/misc/utils"; +import { EncryptionType } from "../../enums"; export class SymmetricCryptoKey { key: Uint8Array; diff --git a/libs/common/src/platform/services/app-id.service.ts b/libs/common/src/platform/services/app-id.service.ts index 0ce1286e4d..fa3d943ede 100644 --- a/libs/common/src/platform/services/app-id.service.ts +++ b/libs/common/src/platform/services/app-id.service.ts @@ -1,6 +1,6 @@ -import { HtmlStorageLocation } from "../../enums"; import { AppIdService as AppIdServiceAbstraction } from "../abstractions/app-id.service"; import { AbstractStorageService } from "../abstractions/storage.service"; +import { HtmlStorageLocation } from "../enums"; import { Utils } from "../misc/utils"; export class AppIdService implements AppIdServiceAbstraction { diff --git a/libs/common/src/platform/services/console-log.service.ts b/libs/common/src/platform/services/console-log.service.ts index 966d848f76..531cccb4ce 100644 --- a/libs/common/src/platform/services/console-log.service.ts +++ b/libs/common/src/platform/services/console-log.service.ts @@ -1,5 +1,5 @@ -import { LogLevelType } from "../../enums"; import { LogService as LogServiceAbstraction } from "../abstractions/log.service"; +import { LogLevelType } from "../enums/log-level-type.enum"; export class ConsoleLogService implements LogServiceAbstraction { protected timersMap: Map = new Map(); diff --git a/libs/common/src/platform/services/crypto.service.ts b/libs/common/src/platform/services/crypto.service.ts index 0ea9acc53d..17297b2636 100644 --- a/libs/common/src/platform/services/crypto.service.ts +++ b/libs/common/src/platform/services/crypto.service.ts @@ -6,6 +6,13 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response"; import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response"; import { KdfConfig } from "../../auth/models/domain/kdf-config"; +import { Utils } from "../../platform/misc/utils"; +import { CryptoFunctionService } from "../abstractions/crypto-function.service"; +import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service"; +import { EncryptService } from "../abstractions/encrypt.service"; +import { LogService } from "../abstractions/log.service"; +import { PlatformUtilsService } from "../abstractions/platform-utils.service"; +import { StateService } from "../abstractions/state.service"; import { KeySuffixOptions, HashPurpose, @@ -14,14 +21,7 @@ import { DEFAULT_ARGON2_MEMORY, DEFAULT_ARGON2_PARALLELISM, EncryptionType, -} from "../../enums"; -import { Utils } from "../../platform/misc/utils"; -import { CryptoFunctionService } from "../abstractions/crypto-function.service"; -import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service"; -import { EncryptService } from "../abstractions/encrypt.service"; -import { LogService } from "../abstractions/log.service"; -import { PlatformUtilsService } from "../abstractions/platform-utils.service"; -import { StateService } from "../abstractions/state.service"; +} from "../enums"; import { sequentialize } from "../misc/sequentialize"; import { EFFLongWordList } from "../misc/wordlist"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; diff --git a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts index 2df24bb33f..87943a3203 100644 --- a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts +++ b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts @@ -1,8 +1,8 @@ -import { EncryptionType } from "../../../enums"; import { Utils } from "../../../platform/misc/utils"; import { CryptoFunctionService } from "../../abstractions/crypto-function.service"; import { EncryptService } from "../../abstractions/encrypt.service"; import { LogService } from "../../abstractions/log.service"; +import { EncryptionType } from "../../enums"; import { Decryptable } from "../../interfaces/decryptable.interface"; import { Encrypted } from "../../interfaces/encrypted"; import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface"; diff --git a/libs/common/src/platform/services/encrypt.service.spec.ts b/libs/common/src/platform/services/encrypt.service.spec.ts index aa3039a470..a2225c0c3f 100644 --- a/libs/common/src/platform/services/encrypt.service.spec.ts +++ b/libs/common/src/platform/services/encrypt.service.spec.ts @@ -1,10 +1,10 @@ import { mockReset, mock } from "jest-mock-extended"; import { makeStaticByteArray } from "../../../spec"; -import { EncryptionType } from "../../enums"; import { CsprngArray } from "../../types/csprng"; import { CryptoFunctionService } from "../abstractions/crypto-function.service"; import { LogService } from "../abstractions/log.service"; +import { EncryptionType } from "../enums"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; diff --git a/libs/common/src/platform/services/file-upload/file-upload.service.ts b/libs/common/src/platform/services/file-upload/file-upload.service.ts index 750259da98..03efb89ee8 100644 --- a/libs/common/src/platform/services/file-upload/file-upload.service.ts +++ b/libs/common/src/platform/services/file-upload/file-upload.service.ts @@ -1,9 +1,9 @@ -import { FileUploadType } from "../../../enums"; import { FileUploadApiMethods, FileUploadService as FileUploadServiceAbstraction, } from "../../abstractions/file-upload/file-upload.service"; import { LogService } from "../../abstractions/log.service"; +import { FileUploadType } from "../../enums"; import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; import { EncString } from "../../models/domain/enc-string"; diff --git a/libs/common/src/platform/services/state.service.ts b/libs/common/src/platform/services/state.service.ts index fda79c5524..7baaabec5f 100644 --- a/libs/common/src/platform/services/state.service.ts +++ b/libs/common/src/platform/services/state.service.ts @@ -14,13 +14,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls"; import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason"; import { KdfConfig } from "../../auth/models/domain/kdf-config"; import { BiometricKey } from "../../auth/types/biometric-key"; -import { - HtmlStorageLocation, - KdfType, - StorageLocation, - ThemeType, - UriMatchType, -} from "../../enums"; import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum"; import { EventData } from "../../models/data/event.data"; import { WindowState } from "../../models/domain/window-state"; @@ -31,6 +24,7 @@ import { UsernameGeneratorOptions } from "../../tools/generator/username"; import { SendData } from "../../tools/send/models/data/send.data"; import { SendView } from "../../tools/send/models/view/send.view"; import { UserId } from "../../types/guid"; +import { UriMatchType } from "../../vault/enums"; import { CipherData } from "../../vault/models/data/cipher.data"; import { CollectionData } from "../../vault/models/data/collection.data"; import { FolderData } from "../../vault/models/data/folder.data"; @@ -44,6 +38,7 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "../abstractions/storage.service"; +import { HtmlStorageLocation, KdfType, StorageLocation, ThemeType } from "../enums"; import { StateFactory } from "../factories/state-factory"; import { Utils } from "../misc/utils"; import { ServerConfigData } from "../models/data/server-config.data"; diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts index c1d9dc7fb7..d40988878f 100644 --- a/libs/common/src/services/search.service.ts +++ b/libs/common/src/services/search.service.ts @@ -1,10 +1,10 @@ import * as lunr from "lunr"; import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service"; -import { FieldType, UriMatchType } from "../enums"; import { I18nService } from "../platform/abstractions/i18n.service"; import { LogService } from "../platform/abstractions/log.service"; import { SendView } from "../tools/send/models/view/send.view"; +import { FieldType, UriMatchType } from "../vault/enums"; import { CipherType } from "../vault/enums/cipher-type"; import { CipherView } from "../vault/models/view/cipher.view"; diff --git a/libs/common/src/enums/encrypted-export-type.enum.ts b/libs/common/src/tools/enums/encrypted-export-type.enum.ts similarity index 100% rename from libs/common/src/enums/encrypted-export-type.enum.ts rename to libs/common/src/tools/enums/encrypted-export-type.enum.ts diff --git a/libs/common/src/models/domain/email-forwarder-options.ts b/libs/common/src/tools/models/domain/email-forwarder-options.ts similarity index 100% rename from libs/common/src/models/domain/email-forwarder-options.ts rename to libs/common/src/tools/models/domain/email-forwarder-options.ts diff --git a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts index 1098fb2f69..3ed5e36885 100644 --- a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts +++ b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts @@ -1,5 +1,5 @@ -import { FileUploadType } from "../../../../enums"; import { BaseResponse } from "../../../../models/response/base.response"; +import { FileUploadType } from "../../../../platform/enums"; import { SendResponse } from "./send.response"; diff --git a/libs/common/src/tools/send/send-kdf.ts b/libs/common/src/tools/send/send-kdf.ts new file mode 100644 index 0000000000..48264fd7e5 --- /dev/null +++ b/libs/common/src/tools/send/send-kdf.ts @@ -0,0 +1 @@ +export const SEND_KDF_ITERATIONS = 100000; diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts index fc1985067f..45a3ab8373 100644 --- a/libs/common/src/tools/send/services/send.service.ts +++ b/libs/common/src/tools/send/services/send.service.ts @@ -1,6 +1,5 @@ import { BehaviorSubject, concatMap } from "rxjs"; -import { SEND_KDF_ITERATIONS } from "../../../enums"; import { CryptoFunctionService } from "../../../platform/abstractions/crypto-function.service"; import { CryptoService } from "../../../platform/abstractions/crypto.service"; import { I18nService } from "../../../platform/abstractions/i18n.service"; @@ -15,6 +14,7 @@ import { Send } from "../models/domain/send"; import { SendFile } from "../models/domain/send-file"; import { SendText } from "../models/domain/send-text"; import { SendView } from "../models/view/send.view"; +import { SEND_KDF_ITERATIONS } from "../send-kdf"; import { InternalSendService as InternalSendServiceAbstraction } from "./send.service.abstraction"; diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts index 404a58abb1..1dcec9dc9a 100644 --- a/libs/common/src/vault/abstractions/cipher.service.ts +++ b/libs/common/src/vault/abstractions/cipher.service.ts @@ -1,5 +1,5 @@ -import { UriMatchType } from "../../enums"; import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key"; +import { UriMatchType } from "../enums"; import { CipherType } from "../enums/cipher-type"; import { CipherData } from "../models/data/cipher.data"; import { Cipher } from "../models/domain/cipher"; diff --git a/libs/common/src/vault/abstractions/collection.service.ts b/libs/common/src/vault/abstractions/collection.service.ts index 18708406ab..316794a556 100644 --- a/libs/common/src/vault/abstractions/collection.service.ts +++ b/libs/common/src/vault/abstractions/collection.service.ts @@ -1,6 +1,6 @@ -import { TreeNode } from "../../models/domain/tree-node"; import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; +import { TreeNode } from "../models/domain/tree-node"; import { CollectionView } from "../models/view/collection.view"; export abstract class CollectionService { diff --git a/libs/common/src/abstractions/totp.service.ts b/libs/common/src/vault/abstractions/totp.service.ts similarity index 100% rename from libs/common/src/abstractions/totp.service.ts rename to libs/common/src/vault/abstractions/totp.service.ts diff --git a/libs/common/src/enums/field-type.enum.ts b/libs/common/src/vault/enums/field-type.enum.ts similarity index 100% rename from libs/common/src/enums/field-type.enum.ts rename to libs/common/src/vault/enums/field-type.enum.ts diff --git a/libs/common/src/vault/enums/index.ts b/libs/common/src/vault/enums/index.ts new file mode 100644 index 0000000000..e7715f6c04 --- /dev/null +++ b/libs/common/src/vault/enums/index.ts @@ -0,0 +1,6 @@ +export * from "./cipher-reprompt-type"; +export * from "./cipher-type"; +export * from "./field-type.enum"; +export * from "./linked-id-type.enum"; +export * from "./secure-note-type.enum"; +export * from "./uri-match-type.enum"; diff --git a/libs/common/src/enums/linked-id-type.enum.ts b/libs/common/src/vault/enums/linked-id-type.enum.ts similarity index 100% rename from libs/common/src/enums/linked-id-type.enum.ts rename to libs/common/src/vault/enums/linked-id-type.enum.ts diff --git a/libs/common/src/enums/secure-note-type.enum.ts b/libs/common/src/vault/enums/secure-note-type.enum.ts similarity index 100% rename from libs/common/src/enums/secure-note-type.enum.ts rename to libs/common/src/vault/enums/secure-note-type.enum.ts diff --git a/libs/common/src/enums/uri-match-type.enum.ts b/libs/common/src/vault/enums/uri-match-type.enum.ts similarity index 100% rename from libs/common/src/enums/uri-match-type.enum.ts rename to libs/common/src/vault/enums/uri-match-type.enum.ts diff --git a/libs/common/src/misc/linkedFieldOption.decorator.ts b/libs/common/src/vault/linked-field-option.decorator.ts similarity index 90% rename from libs/common/src/misc/linkedFieldOption.decorator.ts rename to libs/common/src/vault/linked-field-option.decorator.ts index 061aebedfd..86a4b6f274 100644 --- a/libs/common/src/misc/linkedFieldOption.decorator.ts +++ b/libs/common/src/vault/linked-field-option.decorator.ts @@ -1,5 +1,5 @@ -import { LinkedIdType } from "../enums"; -import { ItemView } from "../vault/models/view/item.view"; +import { LinkedIdType } from "./enums"; +import { ItemView } from "./models/view/item.view"; export class LinkedMetadata { constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {} diff --git a/libs/common/src/models/api/card.api.ts b/libs/common/src/vault/models/api/card.api.ts similarity index 89% rename from libs/common/src/models/api/card.api.ts rename to libs/common/src/vault/models/api/card.api.ts index d687357f75..da68d000dd 100644 --- a/libs/common/src/models/api/card.api.ts +++ b/libs/common/src/vault/models/api/card.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class CardApi extends BaseResponse { cardholderName: string; diff --git a/libs/common/src/vault/api/fido2-credential.api.ts b/libs/common/src/vault/models/api/fido2-credential.api.ts similarity index 94% rename from libs/common/src/vault/api/fido2-credential.api.ts rename to libs/common/src/vault/models/api/fido2-credential.api.ts index 4a836d4d83..0ceaa7fce8 100644 --- a/libs/common/src/vault/api/fido2-credential.api.ts +++ b/libs/common/src/vault/models/api/fido2-credential.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../../models/response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class Fido2CredentialApi extends BaseResponse { credentialId: string; diff --git a/libs/common/src/models/api/field.api.ts b/libs/common/src/vault/models/api/field.api.ts similarity index 87% rename from libs/common/src/models/api/field.api.ts rename to libs/common/src/vault/models/api/field.api.ts index 5df51cdb8b..b319d13800 100644 --- a/libs/common/src/models/api/field.api.ts +++ b/libs/common/src/vault/models/api/field.api.ts @@ -1,5 +1,5 @@ +import { BaseResponse } from "../../../models/response/base.response"; import { FieldType, LinkedIdType } from "../../enums"; -import { BaseResponse } from "../response/base.response"; export class FieldApi extends BaseResponse { name: string; diff --git a/libs/common/src/models/api/identity.api.ts b/libs/common/src/vault/models/api/identity.api.ts similarity index 95% rename from libs/common/src/models/api/identity.api.ts rename to libs/common/src/vault/models/api/identity.api.ts index 3fb61b2b3c..795bf83b2b 100644 --- a/libs/common/src/models/api/identity.api.ts +++ b/libs/common/src/vault/models/api/identity.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class IdentityApi extends BaseResponse { title: string; diff --git a/libs/common/src/models/api/login-uri.api.ts b/libs/common/src/vault/models/api/login-uri.api.ts similarity index 84% rename from libs/common/src/models/api/login-uri.api.ts rename to libs/common/src/vault/models/api/login-uri.api.ts index 9b6a1306e6..f4e18bebd8 100644 --- a/libs/common/src/models/api/login-uri.api.ts +++ b/libs/common/src/vault/models/api/login-uri.api.ts @@ -1,5 +1,5 @@ +import { BaseResponse } from "../../../models/response/base.response"; import { UriMatchType } from "../../enums"; -import { BaseResponse } from "../response/base.response"; export class LoginUriApi extends BaseResponse { uri: string; diff --git a/libs/common/src/models/api/login.api.ts b/libs/common/src/vault/models/api/login.api.ts similarity index 89% rename from libs/common/src/models/api/login.api.ts rename to libs/common/src/vault/models/api/login.api.ts index 934d2e99b5..e9d677d150 100644 --- a/libs/common/src/models/api/login.api.ts +++ b/libs/common/src/vault/models/api/login.api.ts @@ -1,8 +1,8 @@ import { JsonObject } from "type-fest"; -import { Fido2CredentialApi } from "../../vault/api/fido2-credential.api"; -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { Fido2CredentialApi } from "./fido2-credential.api"; import { LoginUriApi } from "./login-uri.api"; export class LoginApi extends BaseResponse { diff --git a/libs/common/src/models/api/secure-note.api.ts b/libs/common/src/vault/models/api/secure-note.api.ts similarity index 79% rename from libs/common/src/models/api/secure-note.api.ts rename to libs/common/src/vault/models/api/secure-note.api.ts index 619ce277cb..6d7826b5fa 100644 --- a/libs/common/src/models/api/secure-note.api.ts +++ b/libs/common/src/vault/models/api/secure-note.api.ts @@ -1,5 +1,5 @@ +import { BaseResponse } from "../../../models/response/base.response"; import { SecureNoteType } from "../../enums"; -import { BaseResponse } from "../response/base.response"; export class SecureNoteApi extends BaseResponse { type: SecureNoteType; diff --git a/libs/common/src/vault/models/data/card.data.ts b/libs/common/src/vault/models/data/card.data.ts index c142266f6d..fe80003a8f 100644 --- a/libs/common/src/vault/models/data/card.data.ts +++ b/libs/common/src/vault/models/data/card.data.ts @@ -1,4 +1,4 @@ -import { CardApi } from "../../../models/api/card.api"; +import { CardApi } from "../api/card.api"; export class CardData { cardholderName: string; diff --git a/libs/common/src/vault/models/data/fido2-credential.data.ts b/libs/common/src/vault/models/data/fido2-credential.data.ts index 0ba13682b9..230def35f2 100644 --- a/libs/common/src/vault/models/data/fido2-credential.data.ts +++ b/libs/common/src/vault/models/data/fido2-credential.data.ts @@ -1,4 +1,4 @@ -import { Fido2CredentialApi } from "../../api/fido2-credential.api"; +import { Fido2CredentialApi } from "../api/fido2-credential.api"; export class Fido2CredentialData { credentialId: string; diff --git a/libs/common/src/vault/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts index 5b2ec28fca..0733b6c0f0 100644 --- a/libs/common/src/vault/models/data/field.data.ts +++ b/libs/common/src/vault/models/data/field.data.ts @@ -1,5 +1,5 @@ -import { FieldType, LinkedIdType } from "../../../enums"; -import { FieldApi } from "../../../models/api/field.api"; +import { FieldType, LinkedIdType } from "../../enums"; +import { FieldApi } from "../api/field.api"; export class FieldData { type: FieldType; diff --git a/libs/common/src/vault/models/data/identity.data.ts b/libs/common/src/vault/models/data/identity.data.ts index 9f71f9bc2b..620ec2ec43 100644 --- a/libs/common/src/vault/models/data/identity.data.ts +++ b/libs/common/src/vault/models/data/identity.data.ts @@ -1,4 +1,4 @@ -import { IdentityApi } from "../../../models/api/identity.api"; +import { IdentityApi } from "../api/identity.api"; export class IdentityData { title: string; diff --git a/libs/common/src/vault/models/data/login-uri.data.ts b/libs/common/src/vault/models/data/login-uri.data.ts index ebe1d948ba..344e6c377b 100644 --- a/libs/common/src/vault/models/data/login-uri.data.ts +++ b/libs/common/src/vault/models/data/login-uri.data.ts @@ -1,5 +1,5 @@ -import { UriMatchType } from "../../../enums"; -import { LoginUriApi } from "../../../models/api/login-uri.api"; +import { UriMatchType } from "../../enums"; +import { LoginUriApi } from "../api/login-uri.api"; export class LoginUriData { uri: string; diff --git a/libs/common/src/vault/models/data/login.data.ts b/libs/common/src/vault/models/data/login.data.ts index 0d8c71e77b..766718fa88 100644 --- a/libs/common/src/vault/models/data/login.data.ts +++ b/libs/common/src/vault/models/data/login.data.ts @@ -1,4 +1,4 @@ -import { LoginApi } from "../../../models/api/login.api"; +import { LoginApi } from "../api/login.api"; import { Fido2CredentialData } from "./fido2-credential.data"; import { LoginUriData } from "./login-uri.data"; diff --git a/libs/common/src/vault/models/data/secure-note.data.ts b/libs/common/src/vault/models/data/secure-note.data.ts index 0913997478..f156eec297 100644 --- a/libs/common/src/vault/models/data/secure-note.data.ts +++ b/libs/common/src/vault/models/data/secure-note.data.ts @@ -1,5 +1,5 @@ -import { SecureNoteType } from "../../../enums"; -import { SecureNoteApi } from "../../../models/api/secure-note.api"; +import { SecureNoteType } from "../../enums"; +import { SecureNoteApi } from "../api/secure-note.api"; export class SecureNoteData { type: SecureNoteType; diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts index 1707c1dca7..79f3fd22bc 100644 --- a/libs/common/src/vault/models/domain/cipher.spec.ts +++ b/libs/common/src/vault/models/domain/cipher.spec.ts @@ -2,13 +2,13 @@ import { mock } from "jest-mock-extended"; import { Jsonify } from "type-fest"; import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils"; -import { FieldType, SecureNoteType, UriMatchType } from "../../../enums"; import { CryptoService } from "../../../platform/abstractions/crypto.service"; import { EncryptService } from "../../../platform/abstractions/encrypt.service"; import { EncString } from "../../../platform/models/domain/enc-string"; import { ContainerService } from "../../../platform/services/container.service"; import { InitializerKey } from "../../../platform/services/cryptography/initializer-key"; import { CipherService } from "../../abstractions/cipher.service"; +import { FieldType, SecureNoteType, UriMatchType } from "../../enums"; import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; import { CipherType } from "../../enums/cipher-type"; import { CipherData } from "../../models/data/cipher.data"; diff --git a/libs/common/src/vault/models/domain/fido2-credential.spec.ts b/libs/common/src/vault/models/domain/fido2-credential.spec.ts index 9705862460..e2cddcea3f 100644 --- a/libs/common/src/vault/models/domain/fido2-credential.spec.ts +++ b/libs/common/src/vault/models/domain/fido2-credential.spec.ts @@ -1,5 +1,5 @@ import { mockEnc } from "../../../../spec"; -import { EncryptionType } from "../../../enums"; +import { EncryptionType } from "../../../platform/enums"; import { EncString } from "../../../platform/models/domain/enc-string"; import { Fido2CredentialData } from "../data/fido2-credential.data"; diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts index 8aa77b78a5..7dc5556e6c 100644 --- a/libs/common/src/vault/models/domain/field.spec.ts +++ b/libs/common/src/vault/models/domain/field.spec.ts @@ -1,6 +1,6 @@ import { mockEnc, mockFromJson } from "../../../../spec"; -import { FieldType } from "../../../enums"; import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string"; +import { FieldType } from "../../enums"; import { FieldData } from "../../models/data/field.data"; import { Field } from "../../models/domain/field"; diff --git a/libs/common/src/vault/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts index 388f9f806c..ffc5b8cb41 100644 --- a/libs/common/src/vault/models/domain/field.ts +++ b/libs/common/src/vault/models/domain/field.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; -import { FieldType, LinkedIdType } from "../../../enums"; import Domain from "../../../platform/models/domain/domain-base"; import { EncString } from "../../../platform/models/domain/enc-string"; import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key"; +import { FieldType, LinkedIdType } from "../../enums"; import { FieldData } from "../data/field.data"; import { FieldView } from "../view/field.view"; diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts index 7649739267..8f0657e37e 100644 --- a/libs/common/src/vault/models/domain/login-uri.spec.ts +++ b/libs/common/src/vault/models/domain/login-uri.spec.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; import { mockEnc, mockFromJson } from "../../../../spec"; -import { UriMatchType } from "../../../enums"; import { EncString } from "../../../platform/models/domain/enc-string"; +import { UriMatchType } from "../../enums"; import { LoginUriData } from "../data/login-uri.data"; import { LoginUri } from "./login-uri"; diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts index 5b59946758..6bdd50c3d4 100644 --- a/libs/common/src/vault/models/domain/login-uri.ts +++ b/libs/common/src/vault/models/domain/login-uri.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "../../../enums"; import Domain from "../../../platform/models/domain/domain-base"; import { EncString } from "../../../platform/models/domain/enc-string"; import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key"; +import { UriMatchType } from "../../enums"; import { LoginUriData } from "../data/login-uri.data"; import { LoginUriView } from "../view/login-uri.view"; diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts index b4b5065272..9c9e005ced 100644 --- a/libs/common/src/vault/models/domain/login.spec.ts +++ b/libs/common/src/vault/models/domain/login.spec.ts @@ -1,13 +1,13 @@ import { mock } from "jest-mock-extended"; import { mockEnc, mockFromJson } from "../../../../spec"; -import { UriMatchType } from "../../../enums"; import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string"; -import { Fido2CredentialApi } from "../../api/fido2-credential.api"; +import { UriMatchType } from "../../enums"; import { LoginData } from "../../models/data/login.data"; import { Login } from "../../models/domain/login"; import { LoginUri } from "../../models/domain/login-uri"; import { LoginUriView } from "../../models/view/login-uri.view"; +import { Fido2CredentialApi } from "../api/fido2-credential.api"; import { Fido2CredentialData } from "../data/fido2-credential.data"; import { Fido2CredentialView } from "../view/fido2-credential.view"; diff --git a/libs/common/src/vault/models/domain/secure-note.spec.ts b/libs/common/src/vault/models/domain/secure-note.spec.ts index aec3169a0c..719cf59f13 100644 --- a/libs/common/src/vault/models/domain/secure-note.spec.ts +++ b/libs/common/src/vault/models/domain/secure-note.spec.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "../../../enums"; +import { SecureNoteType } from "../../enums"; import { SecureNoteData } from "../data/secure-note.data"; import { SecureNote } from "./secure-note"; diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts index cc70c42abb..7ae16f099a 100644 --- a/libs/common/src/vault/models/domain/secure-note.ts +++ b/libs/common/src/vault/models/domain/secure-note.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { SecureNoteType } from "../../../enums"; import Domain from "../../../platform/models/domain/domain-base"; import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key"; +import { SecureNoteType } from "../../enums"; import { SecureNoteData } from "../data/secure-note.data"; import { SecureNoteView } from "../view/secure-note.view"; diff --git a/libs/common/src/models/domain/tree-node.ts b/libs/common/src/vault/models/domain/tree-node.ts similarity index 100% rename from libs/common/src/models/domain/tree-node.ts rename to libs/common/src/vault/models/domain/tree-node.ts diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts index 4fabd57d4a..58664495b1 100644 --- a/libs/common/src/vault/models/request/cipher.request.ts +++ b/libs/common/src/vault/models/request/cipher.request.ts @@ -1,12 +1,12 @@ -import { CardApi } from "../../../models/api/card.api"; -import { FieldApi } from "../../../models/api/field.api"; -import { IdentityApi } from "../../../models/api/identity.api"; -import { LoginUriApi } from "../../../models/api/login-uri.api"; -import { LoginApi } from "../../../models/api/login.api"; -import { SecureNoteApi } from "../../../models/api/secure-note.api"; -import { Fido2CredentialApi } from "../../api/fido2-credential.api"; import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; import { CipherType } from "../../enums/cipher-type"; +import { CardApi } from "../api/card.api"; +import { Fido2CredentialApi } from "../api/fido2-credential.api"; +import { FieldApi } from "../api/field.api"; +import { IdentityApi } from "../api/identity.api"; +import { LoginUriApi } from "../api/login-uri.api"; +import { LoginApi } from "../api/login.api"; +import { SecureNoteApi } from "../api/secure-note.api"; import { Cipher } from "../domain/cipher"; import { AttachmentRequest } from "./attachment.request"; diff --git a/libs/common/src/vault/models/response/attachment-upload-data.response.ts b/libs/common/src/vault/models/response/attachment-upload-data.response.ts index 732f8e4f7f..cfbd38beaa 100644 --- a/libs/common/src/vault/models/response/attachment-upload-data.response.ts +++ b/libs/common/src/vault/models/response/attachment-upload-data.response.ts @@ -1,5 +1,5 @@ -import { FileUploadType } from "../../../enums"; import { BaseResponse } from "../../../models/response/base.response"; +import { FileUploadType } from "../../../platform/enums"; import { CipherResponse } from "./cipher.response"; diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts index 8bc8a37874..67709b602e 100644 --- a/libs/common/src/vault/models/response/cipher.response.ts +++ b/libs/common/src/vault/models/response/cipher.response.ts @@ -1,10 +1,10 @@ -import { CardApi } from "../../../models/api/card.api"; -import { FieldApi } from "../../../models/api/field.api"; -import { IdentityApi } from "../../../models/api/identity.api"; -import { LoginApi } from "../../../models/api/login.api"; -import { SecureNoteApi } from "../../../models/api/secure-note.api"; import { BaseResponse } from "../../../models/response/base.response"; import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CardApi } from "../api/card.api"; +import { FieldApi } from "../api/field.api"; +import { IdentityApi } from "../api/identity.api"; +import { LoginApi } from "../api/login.api"; +import { SecureNoteApi } from "../api/secure-note.api"; import { AttachmentResponse } from "./attachment.response"; import { PasswordHistoryResponse } from "./password-history.response"; diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts index 25c7097707..d4067cdc3d 100644 --- a/libs/common/src/vault/models/view/card.view.ts +++ b/libs/common/src/vault/models/view/card.view.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; -import { CardLinkedId as LinkedId } from "../../../enums"; -import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; +import { CardLinkedId as LinkedId } from "../../enums"; +import { linkedFieldOption } from "../../linked-field-option.decorator"; import { ItemView } from "./item.view"; diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts index de3a1a62bf..a56817418b 100644 --- a/libs/common/src/vault/models/view/cipher.view.ts +++ b/libs/common/src/vault/models/view/cipher.view.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; -import { LinkedIdType } from "../../../enums"; import { View } from "../../../models/view/view"; import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface"; import { InitializerKey } from "../../../platform/services/cryptography/initializer-key"; +import { LinkedIdType } from "../../enums"; import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; import { CipherType } from "../../enums/cipher-type"; import { LocalData } from "../data/local.data"; diff --git a/libs/common/src/vault/models/view/collection.view.ts b/libs/common/src/vault/models/view/collection.view.ts index 48cacb7b55..17894d566c 100644 --- a/libs/common/src/vault/models/view/collection.view.ts +++ b/libs/common/src/vault/models/view/collection.view.ts @@ -1,7 +1,7 @@ import { Organization } from "../../../admin-console/models/domain/organization"; -import { ITreeNodeObject } from "../../../models/domain/tree-node"; import { View } from "../../../models/view/view"; import { Collection } from "../domain/collection"; +import { ITreeNodeObject } from "../domain/tree-node"; import { CollectionAccessDetailsResponse } from "../response/collection.response"; export const NestingDelimiter = "/"; diff --git a/libs/common/src/vault/models/view/field.view.ts b/libs/common/src/vault/models/view/field.view.ts index 29c6c3ad4e..1428b20b7f 100644 --- a/libs/common/src/vault/models/view/field.view.ts +++ b/libs/common/src/vault/models/view/field.view.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; -import { FieldType, LinkedIdType } from "../../../enums"; import { View } from "../../../models/view/view"; +import { FieldType, LinkedIdType } from "../../enums"; import { Field } from "../domain/field"; export class FieldView implements View { diff --git a/libs/common/src/vault/models/view/folder.view.ts b/libs/common/src/vault/models/view/folder.view.ts index b3a11f9a43..7e5c51bc30 100644 --- a/libs/common/src/vault/models/view/folder.view.ts +++ b/libs/common/src/vault/models/view/folder.view.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { ITreeNodeObject } from "../../../models/domain/tree-node"; import { View } from "../../../models/view/view"; import { Folder } from "../domain/folder"; +import { ITreeNodeObject } from "../domain/tree-node"; export class FolderView implements View, ITreeNodeObject { id: string = null; diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts index 9d14a554f7..21e6324abb 100644 --- a/libs/common/src/vault/models/view/identity.view.ts +++ b/libs/common/src/vault/models/view/identity.view.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { IdentityLinkedId as LinkedId } from "../../../enums"; -import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; import { Utils } from "../../../platform/misc/utils"; +import { IdentityLinkedId as LinkedId } from "../../enums"; +import { linkedFieldOption } from "../../linked-field-option.decorator"; import { ItemView } from "./item.view"; diff --git a/libs/common/src/vault/models/view/item.view.ts b/libs/common/src/vault/models/view/item.view.ts index 948982dbdc..70e4afccc7 100644 --- a/libs/common/src/vault/models/view/item.view.ts +++ b/libs/common/src/vault/models/view/item.view.ts @@ -1,5 +1,5 @@ -import { LinkedMetadata } from "../../../misc/linkedFieldOption.decorator"; import { View } from "../../../models/view/view"; +import { LinkedMetadata } from "../../linked-field-option.decorator"; export abstract class ItemView implements View { linkedFieldOptions: Map; diff --git a/libs/common/src/vault/models/view/login-uri-view.spec.ts b/libs/common/src/vault/models/view/login-uri-view.spec.ts index b4a5e7288a..92db1a6cc4 100644 --- a/libs/common/src/vault/models/view/login-uri-view.spec.ts +++ b/libs/common/src/vault/models/view/login-uri-view.spec.ts @@ -1,5 +1,5 @@ -import { UriMatchType } from "../../../enums"; import { Utils } from "../../../platform/misc/utils"; +import { UriMatchType } from "../../enums"; import { LoginUriView } from "./login-uri.view"; diff --git a/libs/common/src/vault/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts index 7bd650f2f2..467db76169 100644 --- a/libs/common/src/vault/models/view/login-uri.view.ts +++ b/libs/common/src/vault/models/view/login-uri.view.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "../../../enums"; import { View } from "../../../models/view/view"; import { SafeUrls } from "../../../platform/misc/safe-urls"; import { Utils } from "../../../platform/misc/utils"; +import { UriMatchType } from "../../enums"; import { LoginUri } from "../domain/login-uri"; export class LoginUriView implements View { diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts index fa05189ba0..aec3d39d26 100644 --- a/libs/common/src/vault/models/view/login.view.ts +++ b/libs/common/src/vault/models/view/login.view.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { LoginLinkedId as LinkedId, UriMatchType } from "../../../enums"; -import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; import { Utils } from "../../../platform/misc/utils"; +import { LoginLinkedId as LinkedId, UriMatchType } from "../../enums"; +import { linkedFieldOption } from "../../linked-field-option.decorator"; import { Login } from "../domain/login"; import { Fido2CredentialView } from "./fido2-credential.view"; diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts index a182d1c050..6267280b46 100644 --- a/libs/common/src/vault/models/view/secure-note.view.ts +++ b/libs/common/src/vault/models/view/secure-note.view.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { SecureNoteType } from "../../../enums"; +import { SecureNoteType } from "../../enums"; import { SecureNote } from "../domain/secure-note"; import { ItemView } from "./item.view"; diff --git a/libs/common/src/misc/serviceUtils.spec.ts b/libs/common/src/vault/service-utils.spec.ts similarity index 95% rename from libs/common/src/misc/serviceUtils.spec.ts rename to libs/common/src/vault/service-utils.spec.ts index 7cfa318f8c..1760ef4045 100644 --- a/libs/common/src/misc/serviceUtils.spec.ts +++ b/libs/common/src/vault/service-utils.spec.ts @@ -1,6 +1,5 @@ -import { ITreeNodeObject, TreeNode } from "../models/domain/tree-node"; - -import { ServiceUtils } from "./serviceUtils"; +import { ITreeNodeObject, TreeNode } from "./models/domain/tree-node"; +import { ServiceUtils } from "./service-utils"; type FakeObject = { id: string; name: string }; diff --git a/libs/common/src/misc/serviceUtils.ts b/libs/common/src/vault/service-utils.ts similarity index 98% rename from libs/common/src/misc/serviceUtils.ts rename to libs/common/src/vault/service-utils.ts index 7fe07f7253..52029f1b9b 100644 --- a/libs/common/src/misc/serviceUtils.ts +++ b/libs/common/src/vault/service-utils.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject, TreeNode } from "../models/domain/tree-node"; +import { ITreeNodeObject, TreeNode } from "./models/domain/tree-node"; export class ServiceUtils { /** diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts index 755397ebfb..b68b81c6cf 100644 --- a/libs/common/src/vault/services/cipher.service.spec.ts +++ b/libs/common/src/vault/services/cipher.service.spec.ts @@ -5,7 +5,6 @@ import { makeStaticByteArray } from "../../../spec/utils"; import { ApiService } from "../../abstractions/api.service"; import { SearchService } from "../../abstractions/search.service"; import { SettingsService } from "../../abstractions/settings.service"; -import { UriMatchType, FieldType } from "../../enums"; import { ConfigServiceAbstraction } from "../../platform/abstractions/config/config.service.abstraction"; import { CryptoService } from "../../platform/abstractions/crypto.service"; import { EncryptService } from "../../platform/abstractions/encrypt.service"; @@ -20,6 +19,7 @@ import { } from "../../platform/models/domain/symmetric-crypto-key"; import { ContainerService } from "../../platform/services/container.service"; import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service"; +import { UriMatchType, FieldType } from "../enums"; import { CipherRepromptType } from "../enums/cipher-reprompt-type"; import { CipherType } from "../enums/cipher-type"; import { CipherData } from "../models/data/cipher.data"; diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index d800d69982..382fb81dec 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -4,7 +4,6 @@ import { SemVer } from "semver"; import { ApiService } from "../../abstractions/api.service"; import { SearchService } from "../../abstractions/search.service"; import { SettingsService } from "../../abstractions/settings.service"; -import { FieldType, UriMatchType } from "../../enums"; import { ErrorResponse } from "../../models/response/error.response"; import { View } from "../../models/view/view"; import { ConfigServiceAbstraction } from "../../platform/abstractions/config/config.service.abstraction"; @@ -25,6 +24,7 @@ import { } from "../../platform/models/domain/symmetric-crypto-key"; import { CipherService as CipherServiceAbstraction } from "../abstractions/cipher.service"; import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service"; +import { FieldType, UriMatchType } from "../enums"; import { CipherType } from "../enums/cipher-type"; import { CipherData } from "../models/data/cipher.data"; import { Attachment } from "../models/domain/attachment"; diff --git a/libs/common/src/vault/services/collection.service.ts b/libs/common/src/vault/services/collection.service.ts index 277d40cc88..db6df79521 100644 --- a/libs/common/src/vault/services/collection.service.ts +++ b/libs/common/src/vault/services/collection.service.ts @@ -1,5 +1,3 @@ -import { ServiceUtils } from "../../misc/serviceUtils"; -import { TreeNode } from "../../models/domain/tree-node"; import { CryptoService } from "../../platform/abstractions/crypto.service"; import { I18nService } from "../../platform/abstractions/i18n.service"; import { StateService } from "../../platform/abstractions/state.service"; @@ -7,7 +5,9 @@ import { Utils } from "../../platform/misc/utils"; import { CollectionService as CollectionServiceAbstraction } from "../../vault/abstractions/collection.service"; import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; +import { TreeNode } from "../models/domain/tree-node"; import { CollectionView } from "../models/view/collection.view"; +import { ServiceUtils } from "../service-utils"; const NestingDelimiter = "/"; diff --git a/libs/common/src/services/totp.service.ts b/libs/common/src/vault/services/totp.service.ts similarity index 95% rename from libs/common/src/services/totp.service.ts rename to libs/common/src/vault/services/totp.service.ts index 7896a8c451..33bce068d2 100644 --- a/libs/common/src/services/totp.service.ts +++ b/libs/common/src/vault/services/totp.service.ts @@ -1,7 +1,7 @@ +import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service"; +import { LogService } from "../../platform/abstractions/log.service"; +import { Utils } from "../../platform/misc/utils"; import { TotpService as TotpServiceAbstraction } from "../abstractions/totp.service"; -import { CryptoFunctionService } from "../platform/abstractions/crypto-function.service"; -import { LogService } from "../platform/abstractions/log.service"; -import { Utils } from "../platform/misc/utils"; const B32Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; const SteamChars = "23456789BCDFGHJKMNPQRTVWXY"; diff --git a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts index 366ea53bdb..bb6423f723 100644 --- a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts +++ b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts @@ -2,16 +2,16 @@ import { mock, MockProxy } from "jest-mock-extended"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums"; import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { StateService } from "@bitwarden/common/platform/services/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { Folder } from "@bitwarden/common/vault/models/domain/folder"; import { Login } from "@bitwarden/common/vault/models/domain/login"; diff --git a/libs/exporter/src/vault-export/services/vault-export.service.ts b/libs/exporter/src/vault-export/services/vault-export.service.ts index c214646d9a..12ac883d30 100644 --- a/libs/exporter/src/vault-export/services/vault-export.service.ts +++ b/libs/exporter/src/vault-export/services/vault-export.service.ts @@ -2,7 +2,6 @@ import * as papa from "papaparse"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums"; import { CipherWithIdExport, CollectionWithIdExport, @@ -11,10 +10,11 @@ import { import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; diff --git a/libs/importer/spec/base-importer.spec.ts b/libs/importer/spec/base-importer.spec.ts index db98872142..0332fa14c5 100644 --- a/libs/importer/spec/base-importer.spec.ts +++ b/libs/importer/spec/base-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts index 5d24cef414..e7dc3d86ff 100644 --- a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts +++ b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts @@ -1,8 +1,8 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { KdfType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/libs/importer/spec/dashlane-csv-importer.spec.ts b/libs/importer/spec/dashlane-csv-importer.spec.ts index bd957eaa87..e76a4d4cb3 100644 --- a/libs/importer/spec/dashlane-csv-importer.spec.ts +++ b/libs/importer/spec/dashlane-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { DashlaneCsvImporter } from "../src/importers"; diff --git a/libs/importer/spec/enpass-json-importer.spec.ts b/libs/importer/spec/enpass-json-importer.spec.ts index 0c45746de0..bf653225da 100644 --- a/libs/importer/spec/enpass-json-importer.spec.ts +++ b/libs/importer/spec/enpass-json-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { EnpassJsonImporter } from "../src/importers"; diff --git a/libs/importer/spec/lastpass-csv-importer.spec.ts b/libs/importer/spec/lastpass-csv-importer.spec.ts index e2f9b14140..de43c4aa47 100644 --- a/libs/importer/spec/lastpass-csv-importer.spec.ts +++ b/libs/importer/spec/lastpass-csv-importer.spec.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/spec/myki-csv-importer.spec.ts b/libs/importer/spec/myki-csv-importer.spec.ts index 5d4b909935..68d4e9b2bd 100644 --- a/libs/importer/spec/myki-csv-importer.spec.ts +++ b/libs/importer/spec/myki-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { MykiCsvImporter } from "../src/importers"; diff --git a/libs/importer/spec/nordpass-csv-importer.spec.ts b/libs/importer/spec/nordpass-csv-importer.spec.ts index b4e2ca457c..d79c001c43 100644 --- a/libs/importer/spec/nordpass-csv-importer.spec.ts +++ b/libs/importer/spec/nordpass-csv-importer.spec.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/spec/onepassword-1pif-importer.spec.ts b/libs/importer/spec/onepassword-1pif-importer.spec.ts index f71e6e3df9..fbf79ec8e0 100644 --- a/libs/importer/spec/onepassword-1pif-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pif-importer.spec.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; +import { FieldType } from "@bitwarden/common/vault/enums"; import { OnePassword1PifImporter } from "../src/importers"; diff --git a/libs/importer/spec/onepassword-1pux-importer.spec.ts b/libs/importer/spec/onepassword-1pux-importer.spec.ts index a703f4aaa9..4ae22db6a2 100644 --- a/libs/importer/spec/onepassword-1pux-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pux-importer.spec.ts @@ -1,6 +1,5 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { OnePassword1PuxImporter } from "../src/importers"; diff --git a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts index a865f1892f..23daba70dc 100644 --- a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts +++ b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { OnePasswordMacCsvImporter } from "../src/importers"; diff --git a/libs/importer/spec/onepassword-win-csv-importer.spec.ts b/libs/importer/spec/onepassword-win-csv-importer.spec.ts index 8d4b2b7d8b..0da6099470 100644 --- a/libs/importer/spec/onepassword-win-csv-importer.spec.ts +++ b/libs/importer/spec/onepassword-win-csv-importer.spec.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/spec/protonpass-json-importer.spec.ts b/libs/importer/spec/protonpass-json-importer.spec.ts index b8d57b9be7..c6f8fb4838 100644 --- a/libs/importer/spec/protonpass-json-importer.spec.ts +++ b/libs/importer/spec/protonpass-json-importer.spec.ts @@ -1,9 +1,8 @@ import { MockProxy } from "jest-mock-extended"; -import { FieldType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { ProtonPassJsonImporter } from "../src/importers"; diff --git a/libs/importer/spec/psono-json-importer.spec.ts b/libs/importer/spec/psono-json-importer.spec.ts index 41d7633352..31bea062ed 100644 --- a/libs/importer/spec/psono-json-importer.spec.ts +++ b/libs/importer/spec/psono-json-importer.spec.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { PsonoJsonImporter } from "../src/importers"; diff --git a/libs/importer/src/components/dialog/import-success-dialog.component.ts b/libs/importer/src/components/dialog/import-success-dialog.component.ts index 4d10002da4..7f34ea1869 100644 --- a/libs/importer/src/components/dialog/import-success-dialog.component.ts +++ b/libs/importer/src/components/dialog/import-success-dialog.component.ts @@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common"; import { Component, Inject, OnInit } from "@angular/core"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { ButtonModule, DialogModule, TableDataSource, TableModule } from "@bitwarden/components"; import { ImportResult } from "../../models"; diff --git a/libs/importer/src/importers/avast/avast-json-importer.ts b/libs/importer/src/importers/avast/avast-json-importer.ts index 92d407e945..1774f13be9 100644 --- a/libs/importer/src/importers/avast/avast-json-importer.ts +++ b/libs/importer/src/importers/avast/avast-json-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { ImportResult } from "../../models/import-result"; diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts index 676fec4f33..0db20fa4b4 100644 --- a/libs/importer/src/importers/base-importer.ts +++ b/libs/importer/src/importers/base-importer.ts @@ -1,10 +1,9 @@ import * as papa from "papaparse"; -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts index 9024f5fff6..1792448dfe 100644 --- a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts @@ -1,6 +1,5 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts index 49288e9dd8..7759f5ffce 100644 --- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts @@ -1,7 +1,7 @@ import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { KdfType } from "@bitwarden/common/platform/enums"; import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts index 45aff447e3..888aeb823e 100644 --- a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts index 2cfb29f21a..d4d40a5670 100644 --- a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/encryptr-csv-importer.ts b/libs/importer/src/importers/encryptr-csv-importer.ts index a925ad2439..759639d98a 100644 --- a/libs/importer/src/importers/encryptr-csv-importer.ts +++ b/libs/importer/src/importers/encryptr-csv-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { ImportResult } from "../models/import-result"; diff --git a/libs/importer/src/importers/enpass/enpass-csv-importer.ts b/libs/importer/src/importers/enpass/enpass-csv-importer.ts index 546dd33b22..55a56c5a70 100644 --- a/libs/importer/src/importers/enpass/enpass-csv-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/enpass/enpass-json-importer.ts b/libs/importer/src/importers/enpass/enpass-json-importer.ts index 76306721e5..733926b3b1 100644 --- a/libs/importer/src/importers/enpass/enpass-json-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-json-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts index ff19113430..8381842c51 100644 --- a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts +++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { FSecureFskImporter as Importer } from "./fsecure-fsk-importer"; import { CreditCardTestEntry, LoginTestEntry } from "./fsk-test-data"; diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts index db431a6456..c29605a920 100644 --- a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts +++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/keepass2-xml-importer.ts b/libs/importer/src/importers/keepass2-xml-importer.ts index 15f379acbb..306c946ca4 100644 --- a/libs/importer/src/importers/keepass2-xml-importer.ts +++ b/libs/importer/src/importers/keepass2-xml-importer.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; +import { FieldType } from "@bitwarden/common/vault/enums"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { ImportResult } from "../models/import-result"; diff --git a/libs/importer/src/importers/lastpass-csv-importer.ts b/libs/importer/src/importers/lastpass-csv-importer.ts index 464b1d3429..737baab78f 100644 --- a/libs/importer/src/importers/lastpass-csv-importer.ts +++ b/libs/importer/src/importers/lastpass-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/importer/src/importers/msecure-csv-importer.ts b/libs/importer/src/importers/msecure-csv-importer.ts index 1ed5ff76e4..788dfd1d4e 100644 --- a/libs/importer/src/importers/msecure-csv-importer.ts +++ b/libs/importer/src/importers/msecure-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; import { ImportResult } from "../models/import-result"; diff --git a/libs/importer/src/importers/myki-csv-importer.ts b/libs/importer/src/importers/myki-csv-importer.ts index c75a409376..0ad1349acf 100644 --- a/libs/importer/src/importers/myki-csv-importer.ts +++ b/libs/importer/src/importers/myki-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/nordpass-csv-importer.ts b/libs/importer/src/importers/nordpass-csv-importer.ts index d17a9fbfdd..39685df3d4 100644 --- a/libs/importer/src/importers/nordpass-csv-importer.ts +++ b/libs/importer/src/importers/nordpass-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts index a4f78d203b..a3db3ff385 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts @@ -1,5 +1,4 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts index b8329a5d44..cf9177fcf4 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts @@ -1,6 +1,5 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts index 3f920a7d4f..5a90bdb217 100644 --- a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts index 601ba77d83..3983e742b9 100644 --- a/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts index f2ae98cd45..0a7dec7d32 100644 --- a/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/src/importers/passwordboss-json-importer.ts b/libs/importer/src/importers/passwordboss-json-importer.ts index 8c42657506..169df7a9dc 100644 --- a/libs/importer/src/importers/passwordboss-json-importer.ts +++ b/libs/importer/src/importers/passwordboss-json-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts index c161630be5..f1d8763a13 100644 --- a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts +++ b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts @@ -1,6 +1,5 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/psono/psono-json-importer.ts b/libs/importer/src/importers/psono/psono-json-importer.ts index f9401b4a97..2bd886c8e8 100644 --- a/libs/importer/src/importers/psono/psono-json-importer.ts +++ b/libs/importer/src/importers/psono/psono-json-importer.ts @@ -1,5 +1,4 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/remembear-csv-importer.ts b/libs/importer/src/importers/remembear-csv-importer.ts index f23271892d..492a94c866 100644 --- a/libs/importer/src/importers/remembear-csv-importer.ts +++ b/libs/importer/src/importers/remembear-csv-importer.ts @@ -1,4 +1,4 @@ -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { ImportResult } from "../models/import-result"; diff --git a/libs/importer/src/importers/safeincloud-xml-importer.ts b/libs/importer/src/importers/safeincloud-xml-importer.ts index e83ef3c7f5..5c5c88021f 100644 --- a/libs/importer/src/importers/safeincloud-xml-importer.ts +++ b/libs/importer/src/importers/safeincloud-xml-importer.ts @@ -1,5 +1,4 @@ -import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/importer/src/importers/truekey-csv-importer.ts b/libs/importer/src/importers/truekey-csv-importer.ts index 3d52be1bd8..64c4b7882f 100644 --- a/libs/importer/src/importers/truekey-csv-importer.ts +++ b/libs/importer/src/importers/truekey-csv-importer.ts @@ -1,5 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts index 15ac802c40..25357f2863 100644 --- a/libs/importer/src/services/import.service.ts +++ b/libs/importer/src/services/import.service.ts @@ -8,7 +8,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request"; import { CollectionWithIdRequest } from "@bitwarden/common/vault/models/request/collection-with-id.request"; import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request"; diff --git a/libs/common/src/misc/nodeUtils.ts b/libs/node/src/node-utils.ts similarity index 100% rename from libs/common/src/misc/nodeUtils.ts rename to libs/node/src/node-utils.ts