[PM-16926] Fix KM bad imports (#12807)

libs/common/src/auth/services/auth.service.spec.ts

@@ -1,9 +1,8 @@
 import { MockProxy, mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import {
   FakeAccountService,
   makeStaticByteArray,

libs/common/src/auth/services/auth.service.ts

@@ -11,9 +11,8 @@ import {
   switchMap,
 } from "rxjs";
 
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { StateService } from "../../platform/abstractions/state.service";
 import { MessageSender } from "../../platform/messaging";

libs/common/src/auth/services/device-trust.service.implementation.ts

@@ -3,10 +3,8 @@
 import { firstValueFrom, map, Observable } from "rxjs";
 
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { ConfigService } from "../../platform/abstractions/config/config.service";

libs/common/src/auth/services/device-trust.service.spec.ts

@@ -4,13 +4,11 @@ import { matches, mock } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom, of } from "rxjs";
 
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { KeyService } from "@bitwarden/key-management";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { UserDecryptionOptions } from "../../../../auth/src/common/models/domain/user-decryption-options";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
 import { FakeActiveUserState } from "../../../spec/fake-state";
 import { FakeStateProvider } from "../../../spec/fake-state-provider";

libs/common/src/auth/services/key-connector.service.spec.ts

@@ -2,10 +2,8 @@ import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec";
 import { ApiService } from "../../abstractions/api.service";
 import { OrganizationData } from "../../admin-console/models/data/organization.data";

libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts

@@ -2,10 +2,8 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationAutoEnrollStatusResponse } from "../../admin-console/models/response/organization-auto-enroll-status.response";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";

libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts

@@ -6,10 +6,8 @@ import {
   OrganizationUserApiService,
   OrganizationUserResetPasswordEnrollmentRequest,
 } from "@bitwarden/admin-console/common";
+import { KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";

libs/common/src/auth/services/user-verification/user-verification.service.spec.ts

@@ -12,11 +12,9 @@ import {
   BiometricsStatus,
   KdfConfig,
   KeyService,
+  KdfConfigService,
 } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KdfConfigService } from "../../../../../key-management/src/abstractions/kdf-config.service";
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
 import { VaultTimeoutSettingsService } from "../../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";

libs/common/src/key-management/services/default-process-reload.service.ts

@@ -2,11 +2,9 @@
 // @ts-strict-ignore
 import { firstValueFrom, map, timeout } from "rxjs";
 
+import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { BiometricStateService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { PinServiceAbstraction } from "../../../../auth/src/common/abstractions";
 import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { AccountService } from "../../auth/abstractions/account.service";
 import { AuthService } from "../../auth/abstractions/auth.service";

libs/common/src/platform/misc/utils.ts

@@ -8,9 +8,8 @@ import { Observable, of, switchMap } from "rxjs";
 import { getHostname, parse } from "tldts";
 import { Merge } from "type-fest";
 
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "../abstractions/i18n.service";
 

libs/common/src/platform/models/domain/enc-string.spec.ts

@@ -1,8 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeEncString, makeStaticByteArray } from "../../../../spec";
 import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";

libs/common/src/platform/services/container.service.ts

@@ -1,6 +1,5 @@
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 
 export class ContainerService {

libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts

@@ -1,8 +1,7 @@
 import { mock } from "jest-mock-extended";
 
-// FIXME: remove `src` and fix import
+import { DefaultKeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { DefaultKeyService } from "../../../../key-management/src/key.service";
 import { CsprngArray } from "../../types/csprng";
 import { UserId } from "../../types/guid";
 import { UserKey } from "../../types/key";

libs/common/src/platform/services/user-auto-unlock-key.service.ts

@@ -1,6 +1,5 @@
-// FIXME: remove `src` and fix import
+import { KeyService } from "@bitwarden/key-management";
-// eslint-disable-next-line no-restricted-imports
+
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { UserId } from "../../types/guid";
 import { KeySuffixOptions } from "../enums";
 

libs/common/src/platform/sync/default-sync.service.ts

@@ -7,6 +7,7 @@ import {
   CollectionData,
   CollectionDetailsResponse,
 } from "@bitwarden/admin-console/common";
+import { KeyService } from "@bitwarden/key-management";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
@@ -14,9 +15,6 @@ import { UserDecryptionOptionsServiceAbstraction } from "../../../../auth/src/co
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { LogoutReason } from "../../../../auth/src/common/types";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction";
 import { InternalPolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";

libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts

@@ -6,11 +6,8 @@ import {
   FakeUserDecryptionOptions as UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
-import { BiometricStateService } from "@bitwarden/key-management";
+import { BiometricStateService, KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, mockAccountServiceWith, FakeStateProvider } from "../../../spec";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";

libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts

@@ -19,11 +19,8 @@ import {
   PinServiceAbstraction,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
-import { BiometricStateService } from "@bitwarden/key-management";
+import { BiometricStateService, KeyService } from "@bitwarden/key-management";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "../../admin-console/enums";

libs/key-management/src/abstractions/key.service.ts

@@ -3,31 +3,13 @@
 import { Observable } from "rxjs";
 
 import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
-import { KdfConfig } from "@bitwarden/key-management";
+import { ProfileOrganizationResponse } from "@bitwarden/common/admin-console/models/response/profile-organization.response";
-
+import { ProfileProviderOrganizationResponse } from "@bitwarden/common/admin-console/models/response/profile-provider-organization.response";
-// FIXME: remove `src` and fix import
+import { ProfileProviderResponse } from "@bitwarden/common/admin-console/models/response/profile-provider.response";
-// eslint-disable-next-line no-restricted-imports
+import { KeySuffixOptions, HashPurpose } from "@bitwarden/common/platform/enums";
-import { ProfileOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-organization.response";
+import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-// FIXME: remove `src` and fix import
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-// eslint-disable-next-line no-restricted-imports
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { ProfileProviderOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-provider-organization.response";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ProfileProviderResponse } from "../../../common/src/admin-console/models/response/profile-provider.response";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeySuffixOptions, HashPurpose } from "../../../common/src/platform/enums";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { EncryptedString, EncString } from "../../../common/src/platform/models/domain/enc-string";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { SymmetricCryptoKey } from "../../../common/src/platform/models/domain/symmetric-crypto-key";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationId, UserId } from "../../../common/src/types/guid";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import {
   UserKey,
   MasterKey,
@@ -36,7 +18,9 @@ import {
   CipherKey,
   UserPrivateKey,
   UserPublicKey,
-} from "../../../common/src/types/key";
+} from "@bitwarden/common/types/key";
+
+import { KdfConfig } from "../models/kdf-config";
 
 export class UserPrivateKeyDecryptionFailedError extends Error {
   constructor() {

libs/key-management/src/key.service.spec.ts

@@ -1,82 +1,43 @@
 import { mock } from "jest-mock-extended";
 import { bufferCount, firstValueFrom, lastValueFrom, of, take, tap } from "rxjs";
 
+import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
+import { FakeMasterPasswordService } from "@bitwarden/common/auth/services/master-password/fake-master-password.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-// FIXME: remove `src` and fix import
+import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
-// eslint-disable-next-line no-restricted-imports
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { Encrypted } from "@bitwarden/common/platform/interfaces/encrypted";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { EncString, EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "@bitwarden/common/platform/services/key-state/org-keys.state";
+import { USER_ENCRYPTED_PROVIDER_KEYS } from "@bitwarden/common/platform/services/key-state/provider-keys.state";
+import {
+  USER_ENCRYPTED_PRIVATE_KEY,
+  USER_EVER_HAD_USER_KEY,
+  USER_KEY,
+} from "@bitwarden/common/platform/services/key-state/user-key.state";
+import { UserKeyDefinition } from "@bitwarden/common/platform/state";
+import { VAULT_TIMEOUT } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.state";
 import {
   awaitAsync,
   makeEncString,
   makeStaticByteArray,
   makeSymmetricCryptoKey,
-} from "../../common/spec";
+  FakeAccountService,
-import { FakeAccountService, mockAccountServiceWith } from "../../common/spec/fake-account-service";
+  mockAccountServiceWith,
-import { FakeActiveUserState, FakeSingleUserState } from "../../common/spec/fake-state";
+  FakeStateProvider,
-import { FakeStateProvider } from "../../common/spec/fake-state-provider";
+  FakeActiveUserState,
-// FIXME: remove `src` and fix import
+  FakeSingleUserState,
-// eslint-disable-next-line no-restricted-imports
+} from "@bitwarden/common/spec";
-import { FakeMasterPasswordService } from "../../common/src/auth/services/master-password/fake-master-password.service";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
-// FIXME: remove `src` and fix import
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-// eslint-disable-next-line no-restricted-imports
+import { UserKey, MasterKey } from "@bitwarden/common/types/key";
-import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
+import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { LogService } from "../../common/src/platform/abstractions/log.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { StateService } from "../../common/src/platform/abstractions/state.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { Encrypted } from "../../common/src/platform/interfaces/encrypted";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { Utils } from "../../common/src/platform/misc/utils";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import {
-  USER_ENCRYPTED_PRIVATE_KEY,
-  USER_EVER_HAD_USER_KEY,
-  USER_KEY,
-} from "../../common/src/platform/services/key-state/user-key.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { UserKeyDefinition } from "../../common/src/platform/state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { CsprngArray } from "../../common/src/types/csprng";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationId, UserId } from "../../common/src/types/guid";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { UserKey, MasterKey } from "../../common/src/types/key";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
 
 import { KdfConfigService } from "./abstractions/kdf-config.service";
 import { UserPrivateKeyDecryptionFailedError } from "./abstractions/key.service";

libs/key-management/src/key.service.ts

@@ -12,94 +12,37 @@ import {
   switchMap,
 } from "rxjs";
 
+import { PinServiceAbstraction } from "@bitwarden/auth/common";
+import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
+import { BaseEncryptedOrganizationKey } from "@bitwarden/common/admin-console/models/domain/encrypted-organization-key";
+import { ProfileOrganizationResponse } from "@bitwarden/common/admin-console/models/response/profile-organization.response";
+import { ProfileProviderOrganizationResponse } from "@bitwarden/common/admin-console/models/response/profile-provider-organization.response";
+import { ProfileProviderResponse } from "@bitwarden/common/admin-console/models/response/profile-provider.response";
+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";
-// FIXME: remove `src` and fix import
+import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
-// eslint-disable-next-line no-restricted-imports
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-// FIXME: remove `src` and fix import
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-// eslint-disable-next-line no-restricted-imports
+import { KeySuffixOptions, HashPurpose } from "@bitwarden/common/platform/enums";
-import { EncryptedOrganizationKeyData } from "../../common/src/admin-console/models/data/encrypted-organization-key.data";
+import { convertValues } from "@bitwarden/common/platform/misc/convert-values";
-// FIXME: remove `src` and fix import
+import { Utils } from "@bitwarden/common/platform/misc/utils";
-// eslint-disable-next-line no-restricted-imports
+import { EFFLongWordList } from "@bitwarden/common/platform/misc/wordlist";
-import { BaseEncryptedOrganizationKey } from "../../common/src/admin-console/models/domain/encrypted-organization-key";
+import { EncString, EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
-// FIXME: remove `src` and fix import
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-// eslint-disable-next-line no-restricted-imports
+import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "@bitwarden/common/platform/services/key-state/org-keys.state";
-import { ProfileOrganizationResponse } from "../../common/src/admin-console/models/response/profile-organization.response";
+import { USER_ENCRYPTED_PROVIDER_KEYS } from "@bitwarden/common/platform/services/key-state/provider-keys.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ProfileProviderOrganizationResponse } from "../../common/src/admin-console/models/response/profile-provider-organization.response";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ProfileProviderResponse } from "../../common/src/admin-console/models/response/profile-provider.response";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { AccountService } from "../../common/src/auth/abstractions/account.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { InternalMasterPasswordServiceAbstraction } from "../../common/src/auth/abstractions/master-password.service.abstraction";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { LogService } from "../../common/src/platform/abstractions/log.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { StateService } from "../../common/src/platform/abstractions/state.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { KeySuffixOptions, HashPurpose } from "../../common/src/platform/enums";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { convertValues } from "../../common/src/platform/misc/convert-values";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { Utils } from "../../common/src/platform/misc/utils";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { EFFLongWordList } from "../../common/src/platform/misc/wordlist";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import {
   USER_ENCRYPTED_PRIVATE_KEY,
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
-} from "../../common/src/platform/services/key-state/user-key.state";
+} from "@bitwarden/common/platform/services/key-state/user-key.state";
-// FIXME: remove `src` and fix import
+import { ActiveUserState, StateProvider } from "@bitwarden/common/platform/state";
-// eslint-disable-next-line no-restricted-imports
+import { VAULT_TIMEOUT } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.state";
-import { ActiveUserState, StateProvider } from "../../common/src/platform/state";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
-// FIXME: remove `src` and fix import
+import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
-// eslint-disable-next-line no-restricted-imports
-import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { CsprngArray } from "../../common/src/types/csprng";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationId, ProviderId, UserId } from "../../common/src/types/guid";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import {
   OrgKey,
   UserKey,
@@ -108,10 +51,8 @@ import {
   CipherKey,
   UserPrivateKey,
   UserPublicKey,
-} from "../../common/src/types/key";
+} from "@bitwarden/common/types/key";
-// FIXME: remove `src` and fix import
+import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type";
-// eslint-disable-next-line no-restricted-imports
-import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
 
 import { KdfConfigService } from "./abstractions/kdf-config.service";
 import {