diff --git a/libs/key-management/package.json b/libs/key-management/package.json index fe7d75530e7..4d831eda936 100644 --- a/libs/key-management/package.json +++ b/libs/key-management/package.json @@ -15,7 +15,8 @@ "scripts": { "clean": "rimraf dist", "build": "npm run clean && tsc && tsc-strict", - "build:watch": "npm run clean && tsc -watch" + "build:watch": "npm run clean && tsc -watch", + "test": "jest" }, "dependencies": { "@bitwarden/angular": "file:../angular", diff --git a/libs/key-management/src/biometrics/biometric-state.service.spec.ts b/libs/key-management/src/biometrics/biometric-state.service.spec.ts index 7aff750941c..eb95c3179f5 100644 --- a/libs/key-management/src/biometrics/biometric-state.service.spec.ts +++ b/libs/key-management/src/biometrics/biometric-state.service.spec.ts @@ -1,13 +1,15 @@ import { firstValueFrom } from "rxjs"; import { EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string"; -import { makeEncString, trackEmissions } from "@bitwarden/common/spec"; import { + makeEncString, + trackEmissions, FakeAccountService, mockAccountServiceWith, -} from "@bitwarden/common/spec/fake-account-service"; -import { FakeGlobalState, FakeSingleUserState } from "@bitwarden/common/spec/fake-state"; -import { FakeStateProvider } from "@bitwarden/common/spec/fake-state-provider"; + FakeStateProvider, + FakeGlobalState, + FakeSingleUserState, +} from "@bitwarden/common/spec"; import { UserId } from "@bitwarden/common/types/guid"; import { BiometricStateService, DefaultBiometricStateService } from "./biometric-state.service"; diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts index b4905747b87..3a4043cc2ed 100644 --- a/libs/key-management/src/key.service.spec.ts +++ b/libs/key-management/src/key.service.spec.ts @@ -2,47 +2,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 { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service"; +import { FakeMasterPasswordService } from "@bitwarden/common/auth/services/master-password/fake-master-password.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +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 "@bitwarden/common/spec"; -import { FakeAccountService, mockAccountServiceWith, -} from "@bitwarden/common/spec/fake-account-service"; -import { FakeActiveUserState, FakeSingleUserState } from "@bitwarden/common/spec/fake-state"; -import { FakeStateProvider } from "@bitwarden/common/spec/fake-state-provider"; -import { EncryptedOrganizationKeyData } from "@bitwarden/common/src/admin-console/models/data/encrypted-organization-key.data"; -import { KdfConfigService } from "@bitwarden/common/src/auth/abstractions/kdf-config.service"; -import { FakeMasterPasswordService } from "@bitwarden/common/src/auth/services/master-password/fake-master-password.service"; -import { CryptoFunctionService } from "@bitwarden/common/src/platform/abstractions/crypto-function.service"; -import { EncryptService } from "@bitwarden/common/src/platform/abstractions/encrypt.service"; -import { KeyGenerationService } from "@bitwarden/common/src/platform/abstractions/key-generation.service"; -import { LogService } from "@bitwarden/common/src/platform/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/src/platform/abstractions/platform-utils.service"; -import { StateService } from "@bitwarden/common/src/platform/abstractions/state.service"; -import { Encrypted } from "@bitwarden/common/src/platform/interfaces/encrypted"; -import { Utils } from "@bitwarden/common/src/platform/misc/utils"; -import { - EncString, - EncryptedString, -} from "@bitwarden/common/src/platform/models/domain/enc-string"; -import { SymmetricCryptoKey } from "@bitwarden/common/src/platform/models/domain/symmetric-crypto-key"; -import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "@bitwarden/common/src/platform/services/key-state/org-keys.state"; -import { USER_ENCRYPTED_PROVIDER_KEYS } from "@bitwarden/common/src/platform/services/key-state/provider-keys.state"; -import { - USER_ENCRYPTED_PRIVATE_KEY, - USER_EVER_HAD_USER_KEY, - USER_KEY, -} from "@bitwarden/common/src/platform/services/key-state/user-key.state"; -import { UserKeyDefinition } from "@bitwarden/common/src/platform/state"; -import { VAULT_TIMEOUT } from "@bitwarden/common/src/services/vault-timeout/vault-timeout-settings.state"; -import { CsprngArray } from "@bitwarden/common/src/types/csprng"; -import { OrganizationId, UserId } from "@bitwarden/common/src/types/guid"; -import { UserKey, MasterKey } from "@bitwarden/common/src/types/key"; -import { VaultTimeoutStringType } from "@bitwarden/common/src/types/vault-timeout.type"; + FakeActiveUserState, + FakeSingleUserState, + FakeStateProvider, +} from "@bitwarden/common/spec"; +import { CsprngArray } from "@bitwarden/common/types/csprng"; +import { OrganizationId, UserId } from "@bitwarden/common/types/guid"; +import { UserKey, MasterKey } from "@bitwarden/common/types/key"; +import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type"; import { UserPrivateKeyDecryptionFailedError } from "./abstractions/key.service"; import { DefaultKeyService } from "./key.service"; diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json index 4661e36d666..053ae1a071e 100644 --- a/libs/key-management/tsconfig.json +++ b/libs/key-management/tsconfig.json @@ -10,5 +10,8 @@ "excludePattern": ["**/*.spec.ts"] } ] + }, + "paths": { + "@bitwarden/common/*": ["../common/src/*"] } }