Merge branch 'main' into km/userkey-rotation-v2

.github/CODEOWNERS

@@ -29,12 +29,12 @@ libs/tools @bitwarden/team-tools-dev
 bitwarden_license/bit-web/src/app/tools @bitwarden/team-tools-dev
 bitwarden_license/bit-common/src/tools @bitwarden/team-tools-dev
 
-## Localization/Crowdin (Tools team)
-apps/browser/src/_locales @bitwarden/team-tools-dev
-apps/browser/store/locales @bitwarden/team-tools-dev
-apps/cli/src/locales @bitwarden/team-tools-dev
-apps/desktop/src/locales @bitwarden/team-tools-dev
-apps/web/src/locales @bitwarden/team-tools-dev
+## Localization/Crowdin (Platform and Tools team)
+apps/browser/src/_locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+apps/browser/store/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+apps/cli/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+apps/desktop/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+apps/web/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
 
 ## Vault team files ##
 apps/browser/src/vault @bitwarden/team-vault-dev

.github/codecov.yml

@@ -1,2 +1,66 @@
 ignore:
   - "**/*.spec.ts" # Tests
+
+component_management:
+  default_rules:
+    statuses:
+      - type: project
+        target: auto
+  individual_components:
+    - component_id: key-management-biometrics
+      name: Key Management - Biometrics
+      paths:
+        - apps/browser/src/key-management/biometrics/**
+        - apps/cli/src/key-management/cli-biometrics-service.ts
+        - apps/desktop/destkop_native/core/src/biometric/**
+        - apps/desktop/src/key-management/biometrics/**
+        - apps/desktop/src/services/biometric-message-handler.service.ts
+        - apps/web/src/app/key-management/web-biometric.service.ts
+        - libs/key-management/src/biometrics/**
+    - component_id: key-management-lock
+      name: Key Management - Lock
+      paths:
+        - apps/browser/src/key-management/lock/**
+        - apps/desktop/src/key-management/lock/**
+        - apps/web/src/app/key-management/lock/**
+        - libs/key-management-ui/src/lock/**
+    - component_id: key-management-ipc
+      name: Key Management - IPC
+      paths:
+        - apps/browser/src/background/nativeMessaging.background.ts
+        - apps/desktop/src/services/native-messaging.service.ts
+    - component_id: key-management-key-rotation
+      name: Key Management - Key Rotation
+      paths:
+        - apps/web/src/app/key-management/key-rotation/**
+        - apps/web/src/app/key-management/migrate-encryption/**
+        - libs/key-management/src/user-asymmetric-key-regeneration/**
+    - component_id: key-management-process-reload
+      name: Key Management - Process Reload
+      paths:
+        - apps/web/src/app/key-management/services/web-process-reload.service.ts
+        - libs/common/src/key-management/services/default-process-reload.service.ts
+    - component_id: key-management-keys
+      name: Key Management - Keys
+      paths:
+        - libs/key-management/src/kdf-config.service.ts
+        - libs/key-management/src/key.service.ts
+        - libs/common/src/key-management/master-password/**
+    - component_id: key-management-crypto
+      name: Key Management - Crypto
+      paths:
+        - libs/common/src/key-management/crypto/**
+    - component_id: key-management
+      name: Key Management
+      paths:
+        - apps/browser/src/key-management/**
+        - apps/browser/src/background/nativeMessaging.background.ts
+        - apps/cli/src/key-management/**
+        - apps/desktop/destkop_native/core/src/biometric/**
+        - apps/desktop/src/key-management/**
+        - apps/desktop/src/services/biometric-message-handler.service.ts
+        - apps/desktop/src/services/native-messaging.service.ts
+        - apps/web/src/app/key-managemen/**
+        - libs/common/src/key-management/**
+        - libs/key-management/**
+        - libs/key-management-ui/**

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

@@ -75,12 +75,16 @@ import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/bill
 import { ClientType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { BulkEncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/bulk-encrypt.service.implementation";
+import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
+import { FallbackBulkEncryptService } from "@bitwarden/common/key-management/crypto/services/fallback-bulk-encrypt.service";
+import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/multithread-encrypt.service.implementation";
 import { DefaultProcessReloadService } from "@bitwarden/common/key-management/services/default-process-reload.service";
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { RegionConfig } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Fido2ActiveRequestManager as Fido2ActiveRequestManagerAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction";
 import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-authenticator.service.abstraction";
@@ -123,10 +127,6 @@ import { ConfigApiService } from "@bitwarden/common/platform/services/config/con
 import { DefaultConfigService } from "@bitwarden/common/platform/services/config/default-config.service";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
-import { BulkEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/bulk-encrypt.service.implementation";
-import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
-import { FallbackBulkEncryptService } from "@bitwarden/common/platform/services/cryptography/fallback-bulk-encrypt.service";
-import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
 import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/services/fido2/fido2-active-request-manager";
 import { Fido2AuthenticatorService } from "@bitwarden/common/platform/services/fido2/fido2-authenticator.service";
 import { Fido2ClientService } from "@bitwarden/common/platform/services/fido2/fido2-client.service";
@@ -208,7 +208,7 @@ import {
   ImportApiServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
-} from "@bitwarden/importer/core";
+} from "@bitwarden/importer-core";
 import {
   BiometricsService,
   BiometricStateService,

apps/browser/src/background/nativeMessaging.background.ts

@@ -4,9 +4,9 @@ import { delay, filter, firstValueFrom, from, map, race, timer } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 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 { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";

apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts

@@ -1,6 +1,6 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Lazy } from "@bitwarden/common/platform/misc/lazy";

apps/browser/src/platform/services/local-backed-session-storage.service.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Subject } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {

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

@@ -55,13 +55,13 @@ import {
 } from "@bitwarden/common/autofill/services/user-notification-settings.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { ClientType } from "@bitwarden/common/enums";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import {
   AnimationControlService,
   DefaultAnimationControlService,
 } from "@bitwarden/common/platform/abstractions/animation-control.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";

apps/browser/tsconfig.json

@@ -24,7 +24,7 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
       "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
@@ -51,8 +51,8 @@
   },
   "include": [
     "src",
-    "../../libs/common/src/platform/services/**/*.worker.ts",
     "../../libs/common/src/autofill/constants",
-    "../../libs/common/custom-matchers.d.ts"
+    "../../libs/common/custom-matchers.d.ts",
+    "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts"
   ]
 }

apps/browser/webpack.config.js

@@ -205,7 +205,7 @@ const mainConfig = {
       "./src/autofill/deprecated/overlay/pages/button/bootstrap-autofill-overlay-button.deprecated.ts",
     "overlay/list":
       "./src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts",
-    "encrypt-worker": "../../libs/common/src/platform/services/cryptography/encrypt.worker.ts",
+    "encrypt-worker": "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts",
     "content/send-on-installed-message": "./src/vault/content/send-on-installed-message.ts",
   },
   optimization: {

apps/cli/src/admin-console/commands/confirm.command.ts

@@ -5,7 +5,7 @@ import {
   OrganizationUserConfirmRequest,
 } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { KeyService } from "@bitwarden/key-management";
 

apps/cli/src/commands/download.command.ts

@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 

apps/cli/src/commands/edit.command.ts

@@ -6,10 +6,10 @@ import { CollectionRequest } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
 import { FolderExport } from "@bitwarden/common/models/export/folder.export";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";

apps/cli/src/commands/get.command.ts

@@ -13,6 +13,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EventType } from "@bitwarden/common/enums";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CardExport } from "@bitwarden/common/models/export/card.export";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
@@ -23,7 +24,6 @@ import { LoginUriExport } from "@bitwarden/common/models/export/login-uri.export
 import { LoginExport } from "@bitwarden/common/models/export/login.export";
 import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";

apps/cli/src/platform/services/node-env-secure-storage.service.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { throwError } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

apps/cli/src/service-container/service-container.ts

