Move into @bitwarden/key-management

2026-02-24 08:33:29 +00:00 · 2024-12-19 10:34:38 -06:00
parent d7e09b42e6
commit b7514fb8c2
28 changed files with 54 additions and 46 deletions
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
@@ -9,8 +9,12 @@ import {
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService, BiometricsService } from "@bitwarden/key-management";
-import { BiometricsDisableReason, UnlockOptions } from "@bitwarden/key-management/angular";
+import {
+  KeyService,
+  BiometricsService,
+  BiometricsDisableReason,
+  UnlockOptions,
+} from "@bitwarden/key-management";

 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";

--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
@@ -11,12 +11,13 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaul
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService, BiometricsService } from "@bitwarden/key-management";
 import {
+  KeyService,
+  BiometricsService,
  LockComponentService,
  BiometricsDisableReason,
  UnlockOptions,
-} from "@bitwarden/key-management/angular";
+} from "@bitwarden/key-management";

 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -42,7 +42,7 @@ import {
  TwoFactorTimeoutIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { LockV2Component } from "@bitwarden/key-management/angular";
+import { LockV2Component } from "@bitwarden/key-management";

 import { twofactorRefactorSwap } from "../../../../libs/angular/src/utils/two-factor-component-refactor-route-swap";
 import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard";
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -113,8 +113,8 @@ import {
  KeyService,
  BiometricStateService,
  BiometricsService,
+  LockComponentService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management/angular";
 import { PasswordRepromptService } from "@bitwarden/vault";

 import { ForegroundLockService } from "../../auth/popup/accounts/foreground-lock.service";
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -34,7 +34,6 @@
      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/vault": ["../../libs/vault/src"]
    },
    "plugins": [
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -26,7 +26,6 @@
        "../../libs/tools/export/vault-export/vault-export-core/src"
      ],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/node/*": ["../../libs/node/src/*"]
    },
    "plugins": [
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -39,7 +39,7 @@ import {
  TwoFactorTimeoutIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { LockV2Component } from "@bitwarden/key-management/angular";
+import { LockV2Component } from "@bitwarden/key-management";

 import { twofactorRefactorSwap } from "../../../../libs/angular/src/utils/two-factor-component-refactor-route-swap";
 import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component";
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -90,8 +90,8 @@ import {
  KeyService as KeyServiceAbstraction,
  BiometricStateService,
  BiometricsService,
+  LockComponentService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management/angular";

 import { DesktopLoginApprovalComponentService } from "../../auth/login/desktop-login-approval-component.service";
 import { DesktopLoginComponentService } from "../../auth/login/desktop-login-component.service";
--- a/apps/desktop/src/key-management/lock/services/desktop-lock-component.service.spec.ts
+++ b/apps/desktop/src/key-management/lock/services/desktop-lock-component.service.spec.ts
@@ -10,8 +10,12 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaul
 import { DeviceType } from "@bitwarden/common/enums";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService, BiometricsService } from "@bitwarden/key-management";
-import { BiometricsDisableReason, UnlockOptions } from "@bitwarden/key-management/angular";
+import {
+  KeyService,
+  BiometricsService,
+  BiometricsDisableReason,
+  UnlockOptions,
+} from "@bitwarden/key-management";

 import { DesktopLockComponentService } from "./desktop-lock-component.service";

--- a/apps/desktop/src/key-management/lock/services/desktop-lock-component.service.ts
+++ b/apps/desktop/src/key-management/lock/services/desktop-lock-component.service.ts
@@ -10,12 +10,13 @@ import { DeviceType } from "@bitwarden/common/enums";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService, BiometricsService } from "@bitwarden/key-management";
 import {
+  KeyService,
+  BiometricsService,
  BiometricsDisableReason,
  LockComponentService,
  UnlockOptions,
-} from "@bitwarden/key-management/angular";
+} from "@bitwarden/key-management";

 export class DesktopLockComponentService implements LockComponentService {
  private readonly userDecryptionOptionsService = inject(UserDecryptionOptionsServiceAbstraction);
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -29,7 +29,6 @@
      "@bitwarden/importer/core": ["../../libs/importer/src"],
      "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/node/*": ["../../libs/node/src/*"],
      "@bitwarden/platform": ["../../libs/platform/src"],
      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -90,8 +90,8 @@ import {
  KdfConfigService,
  KeyService as KeyServiceAbstraction,
  BiometricsService,
+  LockComponentService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management/angular";

 import { flagEnabled } from "../../utils/flags";
 import { PolicyListService } from "../admin-console/core/policy-list.service";
--- a/apps/web/src/app/key-management/lock/services/web-lock-component.service.ts
+++ b/apps/web/src/app/key-management/lock/services/web-lock-component.service.ts
@@ -6,7 +6,7 @@ import {
  UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { UserId } from "@bitwarden/common/types/guid";
-import { LockComponentService, UnlockOptions } from "@bitwarden/key-management/angular";
+import { LockComponentService, UnlockOptions } from "@bitwarden/key-management";

 export class WebLockComponentService implements LockComponentService {
  private readonly userDecryptionOptionsService = inject(UserDecryptionOptionsServiceAbstraction);
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -39,7 +39,7 @@ import {
  LoginDecryptionOptionsComponent,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { LockV2Component } from "@bitwarden/key-management/angular";
+import { LockV2Component } from "@bitwarden/key-management";

 import { twofactorRefactorSwap } from "../../../../libs/angular/src/utils/two-factor-component-refactor-route-swap";
 import { flagEnabled, Flags } from "../utils/flags";
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -25,7 +25,6 @@
      "@bitwarden/importer/core": ["../../libs/importer/src"],
      "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/platform": ["../../libs/platform/src"],
      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
--- a/bitwarden_license/bit-cli/tsconfig.json
+++ b/bitwarden_license/bit-cli/tsconfig.json
@@ -24,7 +24,6 @@
      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/vault-export-core": [
        "../../libs/tools/export/vault-export/vault-export-core/src"
      ],
--- a/bitwarden_license/bit-common/tsconfig.json
+++ b/bitwarden_license/bit-common/tsconfig.json
@@ -23,7 +23,6 @@
      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/platform": ["../../libs/platform/src"],
      "@bitwarden/vault": ["../../libs/vault/src"],
      "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -17,7 +17,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { TableDataSource, NoItemsModule, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
+import { KeyManagementPipesModule, KeyService } from "@bitwarden/key-management";
 import { Devices } from "@bitwarden/web-vault/app/admin-console/icons";
 import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
 import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
@@ -41,7 +41,7 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
      ],
    }),
  ] satisfies SafeProvider[],
-  imports: [SharedModule, NoItemsModule, LooseComponentsModule],
+  imports: [SharedModule, NoItemsModule, LooseComponentsModule, KeyManagementPipesModule],
 })
 export class DeviceApprovalsComponent implements OnInit, OnDestroy {
  tableDataSource = new TableDataSource<PendingAuthRequestView>();
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -24,7 +24,6 @@
      "@bitwarden/importer/core": ["../../libs/importer/src"],
      "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
      "@bitwarden/platform": ["../../libs/platform/src"],
      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
--- a/libs/angular/src/jslib.module.ts
+++ b/libs/angular/src/jslib.module.ts
@@ -52,7 +52,6 @@ import { SearchPipe } from "./pipes/search.pipe";
 import { UserNamePipe } from "./pipes/user-name.pipe";
 import { UserTypePipe } from "./pipes/user-type.pipe";
 import { EllipsisPipe } from "./platform/pipes/ellipsis.pipe";
-import { FingerprintPipe } from "./platform/pipes/fingerprint.pipe";
 import { I18nPipe } from "./platform/pipes/i18n.pipe";
 import { PasswordStrengthComponent } from "./tools/password-strength/password-strength.component";
 import { IconComponent } from "./vault/components/icon.component";
@@ -111,7 +110,6 @@ import { IconComponent } from "./vault/components/icon.component";
    PasswordStrengthComponent,
    UserTypePipe,
    IfFeatureDirective,
-    FingerprintPipe,
    AddAccountCreditDialogComponent,
    InvoicesComponent,
    NoInvoicesComponent,
@@ -146,7 +144,6 @@ import { IconComponent } from "./vault/components/icon.component";
    PasswordStrengthComponent,
    UserTypePipe,
    IfFeatureDirective,
-    FingerprintPipe,
    AddAccountCreditDialogComponent,
    InvoicesComponent,
    NoInvoicesComponent,
@@ -161,7 +158,6 @@ import { IconComponent } from "./vault/components/icon.component";
    SearchPipe,
    UserNamePipe,
    UserTypePipe,
-    FingerprintPipe,
    PluralizePipe,
  ],
 })
--- a/libs/key-management/src/angular/index.ts
+++ b/libs/key-management/src/angular/index.ts
@@ -1,10 +0,0 @@
-/**
- * This barrel file should only contain Angular exports
- */
-
-export { LockV2Component } from "./lock/components/lock.component";
-export {
-  LockComponentService,
-  BiometricsDisableReason,
-  UnlockOptions,
-} from "./lock/services/lock-component.service";
--- a/libs/key-management/src/index.ts
+++ b/libs/key-management/src/index.ts
@@ -19,3 +19,13 @@ export { DefaultKdfConfigService } from "./kdf-config.service";
 export { KdfType } from "./enums/kdf-type.enum";

 export * from "./user-asymmetric-key-regeneration";
+
+export { LockV2Component } from "./lock/components/lock.component";
+export {
+  LockComponentService,
+  BiometricsDisableReason,
+  UnlockOptions,
+} from "./lock/services/lock-component.service";
+
+export { FingerprintPipe } from "./pipes/fingerprint.pipe";
+export { KeyManagementPipesModule } from "./pipes/key-management-pipes.module";
--- a/libs/key-management/src/angular/lock/components/lock.component.html
+++ b/libs/key-management/src/angular/lock/components/lock.component.html
--- a/libs/key-management/src/angular/lock/components/lock.component.ts
+++ b/libs/key-management/src/angular/lock/components/lock.component.ts
@@ -39,12 +39,10 @@ import {
  IconButtonModule,
  ToastService,
 } from "@bitwarden/components";
-import {
-  KeyService,
-  BiometricStateService,
-  UserAsymmetricKeysRegenerationService,
-} from "@bitwarden/key-management";

+import { KeyService } from "../../abstractions/key.service";
+import { BiometricStateService } from "../../biometrics/biometric-state.service";
+import { UserAsymmetricKeysRegenerationService } from "../../user-asymmetric-key-regeneration/abstractions/user-asymmetric-key-regeneration.service";
 import {
  UnlockOption,
  LockComponentService,
@@ -66,8 +64,8 @@ const clientTypeToSuccessRouteRecord: Partial<Record<ClientType, string>> = {
  standalone: true,
  imports: [
    CommonModule,
-    JslibModule,
    ReactiveFormsModule,
+    JslibModule,
    ButtonModule,
    FormFieldModule,
    AsyncActionsModule,
--- a/libs/key-management/src/angular/lock/services/lock-component.service.ts
+++ b/libs/key-management/src/angular/lock/services/lock-component.service.ts
--- a/libs/angular/src/platform/pipes/fingerprint.pipe.ts
+++ b/libs/angular/src/platform/pipes/fingerprint.pipe.ts
@@ -1,7 +1,8 @@
 import { Pipe } from "@angular/core";

 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { KeyService } from "@bitwarden/key-management";
+
+import { KeyService } from "../abstractions/key.service";

@Pipe({
  name: "fingerprint",
--- a/libs/key-management/src/pipes/key-management-pipes.module.ts
+++ b/libs/key-management/src/pipes/key-management-pipes.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from "@angular/core";
+
+import { FingerprintPipe } from "./fingerprint.pipe";
+
+@NgModule({
+  imports: [],
+  declarations: [FingerprintPipe],
+  providers: [],
+  exports: [FingerprintPipe],
+})
+export class KeyManagementPipesModule {}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,7 +33,6 @@
      "@bitwarden/importer/core": ["./libs/importer/src"],
      "@bitwarden/importer/ui": ["./libs/importer/src/components"],
      "@bitwarden/key-management": ["./libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["./libs/key-management/src/angular"],
      "@bitwarden/platform": ["./libs/platform/src"],
      "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
      "@bitwarden/tools-card": ["./libs/tools/card/src"],