diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts index 783ce3dfc2e..73cee382d22 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts @@ -12,10 +12,10 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga 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/key-management/crypto/abstractions/encrypt.service"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { EncryptionType } from "@bitwarden/common/platform/enums"; import { CsprngArray } from "@bitwarden/common/types/csprng"; import { UserId } from "@bitwarden/common/types/guid"; import { UserKey, OrgKey, MasterKey } from "@bitwarden/common/types/key"; diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts index dbddddee763..aac5c0529a8 100644 --- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts +++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts @@ -6,13 +6,13 @@ 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 { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { UserKeyResponse } from "@bitwarden/common/models/response/user-key.response"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { EncryptionType } from "@bitwarden/common/platform/enums"; import { CsprngArray } from "@bitwarden/common/types/csprng"; import { UserId } from "@bitwarden/common/types/guid"; import { UserKey, MasterKey } from "@bitwarden/common/types/key"; diff --git a/apps/web/src/app/auth/settings/change-password.component.ts b/apps/web/src/app/auth/settings/change-password.component.ts index 5a458c02622..1c445ce3c65 100644 --- a/apps/web/src/app/auth/settings/change-password.component.ts +++ b/apps/web/src/app/auth/settings/change-password.component.ts @@ -13,12 +13,12 @@ import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { HashPurpose } from "@bitwarden/common/platform/enums"; import { UserId } from "@bitwarden/common/types/guid"; import { MasterKey, UserKey } from "@bitwarden/common/types/key"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts index 0d3abf0a861..1a5ef8ff2f7 100644 --- a/libs/angular/src/auth/components/set-password.component.ts +++ b/libs/angular/src/auth/components/set-password.component.ts @@ -22,13 +22,13 @@ import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/ import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason"; import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { HashPurpose } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { UserId } from "@bitwarden/common/types/guid"; import { MasterKey, UserKey } from "@bitwarden/common/types/key"; diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts index c613cf5f533..612f4c354ec 100644 --- a/libs/auth/src/angular/input-password/input-password.component.ts +++ b/libs/auth/src/angular/input-password/input-password.component.ts @@ -11,8 +11,8 @@ import { import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { HashPurpose } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { AsyncActionsModule, diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts index 0c3aff02cd8..28d21fb8a59 100644 --- a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts +++ b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts @@ -14,13 +14,13 @@ import { FakeMasterPasswordService } from "@bitwarden/common/auth/services/maste import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { HashPurpose } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service"; import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec"; diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.ts b/libs/auth/src/common/login-strategies/password-login.strategy.ts index b5febbd7672..50ac87727c5 100644 --- a/libs/auth/src/common/login-strategies/password-login.strategy.ts +++ b/libs/auth/src/common/login-strategies/password-login.strategy.ts @@ -13,8 +13,8 @@ import { IdentityCaptchaResponse } from "@bitwarden/common/auth/models/response/ import { IdentityDeviceVerificationResponse } from "@bitwarden/common/auth/models/response/identity-device-verification.response"; import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response"; import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; -import { HashPurpose } from "@bitwarden/common/platform/enums"; import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; import { UserId } from "@bitwarden/common/types/guid"; import { MasterKey } from "@bitwarden/common/types/key"; diff --git a/libs/common/spec/utils.ts b/libs/common/spec/utils.ts index 1de72ead1f5..0e14ac7f667 100644 --- a/libs/common/spec/utils.ts +++ b/libs/common/spec/utils.ts @@ -3,10 +3,10 @@ import { mock, MockProxy } from "jest-mock-extended"; import { Observable } from "rxjs"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { SymmetricCryptoKey } from "../src/key-management/crypto/models/domain/symmetric-crypto-key"; -import { EncryptionType } from "../src/platform/enums"; import { Utils } from "../src/platform/misc/utils"; function newGuid() { diff --git a/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts b/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts index c96e5655b3e..1471b7ed8ab 100644 --- a/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts +++ b/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts @@ -1,6 +1,7 @@ -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { OrgKey, UserPrivateKey } from "../../../types/key"; import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data"; diff --git a/libs/common/src/auth/models/request/registration/register-finish.request.ts b/libs/common/src/auth/models/request/registration/register-finish.request.ts index 1870491e8ce..63cee583ab7 100644 --- a/libs/common/src/auth/models/request/registration/register-finish.request.ts +++ b/libs/common/src/auth/models/request/registration/register-finish.request.ts @@ -1,6 +1,6 @@ +import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { KdfType } from "@bitwarden/key-management"; -import { EncryptedString } from "../../../../key-management/crypto/models/domain/enc-string"; import { KeysRequest } from "../../../../models/request/keys.request"; export class RegisterFinishRequest { diff --git a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts index 1c2dbf4b078..bdc650fe2ca 100644 --- a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts +++ b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts @@ -1,10 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore - -// FIXME: remove `src` and fix import -// eslint-disable-next-line no-restricted-imports -import { RotateableKeySet } from "../../../../../auth/src/common/models"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; +import { RotateableKeySet } from "@bitwarden/auth/common"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; export class WebauthnRotateCredentialRequest { id: string; diff --git a/libs/common/src/auth/models/response/protected-device.response.ts b/libs/common/src/auth/models/response/protected-device.response.ts index 2a5d083ae44..859638458b3 100644 --- a/libs/common/src/auth/models/response/protected-device.response.ts +++ b/libs/common/src/auth/models/response/protected-device.response.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { DeviceType } from "../../../enums"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; import { BaseResponse } from "../../../models/response/base.response"; export class ProtectedDeviceResponse extends BaseResponse { diff --git a/libs/common/src/auth/models/response/user-decryption-options/trusted-device-user-decryption-option.response.ts b/libs/common/src/auth/models/response/user-decryption-options/trusted-device-user-decryption-option.response.ts index 59c92b0a793..b1be20e2b55 100644 --- a/libs/common/src/auth/models/response/user-decryption-options/trusted-device-user-decryption-option.response.ts +++ b/libs/common/src/auth/models/response/user-decryption-options/trusted-device-user-decryption-option.response.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { BaseResponse } from "../../../../models/response/base.response"; export interface ITrustedDeviceUserDecryptionOptionServerResponse { diff --git a/libs/common/src/auth/models/response/user-decryption-options/webauthn-prf-decryption-option.response.ts b/libs/common/src/auth/models/response/user-decryption-options/webauthn-prf-decryption-option.response.ts index 5faeea7d5cb..a68986f627e 100644 --- a/libs/common/src/auth/models/response/user-decryption-options/webauthn-prf-decryption-option.response.ts +++ b/libs/common/src/auth/models/response/user-decryption-options/webauthn-prf-decryption-option.response.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { BaseResponse } from "../../../../models/response/base.response"; export interface IWebAuthnPrfDecryptionOptionServerResponse { diff --git a/libs/common/src/auth/services/master-password/fake-master-password.service.ts b/libs/common/src/auth/services/master-password/fake-master-password.service.ts index 47e4838767f..6e3f5f25395 100644 --- a/libs/common/src/auth/services/master-password/fake-master-password.service.ts +++ b/libs/common/src/auth/services/master-password/fake-master-password.service.ts @@ -3,7 +3,8 @@ import { mock } from "jest-mock-extended"; import { ReplaySubject, Observable } from "rxjs"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { UserId } from "../../../types/guid"; import { MasterKey, UserKey } from "../../../types/key"; import { InternalMasterPasswordServiceAbstraction } from "../../abstractions/master-password.service.abstraction"; diff --git a/libs/common/src/auth/services/master-password/master-password.service.ts b/libs/common/src/auth/services/master-password/master-password.service.ts index ab0712a3501..ec69d062ff2 100644 --- a/libs/common/src/auth/services/master-password/master-password.service.ts +++ b/libs/common/src/auth/services/master-password/master-password.service.ts @@ -2,16 +2,17 @@ // @ts-strict-ignore import { firstValueFrom, map, Observable } from "rxjs"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { KeyGenerationService } from "../../../key-management/crypto/abstractions/key-generation.service"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { KeyGenerationService } from "@bitwarden/common/key-management/crypto/abstractions/key-generation.service"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { LogService } from "../../../platform/abstractions/log.service"; import { StateService } from "../../../platform/abstractions/state.service"; -import { EncryptionType } from "../../../platform/enums"; import { MASTER_PASSWORD_DISK, MASTER_PASSWORD_MEMORY, diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts index 102e4bac8da..49b41e9a8da 100644 --- a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts +++ b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts @@ -7,6 +7,7 @@ import { UserDecryptionOptions, UserDecryptionOptionsServiceAbstraction, } from "@bitwarden/auth/common"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { BiometricsService, BiometricsStatus, @@ -20,7 +21,6 @@ import { KdfConfigService } from "../../../../../key-management/src/abstractions import { FakeAccountService, mockAccountServiceWith } from "../../../../spec"; import { VaultTimeoutSettingsService } from "../../../abstractions/vault-timeout/vault-timeout-settings.service"; import { I18nService } from "../../../platform/abstractions/i18n.service"; -import { HashPurpose } from "../../../platform/enums"; import { Utils } from "../../../platform/misc/utils"; import { UserId } from "../../../types/guid"; import { MasterKey } from "../../../types/key"; diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts index 4735da32b6b..2d50152d4ba 100644 --- a/libs/common/src/auth/services/user-verification/user-verification.service.ts +++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts @@ -3,6 +3,7 @@ import { firstValueFrom, map } from "rxjs"; import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common"; +import { HashPurpose } from "@bitwarden/common/key-management/crypto/enums"; import { BiometricsService, BiometricsStatus, @@ -14,7 +15,6 @@ import { // eslint-disable-next-line no-restricted-imports import { PinServiceAbstraction } from "../../../../../auth/src/common/abstractions/pin.service.abstraction"; import { I18nService } from "../../../platform/abstractions/i18n.service"; -import { HashPurpose } from "../../../platform/enums"; import { UserId } from "../../../types/guid"; import { AccountService } from "../../abstractions/account.service"; import { InternalMasterPasswordServiceAbstraction } from "../../abstractions/master-password.service.abstraction"; diff --git a/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.spec.ts b/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.spec.ts index 614c593048d..07b9a97537b 100644 --- a/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.spec.ts +++ b/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.spec.ts @@ -1,6 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { CryptoFunctionService } from "../../../key-management/crypto/abstractions/crypto-function.service"; +import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service"; import { WebAuthnLoginPrfKeyService } from "./webauthn-login-prf-key.service"; diff --git a/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.ts b/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.ts index 726fa3abd30..71446067ead 100644 --- a/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.ts +++ b/libs/common/src/auth/services/webauthn-login/webauthn-login-prf-key.service.ts @@ -1,5 +1,6 @@ -import { CryptoFunctionService } from "../../../key-management/crypto/abstractions/crypto-function.service"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { PrfKey } from "../../../types/key"; import { WebAuthnLoginPrfKeyServiceAbstraction } from "../../abstractions/webauthn/webauthn-login-prf-key.service.abstraction"; diff --git a/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts b/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts index aa6a7fb2e63..7df84310d36 100644 --- a/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts +++ b/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts @@ -1,8 +1,8 @@ import { mock } from "jest-mock-extended"; import { LoginStrategyServiceAbstraction, WebAuthnLoginCredentials } from "@bitwarden/auth/common"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { LogService } from "../../../platform/abstractions/log.service"; import { Utils } from "../../../platform/misc/utils"; import { PrfKey } from "../../../types/key"; diff --git a/libs/common/src/key-management/crypto/enums/index.ts b/libs/common/src/key-management/crypto/enums/index.ts new file mode 100644 index 00000000000..b3a0e637870 --- /dev/null +++ b/libs/common/src/key-management/crypto/enums/index.ts @@ -0,0 +1,7 @@ +export { + EncryptionType, + EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE, + encryptionTypeToString, +} from "./encryption-type.enum"; +export { HashPurpose } from "./hash-purpose.enum"; +export { KeySuffixOptions } from "./key-suffix-options.enum"; diff --git a/libs/common/src/key-management/crypto/interfaces/encrypted.ts b/libs/common/src/key-management/crypto/interfaces/encrypted.ts index 8632591d587..6f9d3a191df 100644 --- a/libs/common/src/key-management/crypto/interfaces/encrypted.ts +++ b/libs/common/src/key-management/crypto/interfaces/encrypted.ts @@ -1,4 +1,4 @@ -import { EncryptionType } from "../../../platform/enums"; +import { EncryptionType } from "../enums"; export interface Encrypted { encryptionType?: EncryptionType; diff --git a/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.spec.ts b/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.spec.ts index 35b6f4656b9..089f25f3e0d 100644 --- a/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.spec.ts +++ b/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.spec.ts @@ -1,5 +1,6 @@ +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; + import { makeStaticByteArray } from "../../../../../spec"; -import { EncryptionType } from "../../../../platform/enums"; import { EncArrayBuffer } from "./enc-array-buffer"; diff --git a/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.ts b/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.ts index 981befe815f..b591b773d18 100644 --- a/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.ts +++ b/libs/common/src/key-management/crypto/models/domain/enc-array-buffer.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncryptionType } from "../../../../platform/enums"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; + import { Utils } from "../../../../platform/misc/utils"; import { Encrypted } from "../../interfaces/encrypted"; diff --git a/libs/common/src/key-management/crypto/models/domain/enc-string.spec.ts b/libs/common/src/key-management/crypto/models/domain/enc-string.spec.ts index 24dfd8fda93..71759816d87 100644 --- a/libs/common/src/key-management/crypto/models/domain/enc-string.spec.ts +++ b/libs/common/src/key-management/crypto/models/domain/enc-string.spec.ts @@ -1,10 +1,9 @@ import { mock, MockProxy } from "jest-mock-extended"; -// FIXME: remove `src` and fix import -// eslint-disable-next-line no-restricted-imports -import { KeyService } from "../../../../../../key-management/src/abstractions/key.service"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; +import { KeyService } from "@bitwarden/key-management"; + import { makeEncString, makeStaticByteArray } from "../../../../../spec"; -import { EncryptionType } from "../../../../platform/enums"; import { Utils } from "../../../../platform/misc/utils"; import { ContainerService } from "../../../../platform/services/container.service"; import { UserKey, OrgKey } from "../../../../types/key"; diff --git a/libs/common/src/key-management/crypto/models/domain/enc-string.ts b/libs/common/src/key-management/crypto/models/domain/enc-string.ts index bebe3d1c725..69adb169234 100644 --- a/libs/common/src/key-management/crypto/models/domain/enc-string.ts +++ b/libs/common/src/key-management/crypto/models/domain/enc-string.ts @@ -2,9 +2,9 @@ // @ts-strict-ignore import { Jsonify, Opaque } from "type-fest"; -import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../../../platform/enums"; import { Utils } from "../../../../platform/misc/utils"; import { EncryptService } from "../../abstractions/encrypt.service"; +import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../enums"; import { Encrypted } from "../../interfaces/encrypted"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.spec.ts b/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.spec.ts index 083c893e438..61516b5bd70 100644 --- a/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.spec.ts +++ b/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.spec.ts @@ -1,5 +1,6 @@ +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; + import { makeStaticByteArray } from "../../../../../spec"; -import { EncryptionType } from "../../../../platform/enums"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.ts b/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.ts index d7a4a136238..96226a67461 100644 --- a/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.ts +++ b/libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.ts @@ -2,8 +2,8 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncryptionType } from "../../../../platform/enums"; import { Utils } from "../../../../platform/misc/utils"; +import { EncryptionType } from "../../enums"; export class SymmetricCryptoKey { key: Uint8Array; diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts index c531dc41816..9a61d11b9f4 100644 --- a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts +++ b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts @@ -1,10 +1,11 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { LogService } from "../../../platform/abstractions/log.service"; import { EncryptionType, encryptionTypeToString as encryptionTypeName, -} from "../../../platform/enums"; +} from "@bitwarden/common/key-management/crypto/enums"; + +import { LogService } from "../../../platform/abstractions/log.service"; import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface"; import { Utils } from "../../../platform/misc/utils"; import { CryptoFunctionService } from "../abstractions/crypto-function.service"; diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts index 17ca4d3a7b1..53666ac3ff8 100644 --- a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts +++ b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts @@ -2,10 +2,10 @@ import { mockReset, mock } from "jest-mock-extended"; import { makeStaticByteArray } from "../../../../spec"; import { LogService } from "../../../platform/abstractions/log.service"; -import { EncryptionType } from "../../../platform/enums"; import { Utils } from "../../../platform/misc/utils"; import { CsprngArray } from "../../../types/csprng"; import { CryptoFunctionService } from "../abstractions/crypto-function.service"; +import { EncryptionType } from "../enums"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; diff --git a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts index 04c53e1f2cf..09b18571239 100644 --- a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts +++ b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts @@ -1,5 +1,6 @@ -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { FileUploadType } from "../../enums"; export abstract class FileUploadService { diff --git a/libs/common/src/platform/enums/index.ts b/libs/common/src/platform/enums/index.ts index 92116314b49..69e6356b693 100644 --- a/libs/common/src/platform/enums/index.ts +++ b/libs/common/src/platform/enums/index.ts @@ -1,8 +1,5 @@ -export * from "../../key-management/crypto/enums/encryption-type.enum"; export * from "./file-upload-type.enum"; -export * from "../../key-management/crypto/enums/hash-purpose.enum"; export * from "./html-storage-location.enum"; -export * from "../../key-management/crypto/enums/key-suffix-options.enum"; export * from "./log-level-type.enum"; export * from "./storage-location.enum"; export * from "./theme-type.enum"; diff --git a/libs/common/src/platform/models/domain/account.ts b/libs/common/src/platform/models/domain/account.ts index 2ffea1fa457..12234732d7b 100644 --- a/libs/common/src/platform/models/domain/account.ts +++ b/libs/common/src/platform/models/domain/account.ts @@ -2,7 +2,8 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { DeepJsonify } from "../../../types/deep-jsonify"; import { Utils } from "../../misc/utils"; diff --git a/libs/common/src/platform/models/domain/domain-base.spec.ts b/libs/common/src/platform/models/domain/domain-base.spec.ts index 48eb3cbd2b2..319a5170fd9 100644 --- a/libs/common/src/platform/models/domain/domain-base.spec.ts +++ b/libs/common/src/platform/models/domain/domain-base.spec.ts @@ -1,8 +1,9 @@ import { mock, MockProxy } from "jest-mock-extended"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { makeEncString, makeSymmetricCryptoKey } from "../../../../spec"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; import { Utils } from "../../misc/utils"; import Domain from "./domain-base"; diff --git a/libs/common/src/platform/models/domain/domain-base.ts b/libs/common/src/platform/models/domain/domain-base.ts index 8f08b4d7379..e18bc91805e 100644 --- a/libs/common/src/platform/models/domain/domain-base.ts +++ b/libs/common/src/platform/models/domain/domain-base.ts @@ -2,9 +2,10 @@ // @ts-strict-ignore import { ConditionalExcept, ConditionalKeys, Constructor } from "type-fest"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { View } from "../../../models/view/view"; // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type diff --git a/libs/common/src/platform/services/file-upload/azure-file-upload.service.ts b/libs/common/src/platform/services/file-upload/azure-file-upload.service.ts index 1e796b5dba6..cc6cfc1d1d8 100644 --- a/libs/common/src/platform/services/file-upload/azure-file-upload.service.ts +++ b/libs/common/src/platform/services/file-upload/azure-file-upload.service.ts @@ -1,7 +1,8 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; + import { ApiService } from "../../../abstractions/api.service"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; import { LogService } from "../../abstractions/log.service"; import { Utils } from "../../misc/utils"; diff --git a/libs/common/src/platform/services/file-upload/bitwarden-file-upload.service.ts b/libs/common/src/platform/services/file-upload/bitwarden-file-upload.service.ts index 7fa7575c3c3..e68af2ab19b 100644 --- a/libs/common/src/platform/services/file-upload/bitwarden-file-upload.service.ts +++ b/libs/common/src/platform/services/file-upload/bitwarden-file-upload.service.ts @@ -1,4 +1,5 @@ -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; + import { Utils } from "../../misc/utils"; export class BitwardenFileUploadService { diff --git a/libs/common/src/platform/services/file-upload/file-upload.service.ts b/libs/common/src/platform/services/file-upload/file-upload.service.ts index 0677559535f..b88c3752158 100644 --- a/libs/common/src/platform/services/file-upload/file-upload.service.ts +++ b/libs/common/src/platform/services/file-upload/file-upload.service.ts @@ -1,8 +1,9 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { ApiService } from "../../../abstractions/api.service"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; import { FileUploadApiMethods, FileUploadService as FileUploadServiceAbstraction, diff --git a/libs/common/src/platform/services/key-state/provider-keys.state.ts b/libs/common/src/platform/services/key-state/provider-keys.state.ts index 8ee9b08a0a4..d8fda366fb3 100644 --- a/libs/common/src/platform/services/key-state/provider-keys.state.ts +++ b/libs/common/src/platform/services/key-state/provider-keys.state.ts @@ -1,4 +1,5 @@ -import { EncryptedString } from "../../../key-management/crypto/models/domain/enc-string"; +import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { ProviderId } from "../../../types/guid"; import { CRYPTO_DISK, UserKeyDefinition } from "../../state"; diff --git a/libs/common/src/platform/services/key-state/user-key.state.spec.ts b/libs/common/src/platform/services/key-state/user-key.state.spec.ts index 7472da61803..bfa6518f088 100644 --- a/libs/common/src/platform/services/key-state/user-key.state.spec.ts +++ b/libs/common/src/platform/services/key-state/user-key.state.spec.ts @@ -1,5 +1,6 @@ -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { EncryptionType } from "../../enums"; +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { Utils } from "../../misc/utils"; import { USER_ENCRYPTED_PRIVATE_KEY, USER_EVER_HAD_USER_KEY } from "./user-key.state"; diff --git a/libs/common/src/platform/services/key-state/user-key.state.ts b/libs/common/src/platform/services/key-state/user-key.state.ts index 5d056b29f6e..95ef0e98815 100644 --- a/libs/common/src/platform/services/key-state/user-key.state.ts +++ b/libs/common/src/platform/services/key-state/user-key.state.ts @@ -1,5 +1,6 @@ -import { EncryptedString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { UserKey } from "../../../types/key"; import { CRYPTO_DISK, CRYPTO_MEMORY, UserKeyDefinition } from "../../state"; diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts index 8d582e14deb..9f0a1a14a5e 100644 --- a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts +++ b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts @@ -1,12 +1,12 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom, of } from "rxjs"; +import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management"; import { BitwardenClient } from "@bitwarden/sdk-internal"; import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service"; -import { EncryptedString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { Environment, EnvironmentService } from "../../abstractions/environment.service"; diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts index e2dcb69e8e8..240c9b33a92 100644 --- a/libs/common/src/platform/services/sdk/default-sdk.service.ts +++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts @@ -12,6 +12,7 @@ import { catchError, } from "rxjs"; +import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; import { KeyService, KdfConfigService, KdfConfig, KdfType } from "@bitwarden/key-management"; import { BitwardenClient, @@ -23,7 +24,6 @@ import { import { EncryptedOrganizationKeyData } from "../../../admin-console/models/data/encrypted-organization-key.data"; import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service"; import { DeviceType } from "../../../enums/device-type.enum"; -import { EncryptedString } from "../../../key-management/crypto/models/domain/enc-string"; import { OrganizationId, UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { Environment, EnvironmentService } from "../../abstractions/environment.service"; diff --git a/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts b/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts index cd4ff683fbf..e3a866e22cd 100644 --- a/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts +++ b/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts @@ -1,13 +1,12 @@ import { mock } from "jest-mock-extended"; -// FIXME: remove `src` and fix import -// eslint-disable-next-line no-restricted-imports -import { DefaultKeyService } from "../../../../key-management/src/key.service"; -import { SymmetricCryptoKey } from "../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { KeySuffixOptions } from "@bitwarden/common/key-management/crypto/enums"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; +import { DefaultKeyService } from "@bitwarden/key-management"; + import { CsprngArray } from "../../types/csprng"; import { UserId } from "../../types/guid"; import { UserKey } from "../../types/key"; -import { KeySuffixOptions } from "../enums"; import { Utils } from "../misc/utils"; import { UserAutoUnlockKeyService } from "./user-auto-unlock-key.service"; diff --git a/libs/common/src/platform/services/user-auto-unlock-key.service.ts b/libs/common/src/platform/services/user-auto-unlock-key.service.ts index a8947a49f45..9ae44c06574 100644 --- a/libs/common/src/platform/services/user-auto-unlock-key.service.ts +++ b/libs/common/src/platform/services/user-auto-unlock-key.service.ts @@ -1,8 +1,9 @@ +import { KeySuffixOptions } from "@bitwarden/common/key-management/crypto/enums"; + // FIXME: remove `src` and fix import // 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"; // TODO: this is a half measure improvement which allows us to reduce some side effects today (keyService.getUserKey setting user key in memory if auto key exists) // but ideally, in the future, we would be able to put this logic into the keyService diff --git a/libs/common/src/tools/send/models/domain/send-access.ts b/libs/common/src/tools/send/models/domain/send-access.ts index 3ca1d3e87ba..4d0d5312ce1 100644 --- a/libs/common/src/tools/send/models/domain/send-access.ts +++ b/libs/common/src/tools/send/models/domain/send-access.ts @@ -1,7 +1,8 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../../platform/models/domain/domain-base"; import { SendType } from "../../enums/send-type"; import { SendAccessResponse } from "../response/send-access.response"; diff --git a/libs/common/src/tools/send/models/domain/send-file.ts b/libs/common/src/tools/send/models/domain/send-file.ts index 683401b78b3..4d7d9e71a77 100644 --- a/libs/common/src/tools/send/models/domain/send-file.ts +++ b/libs/common/src/tools/send/models/domain/send-file.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../../platform/models/domain/domain-base"; import { SendFileData } from "../data/send-file.data"; import { SendFileView } from "../view/send-file.view"; diff --git a/libs/common/src/tools/send/models/domain/send-text.ts b/libs/common/src/tools/send/models/domain/send-text.ts index 0bf61de4492..9f35a903d33 100644 --- a/libs/common/src/tools/send/models/domain/send-text.ts +++ b/libs/common/src/tools/send/models/domain/send-text.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../../platform/models/domain/domain-base"; import { SendTextData } from "../data/send-text.data"; import { SendTextView } from "../view/send-text.view"; diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts index c618db39378..6a677fe5e4c 100644 --- a/libs/common/src/tools/send/models/domain/send.spec.ts +++ b/libs/common/src/tools/send/models/domain/send.spec.ts @@ -1,10 +1,10 @@ import { mock } from "jest-mock-extended"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { KeyService } from "@bitwarden/key-management"; import { makeStaticByteArray, mockEnc } from "../../../../../spec"; -import { EncryptService } from "../../../../key-management/crypto/abstractions/encrypt.service"; -import { SymmetricCryptoKey } from "../../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { ContainerService } from "../../../../platform/services/container.service"; import { UserKey } from "../../../../types/key"; import { SendType } from "../../enums/send-type"; diff --git a/libs/common/src/tools/send/models/domain/send.ts b/libs/common/src/tools/send/models/domain/send.ts index d74985e1f9b..a95d607d4c6 100644 --- a/libs/common/src/tools/send/models/domain/send.ts +++ b/libs/common/src/tools/send/models/domain/send.ts @@ -2,7 +2,8 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { Utils } from "../../../../platform/misc/utils"; import Domain from "../../../../platform/models/domain/domain-base"; import { SendType } from "../../enums/send-type"; diff --git a/libs/common/src/tools/send/models/view/send.view.ts b/libs/common/src/tools/send/models/view/send.view.ts index f8d5918943e..cae14718d1a 100644 --- a/libs/common/src/tools/send/models/view/send.view.ts +++ b/libs/common/src/tools/send/models/view/send.view.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { SymmetricCryptoKey } from "../../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { View } from "../../../../models/view/view"; import { Utils } from "../../../../platform/misc/utils"; import { DeepJsonify } from "../../../../types/deep-jsonify"; diff --git a/libs/common/src/tools/send/services/send-api.service.abstraction.ts b/libs/common/src/tools/send/services/send-api.service.abstraction.ts index b1747ff51ff..fc2b4fd6d9a 100644 --- a/libs/common/src/tools/send/services/send-api.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send-api.service.abstraction.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; + import { ListResponse } from "../../../models/response/list.response"; import { Send } from "../models/domain/send"; import { SendAccessRequest } from "../models/request/send-access.request"; diff --git a/libs/common/src/tools/send/services/send-api.service.ts b/libs/common/src/tools/send/services/send-api.service.ts index 7cebe9b0bdf..a72b953151d 100644 --- a/libs/common/src/tools/send/services/send-api.service.ts +++ b/libs/common/src/tools/send/services/send-api.service.ts @@ -1,5 +1,6 @@ +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; + import { ApiService } from "../../../abstractions/api.service"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; import { ErrorResponse } from "../../../models/response/error.response"; import { ListResponse } from "../../../models/response/list.response"; import { diff --git a/libs/common/src/tools/send/services/send.service.abstraction.ts b/libs/common/src/tools/send/services/send.service.abstraction.ts index baf695afbb4..a5fd00d22d7 100644 --- a/libs/common/src/tools/send/services/send.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send.service.abstraction.ts @@ -2,10 +2,10 @@ // @ts-strict-ignore import { Observable } from "rxjs"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { UserKeyRotationDataProvider } from "@bitwarden/key-management"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { SendData } from "../models/data/send.data"; diff --git a/libs/common/src/tools/send/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts index 88809b803e2..1da915bf9d6 100644 --- a/libs/common/src/tools/send/services/send.service.spec.ts +++ b/libs/common/src/tools/send/services/send.service.spec.ts @@ -1,6 +1,10 @@ import { mock } from "jest-mock-extended"; import { firstValueFrom, of } from "rxjs"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { KeyGenerationService } from "@bitwarden/common/key-management/crypto/abstractions/key-generation.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { KeyService } from "@bitwarden/key-management"; import { @@ -10,10 +14,6 @@ import { awaitAsync, mockAccountServiceWith, } from "../../../../spec"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { KeyGenerationService } from "../../../key-management/crypto/abstractions/key-generation.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { EnvironmentService } from "../../../platform/abstractions/environment.service"; import { I18nService } from "../../../platform/abstractions/i18n.service"; import { Utils } from "../../../platform/misc/utils"; diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts index 5f8a6f7fd6d..a953bafde9e 100644 --- a/libs/common/src/tools/send/services/send.service.ts +++ b/libs/common/src/tools/send/services/send.service.ts @@ -2,13 +2,13 @@ // @ts-strict-ignore import { Observable, concatMap, distinctUntilChanged, firstValueFrom, map } from "rxjs"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { KeyGenerationService } from "@bitwarden/common/key-management/crypto/abstractions/key-generation.service"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { PBKDF2KdfConfig, KeyService } from "@bitwarden/key-management"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { KeyGenerationService } from "../../../key-management/crypto/abstractions/key-generation.service"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { I18nService } from "../../../platform/abstractions/i18n.service"; import { Utils } from "../../../platform/misc/utils"; import { UserId } from "../../../types/guid"; diff --git a/libs/common/src/tools/send/services/test-data/send-tests.data.ts b/libs/common/src/tools/send/services/test-data/send-tests.data.ts index 82bca3f0c82..659a6829fc0 100644 --- a/libs/common/src/tools/send/services/test-data/send-tests.data.ts +++ b/libs/common/src/tools/send/services/test-data/send-tests.data.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncString } from "../../../../key-management/crypto/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { SendType } from "../../enums/send-type"; import { SendTextApi } from "../../models/api/send-text.api"; import { SendTextData } from "../../models/data/send-text.data"; diff --git a/libs/common/src/vault/abstractions/file-upload/cipher-file-upload.service.ts b/libs/common/src/vault/abstractions/file-upload/cipher-file-upload.service.ts index 4f4852b51ec..d5521be7256 100644 --- a/libs/common/src/vault/abstractions/file-upload/cipher-file-upload.service.ts +++ b/libs/common/src/vault/abstractions/file-upload/cipher-file-upload.service.ts @@ -1,8 +1,9 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { Cipher } from "../../models/domain/cipher"; import { CipherResponse } from "../../models/response/cipher.response"; diff --git a/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts index 99652842993..1ee49f26ef6 100644 --- a/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts +++ b/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts @@ -2,9 +2,9 @@ // @ts-strict-ignore import { Observable } from "rxjs"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; import { UserKeyRotationDataProvider } from "@bitwarden/key-management"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { FolderData } from "../../models/data/folder.data"; diff --git a/libs/common/src/vault/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts index 72e32d2124f..7dab1e84329 100644 --- a/libs/common/src/vault/models/domain/attachment.spec.ts +++ b/libs/common/src/vault/models/domain/attachment.spec.ts @@ -1,15 +1,14 @@ import { mock, MockProxy } from "jest-mock-extended"; -// FIXME: remove `src` and fix import -// eslint-disable-next-line no-restricted-imports -import { KeyService } from "../../../../../key-management/src/abstractions/key.service"; -import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; +import { KeyService } from "@bitwarden/key-management"; + +import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec"; import { ContainerService } from "../../../platform/services/container.service"; import { OrgKey, UserKey } from "../../../types/key"; import { AttachmentData } from "../../models/data/attachment.data"; diff --git a/libs/common/src/vault/models/domain/attachment.ts b/libs/common/src/vault/models/domain/attachment.ts index fb34429425c..804871636da 100644 --- a/libs/common/src/vault/models/domain/attachment.ts +++ b/libs/common/src/vault/models/domain/attachment.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { Utils } from "../../../platform/misc/utils"; import Domain from "../../../platform/models/domain/domain-base"; import { AttachmentData } from "../data/attachment.data"; diff --git a/libs/common/src/vault/models/domain/card.spec.ts b/libs/common/src/vault/models/domain/card.spec.ts index a7a74549560..432d396aef9 100644 --- a/libs/common/src/vault/models/domain/card.spec.ts +++ b/libs/common/src/vault/models/domain/card.spec.ts @@ -1,8 +1,9 @@ -import { mockEnc, mockFromJson } from "../../../../spec"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { mockEnc, mockFromJson } from "../../../../spec"; import { CardData } from "../../../vault/models/data/card.data"; import { Card } from "../../models/domain/card"; diff --git a/libs/common/src/vault/models/domain/card.ts b/libs/common/src/vault/models/domain/card.ts index ef723933d02..88456330c9f 100644 --- a/libs/common/src/vault/models/domain/card.ts +++ b/libs/common/src/vault/models/domain/card.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { CardData } from "../data/card.data"; import { CardView } from "../view/card.view"; diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts index 5ba0a2c3bc8..19fc33b2a31 100644 --- a/libs/common/src/vault/models/domain/cipher.spec.ts +++ b/libs/common/src/vault/models/domain/cipher.spec.ts @@ -1,13 +1,12 @@ import { mock } from "jest-mock-extended"; import { Jsonify } from "type-fest"; -// 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 "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { InitializerKey } from "@bitwarden/common/key-management/crypto/enums/initializer-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { KeyService } from "@bitwarden/key-management"; + import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { InitializerKey } from "../../../key-management/crypto/enums/initializer-key"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; import { UriMatchStrategy } from "../../../models/domain/domain-service"; import { ContainerService } from "../../../platform/services/container.service"; import { UserId } from "../../../types/guid"; diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts index e53c6937bcf..5b7dcc7be37 100644 --- a/libs/common/src/vault/models/domain/cipher.ts +++ b/libs/common/src/vault/models/domain/cipher.ts @@ -2,10 +2,11 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { InitializerKey } from "../../../key-management/crypto/enums/initializer-key"; -import { Decryptable } from "../../../key-management/crypto/interfaces/decryptable.interface"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { InitializerKey } from "@bitwarden/common/key-management/crypto/enums/initializer-key"; +import { Decryptable } from "@bitwarden/common/key-management/crypto/interfaces/decryptable.interface"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { Utils } from "../../../platform/misc/utils"; import Domain from "../../../platform/models/domain/domain-base"; import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; diff --git a/libs/common/src/vault/models/domain/fido2-credential.spec.ts b/libs/common/src/vault/models/domain/fido2-credential.spec.ts index 6827a45d9c6..5d31e76bb50 100644 --- a/libs/common/src/vault/models/domain/fido2-credential.spec.ts +++ b/libs/common/src/vault/models/domain/fido2-credential.spec.ts @@ -1,6 +1,7 @@ +import { EncryptionType } from "@bitwarden/common/key-management/crypto/enums"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { mockEnc } from "../../../../spec"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { EncryptionType } from "../../../platform/enums"; import { Fido2CredentialData } from "../data/fido2-credential.data"; import { Fido2Credential } from "./fido2-credential"; diff --git a/libs/common/src/vault/models/domain/fido2-credential.ts b/libs/common/src/vault/models/domain/fido2-credential.ts index 0edc9dda223..382d60542a6 100644 --- a/libs/common/src/vault/models/domain/fido2-credential.ts +++ b/libs/common/src/vault/models/domain/fido2-credential.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { Fido2CredentialData } from "../data/fido2-credential.data"; import { Fido2CredentialView } from "../view/fido2-credential.view"; diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts index 5a48ce5fa1e..26d159e7d71 100644 --- a/libs/common/src/vault/models/domain/field.spec.ts +++ b/libs/common/src/vault/models/domain/field.spec.ts @@ -1,8 +1,9 @@ -import { mockEnc, mockFromJson } from "../../../../spec"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { mockEnc, mockFromJson } from "../../../../spec"; import { FieldType } from "../../enums"; import { FieldData } from "../../models/data/field.data"; import { Field } from "../../models/domain/field"; diff --git a/libs/common/src/vault/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts index 0d133c77e9a..b62f2b32030 100644 --- a/libs/common/src/vault/models/domain/field.ts +++ b/libs/common/src/vault/models/domain/field.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { FieldType, LinkedIdType } from "../../enums"; import { FieldData } from "../data/field.data"; diff --git a/libs/common/src/vault/models/domain/folder.spec.ts b/libs/common/src/vault/models/domain/folder.spec.ts index 86af071d803..13e82ec0acb 100644 --- a/libs/common/src/vault/models/domain/folder.spec.ts +++ b/libs/common/src/vault/models/domain/folder.spec.ts @@ -1,11 +1,12 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { makeEncString, makeSymmetricCryptoKey, mockEnc, mockFromJson } from "../../../../spec"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { makeEncString, makeSymmetricCryptoKey, mockEnc, mockFromJson } from "../../../../spec"; import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; @@ -46,7 +47,7 @@ describe("Folder", () => { }); describe("fromJSON", () => { - jest.mock("../../../key-management/crypto/models/domain/enc-string"); + jest.mock("@bitwarden/common/key-management/crypto/models/domain/enc-string"); jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson); it("initializes nested objects", () => { diff --git a/libs/common/src/vault/models/domain/folder.ts b/libs/common/src/vault/models/domain/folder.ts index 83203007e65..a82a577a545 100644 --- a/libs/common/src/vault/models/domain/folder.ts +++ b/libs/common/src/vault/models/domain/folder.ts @@ -2,9 +2,10 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { FolderData } from "../data/folder.data"; import { FolderView } from "../view/folder.view"; diff --git a/libs/common/src/vault/models/domain/identity.spec.ts b/libs/common/src/vault/models/domain/identity.spec.ts index f7c147f7511..f7abbd51269 100644 --- a/libs/common/src/vault/models/domain/identity.spec.ts +++ b/libs/common/src/vault/models/domain/identity.spec.ts @@ -1,8 +1,9 @@ -import { mockEnc, mockFromJson } from "../../../../spec"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { mockEnc, mockFromJson } from "../../../../spec"; import { IdentityData } from "../../models/data/identity.data"; import { Identity } from "../../models/domain/identity"; diff --git a/libs/common/src/vault/models/domain/identity.ts b/libs/common/src/vault/models/domain/identity.ts index 83babd34152..563a6e2a05c 100644 --- a/libs/common/src/vault/models/domain/identity.ts +++ b/libs/common/src/vault/models/domain/identity.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { IdentityData } from "../data/identity.data"; import { IdentityView } from "../view/identity.view"; diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts index 0ed4df6f3e8..357b4f16f67 100644 --- a/libs/common/src/vault/models/domain/login-uri.spec.ts +++ b/libs/common/src/vault/models/domain/login-uri.spec.ts @@ -1,9 +1,10 @@ import { MockProxy, mock } from "jest-mock-extended"; import { Jsonify } from "type-fest"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + import { mockEnc, mockFromJson } from "../../../../spec"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; import { UriMatchStrategy } from "../../../models/domain/domain-service"; import { LoginUriData } from "../data/login-uri.data"; diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts index 41afd8d16d6..7925f3cd05b 100644 --- a/libs/common/src/vault/models/domain/login-uri.ts +++ b/libs/common/src/vault/models/domain/login-uri.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { UriMatchStrategySetting } from "../../../models/domain/domain-service"; import { Utils } from "../../../platform/misc/utils"; import Domain from "../../../platform/models/domain/domain-base"; diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts index 9b0b2b210ca..a743b76607a 100644 --- a/libs/common/src/vault/models/domain/login.spec.ts +++ b/libs/common/src/vault/models/domain/login.spec.ts @@ -1,10 +1,11 @@ import { MockProxy, mock } from "jest-mock-extended"; -import { mockEnc, mockFromJson } from "../../../../spec"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { mockEnc, mockFromJson } from "../../../../spec"; import { UriMatchStrategy, UriMatchStrategySetting } from "../../../models/domain/domain-service"; import { LoginData } from "../../models/data/login.data"; import { Login } from "../../models/domain/login"; diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts index eb3421c2cc3..5191339cd34 100644 --- a/libs/common/src/vault/models/domain/login.ts +++ b/libs/common/src/vault/models/domain/login.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { LoginData } from "../data/login.data"; import { LoginView } from "../view/login.view"; diff --git a/libs/common/src/vault/models/domain/password.spec.ts b/libs/common/src/vault/models/domain/password.spec.ts index e3e5a179df7..0708e162c6d 100644 --- a/libs/common/src/vault/models/domain/password.spec.ts +++ b/libs/common/src/vault/models/domain/password.spec.ts @@ -1,8 +1,9 @@ -import { mockEnc, mockFromJson } from "../../../../spec"; import { EncryptedString, EncString, -} from "../../../key-management/crypto/models/domain/enc-string"; +} from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; + +import { mockEnc, mockFromJson } from "../../../../spec"; import { PasswordHistoryData } from "../../models/data/password-history.data"; import { Password } from "../../models/domain/password"; diff --git a/libs/common/src/vault/models/domain/password.ts b/libs/common/src/vault/models/domain/password.ts index a34d40b0008..6c13d6b06cf 100644 --- a/libs/common/src/vault/models/domain/password.ts +++ b/libs/common/src/vault/models/domain/password.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { PasswordHistoryData } from "../data/password-history.data"; import { PasswordHistoryView } from "../view/password-history.view"; diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts index ee7e26ce25e..dfe51a58423 100644 --- a/libs/common/src/vault/models/domain/secure-note.ts +++ b/libs/common/src/vault/models/domain/secure-note.ts @@ -2,7 +2,8 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { SecureNoteType } from "../../enums"; import { SecureNoteData } from "../data/secure-note.data"; diff --git a/libs/common/src/vault/models/domain/ssh-key.ts b/libs/common/src/vault/models/domain/ssh-key.ts index 6340160953f..871d2e6051c 100644 --- a/libs/common/src/vault/models/domain/ssh-key.ts +++ b/libs/common/src/vault/models/domain/ssh-key.ts @@ -2,8 +2,9 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import Domain from "../../../platform/models/domain/domain-base"; import { SshKeyData } from "../data/ssh-key.data"; import { SshKeyView } from "../view/ssh-key.view"; diff --git a/libs/common/src/vault/models/view/attachment.view.spec.ts b/libs/common/src/vault/models/view/attachment.view.spec.ts index df39422617d..e5b33b966db 100644 --- a/libs/common/src/vault/models/view/attachment.view.spec.ts +++ b/libs/common/src/vault/models/view/attachment.view.spec.ts @@ -1,9 +1,10 @@ +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { mockFromJson } from "../../../../spec"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { AttachmentView } from "./attachment.view"; -jest.mock("../../../key-management/crypto/models/domain/symmetric-crypto-key"); +jest.mock("@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"); describe("AttachmentView", () => { it("fromJSON initializes nested objects", () => { diff --git a/libs/common/src/vault/models/view/attachment.view.ts b/libs/common/src/vault/models/view/attachment.view.ts index 28baf17160d..d0b42252a07 100644 --- a/libs/common/src/vault/models/view/attachment.view.ts +++ b/libs/common/src/vault/models/view/attachment.view.ts @@ -2,7 +2,8 @@ // @ts-strict-ignore import { Jsonify } from "type-fest"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { View } from "../../../models/view/view"; import { Attachment } from "../domain/attachment"; diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts index 859f4c870d8..3e58da7bc93 100644 --- a/libs/common/src/vault/models/view/cipher.view.ts +++ b/libs/common/src/vault/models/view/cipher.view.ts @@ -1,6 +1,7 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { InitializerKey } from "../../../key-management/crypto/enums/initializer-key"; +import { InitializerKey } from "@bitwarden/common/key-management/crypto/enums/initializer-key"; + import { View } from "../../../models/view/view"; import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface"; import { DeepJsonify } from "../../../types/deep-jsonify"; diff --git a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts index 4b39818c70f..707d2a4d1b4 100644 --- a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts +++ b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts @@ -1,9 +1,10 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore +import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { ApiService } from "../../../abstractions/api.service"; -import { EncArrayBuffer } from "../../../key-management/crypto/models/domain/enc-array-buffer"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { ErrorResponse } from "../../../models/response/error.response"; import { FileUploadApiMethods, diff --git a/libs/common/src/vault/services/folder/folder.service.spec.ts b/libs/common/src/vault/services/folder/folder.service.spec.ts index 41fcec1d89c..49ca2215291 100644 --- a/libs/common/src/vault/services/folder/folder.service.spec.ts +++ b/libs/common/src/vault/services/folder/folder.service.spec.ts @@ -1,16 +1,15 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -// 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 "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; +import { KeyService } from "@bitwarden/key-management"; + import { makeEncString } from "../../../../spec"; import { FakeAccountService, mockAccountServiceWith } from "../../../../spec/fake-account-service"; import { FakeSingleUserState } from "../../../../spec/fake-state"; import { FakeStateProvider } from "../../../../spec/fake-state-provider"; -import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service"; -import { EncString } from "../../../key-management/crypto/models/domain/enc-string"; -import { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { I18nService } from "../../../platform/abstractions/i18n.service"; import { Utils } from "../../../platform/misc/utils"; import { UserId } from "../../../types/guid"; diff --git a/libs/common/src/vault/services/folder/folder.service.ts b/libs/common/src/vault/services/folder/folder.service.ts index 25c11e4b03c..6f8118378e0 100644 --- a/libs/common/src/vault/services/folder/folder.service.ts +++ b/libs/common/src/vault/services/folder/folder.service.ts @@ -2,12 +2,13 @@ // @ts-strict-ignore import { Observable, Subject, firstValueFrom, map, shareReplay, switchMap, merge } from "rxjs"; +import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; +import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key"; + import { Utils } from ".././../../platform/misc/utils"; // 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 { SymmetricCryptoKey } from "../../../key-management/crypto/models/domain/symmetric-crypto-key"; import { I18nService } from "../../../platform/abstractions/i18n.service"; import { StateProvider } from "../../../platform/state"; import { UserId } from "../../../types/guid"; diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts index c1094073799..53c53feee4a 100644 --- a/libs/key-management/src/abstractions/key.service.ts +++ b/libs/key-management/src/abstractions/key.service.ts @@ -21,7 +21,7 @@ import { ProfileProviderOrganizationResponse } from "../../../common/src/admin-c 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"; +import { KeySuffixOptions, HashPurpose } from "../../../common/src/key-management/crypto/enums"; // FIXME: remove `src` and fix import // eslint-disable-next-line no-restricted-imports import { OrganizationId, UserId } from "../../../common/src/types/guid"; diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts index 155868a3a4d..db58d08ded6 100644 --- a/libs/key-management/src/key.service.ts +++ b/libs/key-management/src/key.service.ts @@ -15,6 +15,7 @@ import { import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { KeyGenerationService } from "@bitwarden/common/key-management/crypto/abstractions/key-generation.service"; +import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/key-management/crypto/enums"; import { EncString, EncryptedString, @@ -56,9 +57,6 @@ import { PlatformUtilsService } from "../../common/src/platform/abstractions/pla 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