@@ -61,6 +61,8 @@ import {
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { ClientType } from "@bitwarden/common/enums";
+import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
+import { FallbackBulkEncryptService } from "@bitwarden/common/key-management/crypto/services/fallback-bulk-encrypt.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
@@ -83,8 +85,6 @@ import { AppIdService } from "@bitwarden/common/platform/services/app-id.service
 import { ConfigApiService } from "@bitwarden/common/platform/services/config/config-api.service";
 import { DefaultConfigService } from "@bitwarden/common/platform/services/config/default-config.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
-import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
-import { FallbackBulkEncryptService } from "@bitwarden/common/platform/services/cryptography/fallback-bulk-encrypt.service";
 import { DefaultEnvironmentService } from "@bitwarden/common/platform/services/default-environment.service";
 import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service";
 import { KeyGenerationService } from "@bitwarden/common/platform/services/key-generation.service";
@@ -151,7 +151,7 @@ import {
   ImportApiServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
-} from "@bitwarden/importer/core";
+} from "@bitwarden/importer-core";
 import {
   DefaultKdfConfigService,
   KdfConfigService,

apps/cli/src/tools/import.command.ts

@@ -11,7 +11,7 @@ import {
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { ImportServiceAbstraction, ImportType } from "@bitwarden/importer/core";
+import { ImportServiceAbstraction, ImportType } from "@bitwarden/importer-core";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/message.response";

apps/cli/src/tools/send/commands/get.command.ts

@@ -5,7 +5,7 @@ import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";

apps/cli/src/tools/send/commands/receive.command.ts

@@ -5,9 +5,9 @@ import * as inquirer from "inquirer";
 import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

apps/cli/src/vault/create.command.ts

@@ -11,10 +11,10 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
 import { FolderExport } from "@bitwarden/common/models/export/folder.export";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";

apps/cli/tsconfig.json

@@ -17,7 +17,7 @@
       "@bitwarden/auth/common": ["../../libs/auth/src/common"],
       "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],

apps/desktop/native-messaging-test-runner/src/native-message.service.ts

@@ -3,11 +3,11 @@ import "module-alias/register";
 
 import { v4 as uuidv4 } from "uuid";
 
+import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
 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";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
-import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
 import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service";
 
 // eslint-disable-next-line no-restricted-imports

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

@@ -54,7 +54,6 @@ import { InternalFolderService } from "@bitwarden/common/vault/abstractions/fold
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { DialogService, ToastOptions, ToastService } from "@bitwarden/components";
 import { CredentialGeneratorHistoryDialogComponent } from "@bitwarden/generator-components";
-import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 
 import { DeleteAccountComponent } from "../auth/delete-account.component";
@@ -65,9 +64,7 @@ import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.compo
 import { SettingsComponent } from "./accounts/settings.component";
 import { ExportDesktopComponent } from "./tools/export/export-desktop.component";
 import { CredentialGeneratorComponent } from "./tools/generator/credential-generator.component";
-import { GeneratorComponent } from "./tools/generator.component";
 import { ImportDesktopComponent } from "./tools/import/import-desktop.component";
-import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component";
 
 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
@@ -126,7 +123,6 @@ export class AppComponent implements OnInit, OnDestroy {
     private broadcasterService: BroadcasterService,
     private folderService: InternalFolderService,
     private syncService: SyncService,
-    private passwordGenerationService: PasswordGenerationServiceAbstraction,
     private cipherService: CipherService,
     private authService: AuthService,
     private router: Router,
@@ -508,41 +504,13 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   async openGenerator() {
-    const isGeneratorSwapEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.GeneratorToolsModernization,
-    );
-    if (isGeneratorSwapEnabled) {
-      await this.dialogService.open(CredentialGeneratorComponent);
-      return;
-    }
-
-    this.modalService.closeAll();
-
-    [this.modal] = await this.modalService.openViewRef(
-      GeneratorComponent,
-      this.generatorModalRef,
-      (comp) => (comp.comingFromAddEdit = false),
-    );
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    this.modal.onClosed.subscribe(() => {
-      this.modal = null;
-    });
+    await this.dialogService.open(CredentialGeneratorComponent);
+    return;
   }
 
   async openGeneratorHistory() {
-    const isGeneratorSwapEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.GeneratorToolsModernization,
-    );
-    if (isGeneratorSwapEnabled) {
-      await this.dialogService.open(CredentialGeneratorHistoryDialogComponent);
-      return;
-    }
-
-    await this.openModal<PasswordGeneratorHistoryComponent>(
-      PasswordGeneratorHistoryComponent,
-      this.passwordHistoryRef,
-    );
+    await this.dialogService.open(CredentialGeneratorHistoryDialogComponent);
+    return;
   }
 
   private async updateAppMenu() {

apps/desktop/src/app/app.module.ts

@@ -47,8 +47,6 @@ import { HeaderComponent } from "./layout/header.component";
 import { NavComponent } from "./layout/nav.component";
 import { SearchComponent } from "./layout/search/search.component";
 import { SharedModule } from "./shared/shared.module";
-import { GeneratorComponent } from "./tools/generator.component";
-import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component";
 import { AddEditComponent as SendAddEditComponent } from "./tools/send/add-edit.component";
 import { SendComponent } from "./tools/send/send.component";
 
@@ -80,8 +78,6 @@ import { SendComponent } from "./tools/send/send.component";
     HeaderComponent,
     HintComponent,
     NavComponent,
-    GeneratorComponent,
-    PasswordGeneratorHistoryComponent,
     PasswordHistoryComponent,
     PremiumComponent,
     RegisterComponent,

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

@@ -7,7 +7,7 @@ import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";

apps/desktop/src/app/services/services.module.ts

@@ -50,10 +50,10 @@ import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DefaultProcessReloadService } from "@bitwarden/common/key-management/services/default-process-reload.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-authenticator.service.abstraction";
 import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-user-interface.service.abstraction";

apps/desktop/src/app/tools/generator.component.html

@@ -1,636 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="generatorTitle">
-  <div class="modal-dialog modal-md" role="document">
-    <div class="modal-content">
-      <div class="modal-body">
-        <h1 class="modal-title" id="generatorTitle">
-          {{ "generator" | i18n }}
-        </h1>
-        <bit-callout
-          type="info"
-          *ngIf="enforcedPasswordPolicyOptions?.inEffect() && type === 'password'"
-        >
-          {{ "passwordGeneratorPolicyInEffect" | i18n }}
-        </bit-callout>
-        <div class="generated-block" *ngIf="type === 'password'">
-          <div
-            class="generated-wrapper"
-            [innerHTML]="password | colorPassword"
-            [appCopyText]="password"
-          ></div>
-          <div class="action-buttons">
-            <button
-              type="button"
-              class="icon-btn primary"
-              appStopClick
-              appA11yTitle="{{ 'copyPassword' | i18n }}"
-              (click)="copy()"
-            >
-              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-            </button>
-            <button
-              type="button"
-              class="icon-btn primary"
-              appStopClick
-              appA11yTitle="{{ 'regeneratePassword' | i18n }}"
-              (click)="regenerate()"
-            >
-              <i class="bwi bwi-lg bwi-generate" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-        <div class="generated-block" *ngIf="type === 'username'">
-          <div
-            class="generated-wrapper"
-            [innerHTML]="username | colorPassword"
-            [appCopyText]="username"
-          ></div>
-          <div class="action-buttons" #form [appApiAction]="usernameGeneratingPromise">
-            <button
-              type="button"
-              class="icon-btn primary"
-              appStopClick
-              appA11yTitle="{{ 'copyUsername' | i18n }}"
-              (click)="copy()"
-            >
-              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-            </button>
-            <button
-              type="button"
-              class="icon-btn primary"
-              appStopClick
-              appA11yTitle="{{ 'regenerateUsername' | i18n }}"
-              (click)="$any(form).loading ? false : regenerate()"
-              [attr.aria-disabled]="$any(form).loading ? 'true' : null"
-            >
-              <i
-                class="bwi bwi-lg bwi-generate"
-                [ngClass]="$any(form).loading ? 'bwi-spin' : ''"
-                aria-hidden="true"
-              ></i>
-            </button>
-          </div>
-        </div>
-        <div class="box" *ngIf="!comingFromAddEdit">
-          <div class="box-content condensed">
-            <div
-              class="box-content-row box-content-row-radio"
-              role="radiogroup"
-              aria-labelledby="typeHeading"
-            >
-              <label id="typeHeading" class="radio-header">{{
-                "whatWouldYouLikeToGenerate" | i18n
-              }}</label>
-              <div
-                class="radio-group text-default"
-                appBoxRow
-                name="TypeOptions"
-                *ngFor="let o of typeOptions"
-              >
-                <input
-                  type="radio"
-                  class="radio"
-                  [(ngModel)]="type"
-                  name="Type"
-                  id="type_{{ o.value }}"
-                  [value]="o.value"
-                  (change)="typeChanged()"
-                  [checked]="type === o.value"
-                />
-                <label class="unstyled" for="type_{{ o.value }}">
-                  {{ o.name }}
-                </label>
-              </div>
-            </div>
-          </div>
-        </div>
-        <ng-container *ngIf="type === 'password'">
-          <div class="box">
-            <h2 class="box-header">
-              <button type="button" (click)="toggleOptions()" [attr.aria-expanded]="showOptions">
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-angle-right': !showOptions, 'bwi-angle-down': showOptions }"
-                ></i>
-                {{ "options" | i18n }}
-              </button>
-            </h2>
-            <div class="box-content condensed" [hidden]="!showOptions">
-              <div
-                class="box-content-row box-content-row-radio"
-                role="radiogroup"
-                aria-labelledby="passwordTypeHeading"
-              >
-                <label id="passwordTypeHeading" class="radio-header">{{
-                  "passwordType" | i18n
-                }}</label>
-                <div
-                  class="radio-group text-default"
-                  appBoxRow
-                  name="PassTypeOptions"
-                  *ngFor="let o of passTypeOptions"
-                >
-                  <input
-                    type="radio"
-                    class="radio"
-                    [(ngModel)]="passwordOptions.type"
-                    name="PasswordType"
-                    id="passwordType_{{ o.value }}"
-                    [value]="o.value"
-                    (change)="savePasswordOptions()"
-                    [checked]="passwordOptions.type === o.value"
-                  />
-                  <label class="unstyled" for="passwordType_{{ o.value }}">
-                    {{ o.name }}
-                  </label>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="box" [hidden]="!showOptions" *ngIf="passwordOptions.type === 'passphrase'">
-            <div class="box-content condensed">
-              <div class="box-content-row box-content-row-input" appBoxRow>
-                <label for="num-words">{{ "numWords" | i18n }}</label>
-                <input
-                  id="num-words"
-                  type="number"
-                  min="3"
-                  max="20"
-                  (change)="savePasswordOptions()"
-                  [(ngModel)]="passwordOptions.numWords"
-                />
-              </div>
-              <div class="box-content-row box-content-row-input" appBoxRow>
-                <label for="word-separator">{{ "wordSeparator" | i18n }}</label>
-                <input
-                  id="word-separator"
-                  type="text"
-                  maxlength="1"
-                  (input)="savePasswordOptions()"
-                  [(ngModel)]="passwordOptions.wordSeparator"
-                />
-              </div>
-              <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                <label for="capitalize">{{ "capitalize" | i18n }}</label>
-                <input
-                  id="capitalize"
-                  type="checkbox"
-                  (change)="savePasswordOptions()"
-                  [(ngModel)]="passwordOptions.capitalize"
-                  [disabled]="enforcedPasswordPolicyOptions?.capitalize"
-                />
-              </div>
-              <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                <label for="include-number">{{ "includeNumber" | i18n }}</label>
-                <input
-                  id="include-number"
-                  type="checkbox"
-                  (change)="savePasswordOptions()"
-                  [(ngModel)]="passwordOptions.includeNumber"
-                  [disabled]="enforcedPasswordPolicyOptions?.includeNumber"
-                />
-              </div>
-            </div>
-          </div>
-          <ng-container *ngIf="passwordOptions.type === 'password'">
-            <div class="box" [hidden]="!showOptions">
-              <div class="box-content condensed">
-                <div class="box-content-row box-content-row-slider" appBoxRow>
-                  <label for="length">{{ "length" | i18n }}</label>
-                  <input
-                    id="length"
-                    type="number"
-                    [min]="passwordOptions.minLength"
-                    max="128"
-                    [(ngModel)]="passwordOptions.length"
-                    (blur)="savePasswordOptions()"
-                  />
-                  <input
-                    id="lengthRange"
-                    type="range"
-                    [min]="passwordOptions.minLength"
-                    max="128"
-                    step="1"
-                    [(ngModel)]="passwordOptions.length"
-                    (change)="sliderChanged()"
-                    (input)="sliderInput()"
-                    attr.aria-label="{{ 'length' | i18n }}"
-                    tabindex="-1"
-                  />
-                </div>
-                <div class="box-content-row" appBoxRow>
-                  <span>{{ "passwordMinLength" | i18n }}</span>
-                  <span class="txt-right">{{ passwordOptions.minLength }}</span>
-                  <span
-                    class="sr-only"
-                    attr.aria-label="{{ 'passwordMinLength' | i18n }}"
-                    role="status"
-                    aria-live="polite"
-                  >
-                    {{ passwordOptionsMinLengthForReader$ | async }}
-                  </span>
-                </div>
-                <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                  <label for="uppercase">A-Z</label>
-                  <input
-                    id="uppercase"
-                    type="checkbox"
-                    (change)="savePasswordOptions()"
-                    [disabled]="enforcedPasswordPolicyOptions?.useUppercase"
-                    [(ngModel)]="passwordOptions.uppercase"
-                    attr.aria-label="{{ 'uppercase' | i18n }}"
-                  />
-                </div>
-                <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                  <label for="lowercase">a-z</label>
-                  <input
-                    id="lowercase"
-                    type="checkbox"
-                    (change)="savePasswordOptions()"
-                    [disabled]="enforcedPasswordPolicyOptions?.useLowercase"
-                    [(ngModel)]="passwordOptions.lowercase"
-                    attr.aria-label="{{ 'lowercase' | i18n }}"
-                  />
-                </div>
-                <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                  <label for="numbers">0-9</label>
-                  <input
-                    id="numbers"
-                    type="checkbox"
-                    (change)="savePasswordOptions()"
-                    [disabled]="enforcedPasswordPolicyOptions?.useNumbers"
-                    [ngModel]="passwordOptions.number"
-                    (ngModelChange)="setPasswordOptionsNumber($event)"
-                    attr.aria-label="{{ 'numbers' | i18n }}"
-                  />
-                </div>
-                <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                  <label for="special">!&#64;#$%^&*</label>
-                  <input
-                    id="special"
-                    type="checkbox"
-                    (change)="savePasswordOptions()"
-                    [disabled]="enforcedPasswordPolicyOptions?.useSpecial"
-                    [ngModel]="passwordOptions.special"
-                    (ngModelChange)="setPasswordOptionsSpecial($event)"
-                    attr.aria-label="{{ 'specialCharacters' | i18n }}"
-                  />
-                </div>
-              </div>
-            </div>
-            <div class="box" [hidden]="!showOptions">
-              <div class="box-content condensed">
-                <div class="box-content-row box-content-row-input" appBoxRow>
-                  <label for="min-number">{{ "minNumbers" | i18n }}</label>
-                  <input
-                    id="min-number"
-                    type="number"
-                    min="0"
-                    max="9"
-                    (change)="savePasswordOptions()"
-                    [(ngModel)]="passwordOptions.minNumber"
-                    (input)="onPasswordOptionsMinNumberInput($event)"
-                  />
-                </div>
-                <div class="box-content-row box-content-row-input" appBoxRow>
-                  <label for="min-special">{{ "minSpecial" | i18n }}</label>
-                  <input
-                    id="min-special"
-                    type="number"
-                    min="0"
-                    max="9"
-                    (change)="savePasswordOptions()"
-                    [(ngModel)]="passwordOptions.minSpecial"
-                    (input)="onPasswordOptionsMinSpecialInput($event)"
-                  />
-                </div>
-                <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                  <label for="ambiguous">{{ "ambiguous" | i18n }}</label>
-                  <input
-                    id="ambiguous"
-                    type="checkbox"
-                    (change)="savePasswordOptions()"
-                    [(ngModel)]="avoidAmbiguous"
-                  />
-                </div>
-              </div>
-            </div>
-          </ng-container>
-        </ng-container>
-        <ng-container *ngIf="type === 'username'">
-          <div class="box">
-            <h2 class="box-header">
-              <button type="button" (click)="toggleOptions()" [attr.aria-expanded]="showOptions">
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-angle-right': !showOptions, 'bwi-angle-down': showOptions }"
-                ></i>
-                {{ "options" | i18n }}
-              </button>
-            </h2>
-            <div class="box-content condensed" [hidden]="!showOptions">
-              <div
-                class="box-content-row box-content-row-radio"
-                role="radiogroup"
-                aria-labelledby="usernameTypeHeading"
-              >
-                <label id="usernameTypeHeading" class="radio-header">
-                  {{ "usernameType" | i18n }}
-                  <a
-                    href="#"
-                    appStopClick
-                    (click)="usernameTypesLearnMore()"
-                    appA11yTitle="{{ 'learnMore' | i18n }}"
-                  >
-                    <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-                  </a>
-                </label>
-                <div
-                  class="radio-group align-start text-default"
-                  appBoxRow
-                  name="UsernameTypeOptions"
-                  *ngFor="let o of usernameTypeOptions"
-                >
-                  <input
-                    type="radio"
-                    class="radio"
-                    [(ngModel)]="usernameOptions.type"
-                    name="UsernameType"
-                    id="usernameType_{{ o.value }}"
-                    [value]="o.value"
-                    (change)="saveUsernameOptions()"
-                    [checked]="usernameOptions.type === o.value"
-                  />
-                  <label class="unstyled" for="usernameType_{{ o.value }}">
-                    {{ o.name }}
-                    <small class="help-block" *ngIf="o.desc">{{ o.desc }}</small>
-                  </label>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="box" *ngIf="usernameOptions.type === 'forwarded'" [hidden]="!showOptions">
-            <div class="box-content condensed">
-              <div class="box-content-row" role="listbox" aria-labelledby="forwardTypeHeading">
-                <label id="forwardTypeHeading">{{ "service" | i18n }}</label>
-                <select
-                  id="ForwardTypeDropdown"
-                  name="ForwardType"
-                  [(ngModel)]="usernameOptions.forwardedService"
-                  (change)="saveUsernameOptions()"
-                >
-                  <option *ngFor="let o of forwardOptions" [ngValue]="o.value" role="option">
-                    {{ o.name }}
-                  </option>
-                </select>
-              </div>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'simplelogin'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="simplelogin-apikey">{{ "apiKey" | i18n }}</label>
-                  <input
-                    id="simplelogin-apikey"
-                    type="password"
-                    name="SimpleLoginApiKey"
-                    [(ngModel)]="usernameOptions.forwardedSimpleLoginApiKey"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-                <div class="box-content-row" appBoxRow>
-                  <label for="simplelogin-baseUrl">{{ "baseUrl" | i18n }}</label>
-                  <input
-                    id="simplelogin-baseUrl"
-                    type="text"
-                    name="SimpleLoginDomain"
-                    [(ngModel)]="usernameOptions.forwardedSimpleLoginBaseUrl"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'duckduckgo'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="duckduckgo-apikey">{{ "apiKey" | i18n }}</label>
-                  <input
-                    id="duckduckgo-apikey"
-                    type="password"
-                    name="DuckDuckGoApiKey"
-                    [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'anonaddy'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="anonaddy-accessToken">{{ "apiAccessToken" | i18n }}</label>
-                  <input
-                    id="anonaddy-accessToken"
-                    type="password"
-                    name="AnonAddyAccessToken"
-                    [(ngModel)]="usernameOptions.forwardedAnonAddyApiToken"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-                <div class="box-content-row" appBoxRow>
-                  <label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
-                  <input
-                    id="anonaddy-domain"
-                    type="text"
-                    name="AnonAddyDomain"
-                    [(ngModel)]="usernameOptions.forwardedAnonAddyDomain"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-                <div class="box-content-row" appBoxRow>
-                  <label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
-                  <input
-                    id="anonaddy-baseUrl"
-                    type="text"
-                    name="AnonAddyDomain"
-                    [(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="firefox-apikey">{{ "apiAccessToken" | i18n }}</label>
-                  <input
-                    id="firefox-apikey"
-                    type="password"
-                    name="FirefoxApiKey"
-                    [(ngModel)]="usernameOptions.forwardedFirefoxApiToken"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'fastmail'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="fastmail-apiToken">{{ "apiAccessToken" | i18n }}</label>
-                  <input
-                    id="fastmail-apiToken"
-                    type="password"
-                    name="FastmailApiToken"
-                    [(ngModel)]="usernameOptions.forwardedFastmailApiToken"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-              <ng-container *ngIf="usernameOptions.forwardedService === 'forwardemail'">
-                <div class="box-content-row" appBoxRow>
-                  <label for="forwardemail-accessToken">{{ "apiAccessToken" | i18n }}</label>
-                  <input
-                    id="forwardemail-accessToken"
-                    type="password"
-                    name="ForwardEmailAccessToken"
-                    [(ngModel)]="usernameOptions.forwardedForwardEmailApiToken"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-                <div class="box-content-row" appBoxRow>
-                  <label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
-                  <input
-                    id="forwardemail-domain"
-                    type="text"
-                    name="ForwardEmailDomain"
-                    [(ngModel)]="usernameOptions.forwardedForwardEmailDomain"
-                    (blur)="saveUsernameOptions()"
-                  />
-                </div>
-              </ng-container>
-            </div>
-          </div>
-          <div class="box" *ngIf="usernameOptions.type === 'subaddress'" [hidden]="!showOptions">
-            <div class="box-content condensed">
-              <div class="box-content-row" appBoxRow>
-                <label for="subaddress-email">{{ "emailAddress" | i18n }}</label>
-                <input
-                  id="subaddress-email"
-                  type="text"
-                  name="SubaddressEmail"
-                  [(ngModel)]="usernameOptions.subaddressEmail"
-                  (blur)="saveUsernameOptions()"
-                />
-              </div>
-              <div
-                class="box-content-row"
-                role="radiogroup"
-                aria-labelledby="subaddressTypeHeading"
-                *ngIf="subaddressOptions.length > 1"
-              >
-                <label id="subaddressTypeHeading" class="radio-header">{{ "type" | i18n }}</label>
-                <div class="radio-group text-default" appBoxRow *ngFor="let o of subaddressOptions">
-                  <input
-                    type="radio"
-                    [(ngModel)]="usernameOptions.subaddressType"
-                    name="SubaddressType"
-                    id="subaddresstype_{{ o.value }}"
-                    [value]="o.value"
-                    (change)="saveUsernameOptions()"
-                    [checked]="usernameOptions.subaddressType === o.value"
-                  />
-                  <label for="subaddresstype_{{ o.value }}">
-                    {{ o.name }}
-                  </label>
-                </div>
-              </div>
-              <div class="box-content-row" appBoxRow *ngIf="usernameWebsite">
-                <label for="subaddress-website">{{ "website" | i18n }}</label>
-                <input
-                  id="subaddress-website"
-                  type="text"
-                  name="SubaddressWebsite"
-                  [value]="usernameOptions.website"
-                  disabled
-                  readonly
-                />
-              </div>
-            </div>
-          </div>
-          <div class="box" *ngIf="usernameOptions.type === 'catchall'" [hidden]="!showOptions">
-            <div class="box-content condensed">
-              <div class="box-content-row" appBoxRow>
-                <label for="catchall-domain">{{ "domainName" | i18n }}</label>
-                <input
-                  id="catchall-domain"
-                  type="text"
-                  name="CatchallDomain"
-                  [(ngModel)]="usernameOptions.catchallDomain"
-                  (blur)="saveUsernameOptions()"
-                />
-              </div>
-              <div
-                class="box-content-row"
-                role="radiogroup"
-                aria-labelledby="catchallTypeHeading"
-                *ngIf="catchallOptions.length > 1"
-              >
-                <label id="catchallTypeHeading" class="radio-header">{{ "type" | i18n }}</label>
-                <div class="radio-group text-default" appBoxRow *ngFor="let o of catchallOptions">
-                  <input
-                    type="radio"
-                    [(ngModel)]="usernameOptions.catchallType"
-                    name="CatchallType"
-                    id="catchalltype_{{ o.value }}"
-                    [value]="o.value"
-                    (change)="saveUsernameOptions()"
-                    [checked]="usernameOptions.catchallType === o.value"
-                  />
-                  <label for="catchalltype_{{ o.value }}">
-                    {{ o.name }}
-                  </label>
-                </div>
-              </div>
-              <div class="box-content-row" appBoxRow *ngIf="usernameWebsite">
-                <label for="catchall-website">{{ "website" | i18n }}</label>
-                <input
-                  id="catchall-website"
-                  type="text"
-                  name="CatchallWebsite"
-                  [value]="usernameOptions.website"
-                  disabled
-                  readonly
-                />
-              </div>
-            </div>
-          </div>
-          <div class="box" *ngIf="usernameOptions.type === 'word'" [hidden]="!showOptions">
-            <div class="box-content condensed">
-              <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                <label for="capitalize">{{ "capitalize" | i18n }}</label>
-                <input
-                  id="capitalize"
-                  type="checkbox"
-                  (change)="saveUsernameOptions()"
-                  [(ngModel)]="usernameOptions.wordCapitalize"
-                />
-              </div>
-              <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                <label for="include-number">{{ "includeNumber" | i18n }}</label>
-                <input
-                  id="include-number"
-                  type="checkbox"
-                  (change)="saveUsernameOptions()"
-                  [(ngModel)]="usernameOptions.wordIncludeNumber"
-                />
-              </div>
-            </div>
-          </div>
-        </ng-container>
-      </div>
-      <div class="modal-footer">
-        <button
-          type="button"
-          class="primary"
-          *ngIf="comingFromAddEdit"
-          (click)="select()"
-          appA11yTitle="{{ 'select' | i18n }}"
-        >
-          <i class="bwi bwi-lg bwi-fw bwi-check" aria-hidden="true"></i>
-        </button>
-        <button type="button" data-dismiss="modal">
-          {{ (comingFromAddEdit ? "cancel" : "close") | i18n }}
-        </button>
-      </div>
-    </div>
-  </div>
-</div>

apps/desktop/src/app/tools/generator.component.spec.ts

@@ -1,90 +0,0 @@
-import { NO_ERRORS_SCHEMA } from "@angular/core";
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ActivatedRoute } from "@angular/router";
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { ToastService } from "@bitwarden/components";
-import {
-  PasswordGenerationServiceAbstraction,
-  UsernameGenerationServiceAbstraction,
-} from "@bitwarden/generator-legacy";
-
-import { GeneratorComponent } from "./generator.component";
-
-describe("GeneratorComponent", () => {
-  let component: GeneratorComponent;
-  let fixture: ComponentFixture<GeneratorComponent>;
-  let platformUtilsServiceMock: MockProxy<PlatformUtilsService>;
-
-  beforeEach(() => {
-    platformUtilsServiceMock = mock<PlatformUtilsService>();
-
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.configureTestingModule({
-      declarations: [GeneratorComponent, I18nPipe],
-      providers: [
-        {
-          provide: PasswordGenerationServiceAbstraction,
-          useValue: mock<PasswordGenerationServiceAbstraction>(),
-        },
-        {
-          provide: UsernameGenerationServiceAbstraction,
-          useValue: mock<UsernameGenerationServiceAbstraction>(),
-        },
-        {
-          provide: PlatformUtilsService,
-          useValue: platformUtilsServiceMock,
-        },
-        {
-          provide: I18nService,
-          useValue: mock<I18nService>(),
-        },
-        {
-          provide: ActivatedRoute,
-          useValue: mock<ActivatedRoute>(),
-        },
-        {
-          provide: LogService,
-          useValue: mock<LogService>(),
-        },
-        {
-          provide: CipherService,
-          useValue: mock<CipherService>(),
-        },
-        {
-          provide: AccountService,
-          useValue: mock<AccountService>(),
-        },
-        {
-          provide: ToastService,
-          useValue: mock<ToastService>(),
-        },
-      ],
-      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GeneratorComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-
-  describe("usernameTypesLearnMore()", () => {
-    it("should call platformUtilsService.launchUri() once", () => {
-      component.usernameTypesLearnMore();
-      expect(platformUtilsServiceMock.launchUri).toHaveBeenCalledTimes(1);
-    });
-  });
-});

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

@@ -1,48 +0,0 @@
-import { Component, NgZone } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-
-import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.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 { ToastService } from "@bitwarden/components";
-import {
-  PasswordGenerationServiceAbstraction,
-  UsernameGenerationServiceAbstraction,
-} from "@bitwarden/generator-legacy";
-
-@Component({
-  selector: "app-generator",
-  templateUrl: "generator.component.html",
-})
-export class GeneratorComponent extends BaseGeneratorComponent {
-  constructor(
-    passwordGenerationService: PasswordGenerationServiceAbstraction,
-    usernameGenerationService: UsernameGenerationServiceAbstraction,
-    accountService: AccountService,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    route: ActivatedRoute,
-    ngZone: NgZone,
-    logService: LogService,
-    toastService: ToastService,
-  ) {
-    super(
-      passwordGenerationService,
-      usernameGenerationService,
-      platformUtilsService,
-      accountService,
-      i18nService,
-      logService,
-      route,
-      ngZone,
-      window,
-      toastService,
-    );
-  }
-
-  usernameTypesLearnMore() {
-    this.platformUtilsService.launchUri("https://bitwarden.com/help/generator/#username-types");
-  }
-}

apps/desktop/src/app/tools/password-generator-history.component.html

@@ -1,52 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header" id="passwordGenHistoryTitle">
-            {{ "passwordHistory" | i18n }}
-          </h1>
-          <div class="box-content condensed">
-            <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
-              <div class="row-main">
-                <div
-                  class="password-wrapper monospaced"
-                  [appCopyText]="h.password"
-                  [innerHTML]="h.password | colorPassword"
-                ></div>
-                <span class="detail">{{ h.date | date: "medium" }}</span>
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'copyPassword' | i18n }}"
-                  (click)="copy(h.password)"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row" *ngIf="!history.length">
-              {{ "noPasswordsInList" | i18n }}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" data-dismiss="modal">{{ "close" | i18n }}</button>
-        <div class="right">
-          <button
-            type="button"
-            (click)="clear()"
-            class="danger"
-            appA11yTitle="{{ 'clear' | i18n }}"
-          >
-            <i class="bwi bwi-trash bwi-lg bwi-fw" aria-hidden="true"></i>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

apps/desktop/src/app/tools/password-generator-history.component.ts

@@ -1,22 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/tools/generator/components/password-generator-history.component";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
-
-@Component({
-  selector: "app-password-generator-history",
-  templateUrl: "password-generator-history.component.html",
-})
-export class PasswordGeneratorHistoryComponent extends BasePasswordGeneratorHistoryComponent {
-  constructor(
-    passwordGenerationService: PasswordGenerationServiceAbstraction,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    toastService: ToastService,
-  ) {
-    super(passwordGenerationService, platformUtilsService, i18nService, window, toastService);
-  }
-}

apps/desktop/src/auth/set-password.component.ts

@@ -11,8 +11,8 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.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";

apps/desktop/src/platform/services/electron-key.service.ts

@@ -3,8 +3,8 @@
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";

apps/desktop/src/scss/base.scss

@@ -66,9 +66,9 @@ a {
   }
 }
 
-input,
+input:not(bit-form-field input),
 select,
-textarea {
+textarea:not(bit-form-field textarea) {
   @include themify($themes) {
     color: themed("textColor");
     background-color: themed("inputBackgroundColor");

apps/desktop/src/scss/misc.scss

@@ -188,44 +188,6 @@ p.lead {
   }
 }
 
-.generated-block {
-  font-size: $font-size-large;
-  font-family: $font-family-monospace;
-  padding: 8px 10px 8px 0;
-  display: flex;
-  border-radius: $border-radius;
-  border: 1px solid;
-
-  @include themify($themes) {
-    background-color: transparent;
-    border-color: themed("borderColorAlt");
-  }
-
-  .modal-body & {
-    margin-top: 10px;
-  }
-
-  .generated-wrapper {
-    text-align: left;
-    width: 100%;
-    min-width: 0;
-    white-space: pre-wrap;
-    word-break: break-all;
-    padding: 15px;
-  }
-
-  .action-buttons {
-    display: flex;
-    align-self: center;
-    height: 100%;
-    margin-left: 10px;
-
-    button {
-      margin-left: 10px;
-    }
-  }
-}
-
 .password-wrapper {
   overflow-wrap: break-word;
   white-space: pre-wrap;

apps/desktop/src/services/biometric-message-handler.service.spec.ts

@@ -5,8 +5,8 @@ import { of } from "rxjs";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 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 { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

apps/desktop/src/services/biometric-message-handler.service.ts

@@ -6,8 +6,8 @@ import { combineLatest, concatMap, firstValueFrom, map } from "rxjs";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.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";

apps/desktop/src/services/duckduckgo-message-handler.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

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

@@ -4,7 +4,7 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/ang
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.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";

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

@@ -39,8 +39,8 @@
     (onCancelled)="cancelledAddEdit($event)"
     (onShareCipher)="shareCipher($event)"
     (onEditCollections)="cipherCollections($event)"
-    (onGeneratePassword)="openGenerator(true, true)"
-    (onGenerateUsername)="openGenerator(true, false)"
+    (onGeneratePassword)="openGenerator(true)"
+    (onGenerateUsername)="openGenerator(false)"
   >
   </app-vault-add-edit>
   <div

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

@@ -21,7 +21,6 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -39,7 +38,6 @@ import { DialogService, ToastService } from "@bitwarden/components";
 import { DecryptionFailureDialogComponent, PasswordRepromptService } from "@bitwarden/vault";
 
 import { SearchBarService } from "../../../app/layout/search/search-bar.service";
-import { GeneratorComponent } from "../../../app/tools/generator.component";
 import { invokeMenu, RendererMenuItem } from "../../../utils";
 
 import { AddEditComponent } from "./add-edit.component";
@@ -666,65 +664,21 @@ export class VaultComponent implements OnInit, OnDestroy {
     return "searchVault";
   }
 
-  async openGenerator(comingFromAddEdit: boolean, passwordType = true) {
-    const isGeneratorSwapEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.GeneratorToolsModernization,
-    );
-
-    if (isGeneratorSwapEnabled) {
-      CredentialGeneratorDialogComponent.open(this.dialogService, {
-        onCredentialGenerated: (value?: string) => {
-          if (this.addEditComponent != null) {
-            this.addEditComponent.markPasswordAsDirty();
-            if (passwordType) {
-              this.addEditComponent.cipher.login.password = value ?? "";
-            } else {
-              this.addEditComponent.cipher.login.username = value ?? "";
-            }
-          }
-        },
-        type: passwordType ? "password" : "username",
-      });
-      return;
-    }
-
-    // TODO: Legacy code below, remove once the new generator is fully implemented
-    // https://bitwarden.atlassian.net/browse/PM-7121
-    const cipher = this.addEditComponent?.cipher;
-    const loginType = cipher != null && cipher.type === CipherType.Login && cipher.login != null;
-
-    const [modal, childComponent] = await this.modalService.openViewRef(
-      GeneratorComponent,
-      this.generatorModalRef,
-      (comp) => {
-        comp.comingFromAddEdit = comingFromAddEdit;
-        if (comingFromAddEdit) {
-          comp.type = passwordType ? "password" : "username";
-          if (loginType && cipher.login.hasUris && cipher.login.uris[0].hostname != null) {
-            comp.usernameWebsite = cipher.login.uris[0].hostname;
+  async openGenerator(passwordType = true) {
+    CredentialGeneratorDialogComponent.open(this.dialogService, {
+      onCredentialGenerated: (value?: string) => {
+        if (this.addEditComponent != null) {
+          this.addEditComponent.markPasswordAsDirty();
+          if (passwordType) {
+            this.addEditComponent.cipher.login.password = value ?? "";
+          } else {
+            this.addEditComponent.cipher.login.username = value ?? "";
           }
         }
       },
-    );
-    this.modal = modal;
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    childComponent.onSelected.subscribe((value: string) => {
-      this.modal.close();
-      if (loginType) {
-        this.addEditComponent.markPasswordAsDirty();
-        if (passwordType) {
-          this.addEditComponent.cipher.login.password = value;
-        } else {
-          this.addEditComponent.cipher.login.username = value;
-        }
-      }
-    });
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    this.modal.onClosed.subscribe(() => {
-      this.modal = null;
+      type: passwordType ? "password" : "username",
     });
+    return;
   }
 
   async addFolder() {

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

@@ -17,8 +17,8 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.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";

apps/desktop/tsconfig.json

@@ -22,7 +22,7 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
       "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
@@ -48,5 +48,5 @@
     "strictTemplates": true,
     "preserveWhitespaces": true
   },
-  "include": ["src", "../../libs/common/src/platform/services/**/*.worker.ts"]
+  "include": ["src", "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts"]
 }

apps/web/src/app/admin-console/organizations/members/components/bulk/base-bulk-confirm.component.ts

@@ -8,8 +8,8 @@ import {
 } from "@bitwarden/admin-console/common";
 import { ProviderUserBulkPublicKeyResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk-public-key.response";
 import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk.response";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";

apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts

@@ -14,8 +14,8 @@ import {
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { ProviderUserBulkPublicKeyResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk-public-key.response";
 import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk.response";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { StateProvider } from "@bitwarden/common/platform/state";

apps/web/src/app/admin-console/organizations/members/members.component.ts

@@ -46,8 +46,8 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { isNotSelfUpgradable, ProductTierType } from "@bitwarden/common/billing/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";

apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts

@@ -11,7 +11,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 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 { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";

apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts

@@ -10,7 +10,7 @@ import {
 } from "@bitwarden/admin-console/common";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";

apps/web/src/app/admin-console/organizations/settings/org-import.component.ts

@@ -11,8 +11,8 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ImportCollectionServiceAbstraction } from "@bitwarden/importer/core";
 import { ImportComponent } from "@bitwarden/importer/ui";
+import { ImportCollectionServiceAbstraction } from "@bitwarden/importer-core";
 
 import { LooseComponentsModule, SharedModule } from "../../../shared";
 import { ImportCollectionAdminService } from "../../../tools/import/import-collection-admin.service";

apps/web/src/app/auth/core/services/rotateable-key-set.service.spec.ts

@@ -1,7 +1,7 @@
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

apps/web/src/app/auth/core/services/rotateable-key-set.service.ts

@@ -1,7 +1,7 @@
 import { inject, Injectable } from "@angular/core";
 
 import { RotateableKeySet } from "@bitwarden/auth/common";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts

@@ -4,11 +4,11 @@ import { MockProxy } from "jest-mock-extended";
 import mock from "jest-mock-extended/lib/Mock";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BulkEncryptService } from "@bitwarden/common/key-management/crypto/abstractions/bulk-encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { UserKeyResponse } from "@bitwarden/common/models/response/user-key.response";
-import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";

apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts

@@ -6,9 +6,9 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
+import { BulkEncryptService } from "@bitwarden/common/key-management/crypto/abstractions/bulk-encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";

apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts

@@ -12,7 +12,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/reset-password-policy-options";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { FakeGlobalState } from "@bitwarden/common/spec/fake-state";

apps/web/src/app/auth/organization-invite/accept-organization.service.ts

@@ -16,7 +16,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts

@@ -4,7 +4,7 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/ang
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.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";

apps/web/src/app/billing/organizations/organization-plans.component.ts

@@ -42,8 +42,8 @@ import { BillingResponse } from "@bitwarden/common/billing/models/response/billi
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.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";

apps/web/src/app/billing/services/free-families-policy.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { combineLatest, filter, from, map, Observable, of, switchMap } from "rxjs";
+import { combineLatest, filter, map, Observable, of, switchMap } 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";
@@ -7,7 +7,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 interface EnterpriseOrgStatus {
@@ -52,11 +51,7 @@ export class FreeFamiliesPolicyService {
   );
 
   get showFreeFamilies$(): Observable<boolean> {
-    return this.isFreeFamilyFlagEnabled$.pipe(
-      switchMap((isFreeFamilyFlagEnabled) =>
-        isFreeFamilyFlagEnabled ? this.getFreeFamiliesVisibility$() : this.canManageSponsorships$,
-      ),
-    );
+    return this.getFreeFamiliesVisibility$();
   }
 
   private getFreeFamiliesVisibility$(): Observable<boolean> {
@@ -143,8 +138,4 @@ export class FreeFamiliesPolicyService {
     const enterpriseOrganizations = organizations.filter((org) => org.canManageSponsorships);
     return enterpriseOrganizations.length === 1 ? enterpriseOrganizations[0].id : null;
   }
-
-  private get isFreeFamilyFlagEnabled$(): Observable<boolean> {
-    return from(this.configService.getFeatureFlag(FeatureFlag.DisableFreeFamiliesSponsorship));
-  }
 }

apps/web/src/app/billing/settings/sponsored-families.component.ts

@@ -21,8 +21,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { PlanSponsorshipType } from "@bitwarden/common/billing/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -41,7 +39,6 @@ interface RequestSponsorshipForm {
 })
 export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
   loading = false;
-  isFreeFamilyFlagEnabled: boolean;
 
   availableSponsorshipOrgs$: Observable<Organization[]>;
   activeSponsorshipOrgs$: Observable<Organization[]>;
@@ -64,7 +61,6 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private accountService: AccountService,
     private toastService: ToastService,
-    private configService: ConfigService,
     private policyService: PolicyService,
     private freeFamiliesPolicyService: FreeFamiliesPolicyService,
     private router: Router,
@@ -87,37 +83,27 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
   }
 
   async ngOnInit() {
-    this.isFreeFamilyFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.DisableFreeFamiliesSponsorship,
-    );
-
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
-    if (this.isFreeFamilyFlagEnabled) {
-      await this.preventAccessToFreeFamiliesPage();
+    await this.preventAccessToFreeFamiliesPage();
 
-      this.availableSponsorshipOrgs$ = combineLatest([
-        this.organizationService.organizations$(userId),
-        this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy, userId),
-      ]).pipe(
-        map(([organizations, policies]) =>
-          organizations
-            .filter((org) => org.familySponsorshipAvailable)
-            .map((org) => ({
-              organization: org,
-              isPolicyEnabled: policies.some(
-                (policy) => policy.organizationId === org.id && policy.enabled,
-              ),
-            }))
-            .filter(({ isPolicyEnabled }) => !isPolicyEnabled)
-            .map(({ organization }) => organization),
-        ),
-      );
-    } else {
-      this.availableSponsorshipOrgs$ = this.organizationService
-        .organizations$(userId)
-        .pipe(map((orgs) => orgs.filter((o) => o.familySponsorshipAvailable)));
-    }
+    this.availableSponsorshipOrgs$ = combineLatest([
+      this.organizationService.organizations$(userId),
+      this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy, userId),
+    ]).pipe(
+      map(([organizations, policies]) =>
+        organizations
+          .filter((org) => org.familySponsorshipAvailable)
+          .map((org) => ({
+            organization: org,
+            isPolicyEnabled: policies.some(
+              (policy) => policy.organizationId === org.id && policy.enabled,
+            ),
+          }))
+          .filter(({ isPolicyEnabled }) => !isPolicyEnabled)
+          .map(({ organization }) => organization),
+      ),
+    );
 
     this.availableSponsorshipOrgs$.pipe(takeUntil(this._destroy)).subscribe((orgs) => {
       if (orgs.length === 1) {

apps/web/src/app/billing/settings/sponsoring-org-row.component.ts

@@ -10,7 +10,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -29,7 +28,6 @@ export class SponsoringOrgRowComponent implements OnInit {
   statusMessage = "loading";
   statusClass: "tw-text-success" | "tw-text-danger" = "tw-text-success";
   isFreeFamilyPolicyEnabled$: Observable<boolean>;
-  isFreeFamilyFlagEnabled: boolean;
   private locale = "";
 
   constructor(
@@ -52,25 +50,20 @@ export class SponsoringOrgRowComponent implements OnInit {
       this.sponsoringOrg.familySponsorshipValidUntil,
       this.sponsoringOrg.familySponsorshipLastSyncDate,
     );
-    this.isFreeFamilyFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.DisableFreeFamiliesSponsorship,
-    );
 
-    if (this.isFreeFamilyFlagEnabled) {
-      this.isFreeFamilyPolicyEnabled$ = this.accountService.activeAccount$.pipe(
-        getUserId,
-        switchMap((userId) =>
-          this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy, userId),
-        ),
-        map(
-          (policies) =>
-            Array.isArray(policies) &&
-            policies.some(
-              (policy) => policy.organizationId === this.sponsoringOrg.id && policy.enabled,
-            ),
-        ),
-      );
-    }
+    this.isFreeFamilyPolicyEnabled$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) =>
+        this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy, userId),
+      ),
+      map(
+        (policies) =>
+          Array.isArray(policies) &&
+          policies.some(
+            (policy) => policy.organizationId === this.sponsoringOrg.id && policy.enabled,
+          ),
+      ),
+    );
   }
 
   async revokeSponsorship() {

apps/web/src/app/billing/shared/self-hosting-license-uploader/organization-self-hosting-license-uploader.component.ts

@@ -7,7 +7,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";

apps/web/src/app/core/core.module.ts

@@ -52,10 +52,10 @@ import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import {
   EnvironmentService,
   Urls,

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

@@ -7,7 +7,7 @@ import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";

apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts

@@ -8,8 +8,8 @@ import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeou
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -47,14 +47,17 @@ describe("KeyRotationService", () => {
   let mockResetPasswordService: MockProxy<OrganizationUserResetPasswordService>;
   let mockDeviceTrustService: MockProxy<DeviceTrustServiceAbstraction>;
   let mockKeyService: MockProxy<KeyService>;
-  let mockEncryptService: MockProxy<EncryptService>;
+  let mock
+  
+  : MockProxy<EncryptService>;
   let mockConfigService: MockProxy<ConfigService>;
   let mockSyncService: MockProxy<SyncService>;
   let mockWebauthnLoginAdminService: MockProxy<WebauthnLoginAdminService>;
   let mockLogService: MockProxy<LogService>;
   let mockVaultTimeoutService: MockProxy<VaultTimeoutService>;
   let mockToastService: MockProxy<ToastService>;
-  let mockI18nService: MockProxy<I18nService>;
+  let mock
+  Service: MockProxy<I18nService>;
 
   const mockUser = {
     id: "mockUserId" as UserId,

apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts

@@ -9,7 +9,7 @@ import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractio
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { MasterPasswordVerification } from "@bitwarden/common/auth/types/verification";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { HashPurpose } from "@bitwarden/common/platform/enums";

apps/web/src/app/layouts/user-layout.component.ts

@@ -31,7 +31,6 @@ import { WebLayoutModule } from "./web-layout.module";
 })
 export class UserLayoutComponent implements OnInit {
   protected readonly logo = PasswordManagerLogo;
-  isFreeFamilyFlagEnabled: boolean;
   protected hasFamilySponsorshipAvailable$: Observable<boolean>;
   protected showSponsoredFamilies$: Observable<boolean>;
   protected showSubscription$: Observable<boolean>;

apps/web/src/app/tools/import/import-collection-admin.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 
 import { CollectionAdminService, CollectionAdminView } from "@bitwarden/admin-console/common";
-import { ImportCollectionServiceAbstraction } from "@bitwarden/importer/core";
+import { ImportCollectionServiceAbstraction } from "@bitwarden/importer-core";
 
 @Injectable()
 export class ImportCollectionAdminService implements ImportCollectionServiceAbstraction {

apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html

@@ -39,13 +39,7 @@
             <th bitCell bitSortable="organizationId" *ngIf="!isAdminConsoleActive">
               {{ "owner" | i18n }}
             </th>
-            <th
-              bitCell
-              class="tw-text-right"
-              bitSortable="score"
-              default
-              (sortChange)="onSortChange('score', $event)"
-            >
+            <th bitCell class="tw-text-right" bitSortable="score" default>
               {{ "weakness" | i18n }}
             </th>
           </tr>

apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts

@@ -59,7 +59,6 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     this.weakPasswordCiphers = [];
     this.filterStatus = [0];
     this.findWeakPasswords(allCiphers);
-    this.weakPasswordCiphers = this.sortCiphers(this.weakPasswordCiphers, "score", false);
   }
 
   protected findWeakPasswords(ciphers: CipherView[]): void {
@@ -113,29 +112,6 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     this.filterCiphersByOrg(this.weakPasswordCiphers);
   }
 
-  onSortChange(field: string, event: Event) {
-    const target = event.target as HTMLInputElement;
-    const ascending = target.checked;
-    this.weakPasswordCiphers = this.sortCiphers(this.weakPasswordCiphers, field, ascending);
-  }
-
-  protected sortCiphers(
-    ciphers: ReportResult[],
-    field: string,
-    ascending: boolean,
-  ): ReportResult[] {
-    return ciphers.sort((a, b) => {
-      const aValue = a[field as keyof ReportResult];
-      const bValue = b[field as keyof ReportResult];
-
-      if (aValue === bValue) {
-        return 0;
-      }
-      const comparison = aValue > bValue ? 1 : -1;
-      return ascending ? comparison : -comparison;
-    });
-  }
-
   protected canManageCipher(c: CipherView): boolean {
     // this will only ever be false from the org view;
     return true;

apps/web/src/app/tools/send/send-access-file.component.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";

apps/web/src/app/vault/individual-vault/attachments.component.ts

@@ -4,7 +4,7 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/ang
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.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";

apps/web/src/app/vault/org-vault/attachments.component.ts

@@ -6,7 +6,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.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";

apps/web/tsconfig.build.json

@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "files": ["src/polyfills.ts", "src/main.ts", "src/theme.ts"],
-  "include": ["src/connectors/*.ts", "../../libs/common/src/platform/services/**/*.worker.ts"]
+  "include": [
+    "src/connectors/*.ts",
+    "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts"
+  ]
 }

apps/web/tsconfig.json

@@ -18,7 +18,7 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
       "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
@@ -43,6 +43,6 @@
     "src/connectors/*.ts",
     "src/**/*.stories.ts",
     "src/**/*.spec.ts",
-    "../../libs/common/src/platform/services/**/*.worker.ts"
+    "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts"
   ]
 }

bitwarden_license/bit-cli/tsconfig.json

@@ -18,7 +18,7 @@
       "@bitwarden/auth/common": ["../../libs/auth/src/common"],
       "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],

bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.spec.ts

@@ -4,8 +4,8 @@ import {
   OrganizationUserApiService,
   OrganizationUserResetPasswordDetailsResponse,
 } from "@bitwarden/admin-console/common";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { KeyService } from "@bitwarden/key-management";
 

bitwarden_license/bit-common/src/admin-console/auth-requests/organization-auth-request.service.ts

@@ -4,7 +4,7 @@ import {
   OrganizationUserApiService,
   OrganizationUserResetPasswordDetailsResponse,
 } from "@bitwarden/admin-console/common";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 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";

bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.spec.ts

@@ -4,7 +4,7 @@ import { fakeAsync, flush } from "@angular/core/testing";
 import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "@bitwarden/common/types/csprng";

bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.ts

@@ -13,7 +13,7 @@ import {
   zip,
 } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts

@@ -10,8 +10,8 @@ import { OrganizationAuthRequestApiService } from "@bitwarden/bit-common/admin-c
 import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request.service";
 import { PendingAuthRequestView } from "@bitwarden/bit-common/admin-console/auth-requests/pending-auth-request.view";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.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";

bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-confirm-dialog.component.ts

@@ -13,8 +13,8 @@ import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/admin-console/
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
 import { ProviderUserBulkPublicKeyResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk-public-key.response";
 import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk.response";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { DialogService } from "@bitwarden/components";

bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts

@@ -15,8 +15,8 @@ import { ProviderUserStatusType, ProviderUserType } from "@bitwarden/common/admi
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
 import { ProviderUserConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-confirm.request";
 import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";

bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts

@@ -11,7 +11,7 @@ import { ProviderAddOrganizationRequest } from "@bitwarden/common/admin-console/
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { PlanType } from "@bitwarden/common/billing/enums";
 import { CreateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/create-client-organization.request";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { OrganizationId } from "@bitwarden/common/types/guid";

bitwarden_license/bit-web/src/app/app.component.ts

@@ -20,17 +20,10 @@ export class AppComponent extends BaseAppComponent implements OnInit {
     this.policyListService.addPolicies([
       new MaximumVaultTimeoutPolicy(),
       new DisablePersonalVaultExportPolicy(),
+      new FreeFamiliesSponsorshipPolicy(),
+      new ActivateAutofillPolicy(),
     ]);
 
-    this.configService
-      .getFeatureFlag(FeatureFlag.DisableFreeFamiliesSponsorship)
-      .then((isFreeFamilyEnabled) => {
-        if (isFreeFamilyEnabled) {
-          this.policyListService.addPolicies([new FreeFamiliesSponsorshipPolicy()]);
-        }
-        this.policyListService.addPolicies([new ActivateAutofillPolicy()]);
-      });
-
     this.configService.getFeatureFlag(FeatureFlag.IdpAutoSubmitLogin).then((enabled) => {
       if (
         enabled &&

bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.spec.ts

@@ -1,7 +1,7 @@
 import { mock } from "jest-mock-extended";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { KeyService } from "@bitwarden/key-management";
 

bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts

@@ -4,7 +4,7 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.spec.ts

@@ -1,7 +1,7 @@
 import { mock } from "jest-mock-extended";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 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";

bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { KeyService } from "@bitwarden/key-management";
 

bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.spec.ts

@@ -3,7 +3,7 @@
 import { mock } from "jest-mock-extended";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "@bitwarden/common/types/csprng";

bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.ts

@@ -4,8 +4,8 @@ import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { KeyService } from "@bitwarden/key-management";

bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts

@@ -10,7 +10,7 @@ import {
 } from "@bitwarden/bit-common/tools/reports/risk-insights/services";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength/password-strength.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { KeyService } from "@bitwarden/key-management";

bitwarden_license/bit-web/tsconfig.build.json

@@ -9,6 +9,6 @@
   ],
   "include": [
     "../../apps/web/src/connectors/*.ts",
-    "../../libs/common/src/platform/services/**/*.worker.ts"
+    "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts"
   ]
 }

bitwarden_license/bit-web/tsconfig.json

@@ -21,7 +21,7 @@
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer-core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
       "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
@@ -46,7 +46,7 @@
     "../../apps/web/src/connectors/*.ts",
     "../../apps/web/src/**/*.stories.ts",
     "../../apps/web/src/**/*.spec.ts",
-    "../../libs/common/src/platform/services/**/*.worker.ts",
+    "../../libs/common/src/key-management/crypto/services/encrypt.worker.ts",
 
     "src/**/*.stories.ts",
     "src/**/*.spec.ts"

libs/admin-console/src/common/collections/services/default-collection-admin.service.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { KeyService } from "@bitwarden/key-management";
 

libs/admin-console/src/common/collections/services/default-collection.service.spec.ts

@@ -1,7 +1,7 @@
 import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";

libs/admin-console/src/common/collections/services/default-collection.service.ts

@@ -3,7 +3,7 @@
 import { combineLatest, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 import { Jsonify } from "type-fest";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {

libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts

@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { first, firstValueFrom, of, ReplaySubject, takeWhile } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";

libs/admin-console/src/common/collections/services/default-vnext-collection.service.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { combineLatest, filter, firstValueFrom, map } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider, DerivedState } from "@bitwarden/common/platform/state";