Merged with master and fixed conflicts

libs/common/spec/index.ts

@@ -0,0 +1,3 @@
+export * from "./utils";
+export * from "./intercept-console";
+export * from "./matchers";

libs/common/spec/matchers/index.ts

@@ -0,0 +1 @@
+export * from "./to-equal-buffer";

libs/common/src/admin-console/models/domain/collection.spec.ts

@@ -1,7 +1,7 @@
-import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data";
-import { Collection } from "@bitwarden/common/admin-console/models/domain/collection";
+import { mockEnc } from "../../../../spec";
+import { CollectionData } from "../data/collection.data";
 
-import { mockEnc } from "../../utils";
+import { Collection } from "./collection";
 
 describe("Collection", () => {
   let data: CollectionData;

libs/common/src/admin-console/services/organization/organization.service.spec.ts

@@ -1,9 +1,10 @@
 import { MockProxy, mock, any, mockClear } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom } from "rxjs";
 
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data";
-import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";
+import { StateService } from "../../../abstractions/state.service";
+import { OrganizationData } from "../../models/data/organization.data";
+
+import { OrganizationService } from "./organization.service";
 
 describe("Organization Service", () => {
   let organizationService: OrganizationService;

libs/common/src/auth/enums/sso.ts

@@ -4,6 +4,12 @@ export enum SsoType {
   Saml2 = 2,
 }
 
+export enum MemberDecryptionType {
+  MasterPassword = 0,
+  KeyConnector = 1,
+  TrustedDeviceEncryption = 2,
+}
+
 export enum OpenIdConnectRedirectBehavior {
   RedirectGet = 0,
   FormPost = 1,

libs/common/src/auth/models/api/sso-config.api.ts

@@ -1,5 +1,6 @@
 import { BaseResponse } from "../../../models/response/base.response";
 import {
+  MemberDecryptionType,
   OpenIdConnectRedirectBehavior,
   Saml2BindingType,
   Saml2NameIdFormat,
@@ -11,8 +12,8 @@ import { SsoConfigView } from "../view/sso-config.view";
 export class SsoConfigApi extends BaseResponse {
   static fromView(view: SsoConfigView, api = new SsoConfigApi()) {
     api.configType = view.configType;
+    api.memberDecryptionType = view.memberDecryptionType;
 
-    api.keyConnectorEnabled = view.keyConnectorEnabled;
     api.keyConnectorUrl = view.keyConnectorUrl;
 
     if (api.configType === SsoType.OpenIdConnect) {
@@ -52,8 +53,8 @@ export class SsoConfigApi extends BaseResponse {
     return api;
   }
   configType: SsoType;
+  memberDecryptionType: MemberDecryptionType;
 
-  keyConnectorEnabled: boolean;
   keyConnectorUrl: string;
 
   // OpenId
@@ -95,8 +96,8 @@ export class SsoConfigApi extends BaseResponse {
     }
 
     this.configType = this.getResponseProperty("ConfigType");
+    this.memberDecryptionType = this.getResponseProperty("MemberDecryptionType");
 
-    this.keyConnectorEnabled = this.getResponseProperty("KeyConnectorEnabled");
     this.keyConnectorUrl = this.getResponseProperty("KeyConnectorUrl");
 
     this.authority = this.getResponseProperty("Authority");

libs/common/src/auth/models/view/sso-config.view.ts

@@ -1,5 +1,6 @@
 import { View } from "../../../models/view/view";
 import {
+  MemberDecryptionType,
   OpenIdConnectRedirectBehavior,
   Saml2BindingType,
   Saml2NameIdFormat,
@@ -14,7 +15,7 @@ export class SsoConfigView extends View {
 
   configType: SsoType;
 
-  keyConnectorEnabled: boolean;
+  memberDecryptionType: MemberDecryptionType;
   keyConnectorUrl: string;
 
   openId: {
@@ -66,8 +67,8 @@ export class SsoConfigView extends View {
     }
 
     this.configType = orgSsoResponse.data.configType;
+    this.memberDecryptionType = orgSsoResponse.data.memberDecryptionType;
 
-    this.keyConnectorEnabled = orgSsoResponse.data.keyConnectorEnabled;
     this.keyConnectorUrl = orgSsoResponse.data.keyConnectorUrl;
 
     if (this.configType === SsoType.OpenIdConnect) {

libs/common/src/billing/models/response/organization-subscription.response.ts

@@ -11,6 +11,7 @@ export class OrganizationSubscriptionResponse extends OrganizationResponse {
   subscription: BillingSubscriptionResponse;
   upcomingInvoice: BillingSubscriptionUpcomingInvoiceResponse;
   expiration: string;
+  expirationWithoutGracePeriod: string;
 
   constructor(response: any) {
     super(response);
@@ -24,5 +25,6 @@ export class OrganizationSubscriptionResponse extends OrganizationResponse {
         ? null
         : new BillingSubscriptionUpcomingInvoiceResponse(upcomingInvoice);
     this.expiration = this.getResponseProperty("Expiration");
+    this.expirationWithoutGracePeriod = this.getResponseProperty("ExpirationWithoutGracePeriod");
   }
 }

libs/common/src/billing/models/view/self-hosted-organization-subscription.view.ts

@@ -0,0 +1,61 @@
+import { View } from "../../../models/view/view";
+import { OrganizationSubscriptionResponse } from "../response/organization-subscription.response";
+
+export class SelfHostedOrganizationSubscriptionView implements View {
+  planName: string;
+
+  /**
+   * Date the subscription expires, including the grace period.
+   */
+  expirationWithGracePeriod?: Date;
+
+  /**
+   * Date the subscription expires, excluding the grace period.
+   * This will be `null` for older (< v12) license files because they do not include this date.
+   * In this case, you have to rely on the `expirationWithGracePeriod` instead.
+   */
+  expirationWithoutGracePeriod?: Date;
+
+  constructor(response: OrganizationSubscriptionResponse) {
+    if (response == null) {
+      return;
+    }
+
+    this.planName = response.plan.name;
+    this.expirationWithGracePeriod =
+      response.expiration != null ? new Date(response.expiration) : null;
+    this.expirationWithoutGracePeriod =
+      response.expirationWithoutGracePeriod != null
+        ? new Date(response.expirationWithoutGracePeriod)
+        : null;
+  }
+
+  /**
+   * The subscription has separate expiration dates for the subscription and the end of grace period.
+   */
+  get hasSeparateGracePeriod() {
+    return this.expirationWithGracePeriod != null && this.expirationWithoutGracePeriod != null;
+  }
+
+  /**
+   * True if the subscription has an expiration date.
+   */
+  get hasExpiration() {
+    return this.expirationWithGracePeriod != null;
+  }
+
+  /**
+   * True if the subscription has an expiration date that has past, but may still be within the grace period.
+   * For older licenses (< v12), this will always be false because they do not include the `expirationWithoutGracePeriod`.
+   */
+  get isExpiredWithoutGracePeriod() {
+    return this.hasSeparateGracePeriod && this.expirationWithoutGracePeriod < new Date();
+  }
+
+  /**
+   * True if the subscription has an expiration date that has past, including the grace period.
+   */
+  get isExpiredAndOutsideGracePeriod() {
+    return this.hasExpiration && this.expirationWithGracePeriod < new Date();
+  }
+}

libs/common/src/enums/feature-flag.enum.ts

@@ -1,4 +1,5 @@
 export enum FeatureFlag {
   DisplayEuEnvironmentFlag = "display-eu-environment",
   DisplayLowKdfIterationWarningFlag = "display-kdf-iteration-warning",
+  TrustedDeviceEncryption = "trusted-device-encryption",
 }

libs/common/src/misc/sequentialize.spec.ts

@@ -1,4 +1,4 @@
-import { sequentialize } from "@bitwarden/common/misc/sequentialize";
+import { sequentialize } from "./sequentialize";
 
 describe("sequentialize decorator", () => {
   it("should call the function once", async () => {

libs/common/src/misc/throttle.spec.ts

@@ -1,5 +1,5 @@
-import { sequentialize } from "@bitwarden/common/misc/sequentialize";
-import { throttle } from "@bitwarden/common/misc/throttle";
+import { sequentialize } from "./sequentialize";
+import { throttle } from "./throttle";
 
 describe("throttle decorator", () => {
   it("should call the function once at a time", async () => {

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

@@ -1,6 +1,6 @@
 import * as path from "path";
 
-import { Utils } from "@bitwarden/common/misc/utils";
+import { Utils } from "./utils";
 
 describe("Utils Service", () => {
   describe("getDomain", () => {

libs/common/src/models/domain/account-keys.spec.ts

@@ -1,4 +1,4 @@
-import { makeStaticByteArray } from "../../../spec/utils";
+import { makeStaticByteArray } from "../../../spec";
 import { Utils } from "../../misc/utils";
 
 import { AccountKeys, EncryptionPair } from "./account";

libs/common/src/models/domain/enc-array-buffer.spec.ts

@@ -1,7 +1,7 @@
-import { EncryptionType } from "@bitwarden/common/enums";
-import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
+import { makeStaticByteArray } from "../../../spec";
+import { EncryptionType } from "../../enums";
 
-import { makeStaticByteArray } from "../../utils";
+import { EncArrayBuffer } from "./enc-array-buffer";
 
 describe("encArrayBuffer", () => {
   describe("parses the buffer", () => {

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

@@ -2,12 +2,13 @@
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { EncryptionType } from "@bitwarden/common/enums";
-import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
-import { ContainerService } from "@bitwarden/common/services/container.service";
+import { CryptoService } from "../../abstractions/crypto.service";
+import { EncryptService } from "../../abstractions/encrypt.service";
+import { EncryptionType } from "../../enums";
+import { ContainerService } from "../../services/container.service";
+
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 describe("EncString", () => {
   afterEach(() => {

libs/common/src/models/domain/symmetric-crypto-key.spec.ts

@@ -1,7 +1,7 @@
-import { EncryptionType } from "@bitwarden/common/enums";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { makeStaticByteArray } from "../../../spec";
+import { EncryptionType } from "../../enums";
 
-import { makeStaticByteArray } from "../../utils";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 describe("SymmetricCryptoKey", () => {
   it("errors if no key", () => {

libs/common/src/services/console-log.service.spec.ts

@@ -1,6 +1,6 @@
-import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
+import { interceptConsole, restoreConsole } from "../../spec";
 
-import { interceptConsole, restoreConsole } from "../shared/interceptConsole";
+import { ConsoleLogService } from "./consoleLog.service";
 
 let caughtMessage: any;
 

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

@@ -1,11 +1,11 @@
 import { mock, mockReset } from "jest-mock-extended";
 
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { CryptoService } from "@bitwarden/common/services/crypto.service";
+import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
+import { EncryptService } from "../abstractions/encrypt.service";
+import { LogService } from "../abstractions/log.service";
+import { PlatformUtilsService } from "../abstractions/platformUtils.service";
+import { StateService } from "../abstractions/state.service";
+import { CryptoService } from "../services/crypto.service";
 
 describe("cryptoService", () => {
   let cryptoService: CryptoService;

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

@@ -1,15 +1,15 @@
 import { mockReset, mock } from "jest-mock-extended";
 
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { EncryptionType } from "@bitwarden/common/enums";
-import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
-import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
-import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation";
+import { makeStaticByteArray } from "../../spec";
+import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
+import { LogService } from "../abstractions/log.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";
+import { CsprngArray } from "../types/csprng";
 
-import { CsprngArray } from "../../src/types/csprng";
-import { makeStaticByteArray } from "../utils";
+import { EncryptServiceImplementation } from "./cryptography/encrypt.service.implementation";
 
 describe("EncryptService", () => {
   const cryptoFunctionService = mock<CryptoFunctionService>();

libs/common/src/services/organization-domain/org-domain-api.service.spec.ts

@@ -1,14 +1,15 @@
 import { mock } from "jest-mock-extended";
 import { lastValueFrom } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain-sso-details.response";
-import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrgDomainApiService } from "@bitwarden/common/services/organization-domain/org-domain-api.service";
-import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service";
-import { OrganizationDomainSsoDetailsRequest } from "@bitwarden/common/services/organization-domain/requests/organization-domain-sso-details.request";
+import { ApiService } from "../../abstractions/api.service";
+import { I18nService } from "../../abstractions/i18n.service";
+import { OrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/organization-domain-sso-details.response";
+import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
+import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
+
+import { OrgDomainApiService } from "./org-domain-api.service";
+import { OrgDomainService } from "./org-domain.service";
+import { OrganizationDomainSsoDetailsRequest } from "./requests/organization-domain-sso-details.request";
 
 const mockedGetAllByOrgIdResponse: any = {
   data: [

libs/common/src/services/organization-domain/org-domain.service.spec.ts

@@ -1,10 +1,11 @@
 import { mock, mockReset } from "jest-mock-extended";
 import { lastValueFrom } from "rxjs";
 
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service";
+import { I18nService } from "../../abstractions/i18n.service";
+import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
+import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
+
+import { OrgDomainService } from "./org-domain.service";
 
 const mockedUnverifiedDomainServerResponse = {
   creationDate: "2022-12-13T23:16:43.7066667Z",

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

@@ -2,22 +2,23 @@
 import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 import { BehaviorSubject, firstValueFrom } from "rxjs";
 
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums";
-import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api";
-import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data";
-import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/reset-password-policy-options";
-import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
-import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
-import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { ContainerService } from "@bitwarden/common/services/container.service";
-import { StateService } from "@bitwarden/common/services/state.service";
+import { CryptoService } from "../abstractions/crypto.service";
+import { EncryptService } from "../abstractions/encrypt.service";
+import { OrganizationService } from "../admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserStatusType, PolicyType } from "../admin-console/enums";
+import { PermissionsApi } from "../admin-console/models/api/permissions.api";
+import { OrganizationData } from "../admin-console/models/data/organization.data";
+import { PolicyData } from "../admin-console/models/data/policy.data";
+import { MasterPasswordPolicyOptions } from "../admin-console/models/domain/master-password-policy-options";
+import { Organization } from "../admin-console/models/domain/organization";
+import { Policy } from "../admin-console/models/domain/policy";
+import { ResetPasswordPolicyOptions } from "../admin-console/models/domain/reset-password-policy-options";
+import { PolicyResponse } from "../admin-console/models/response/policy.response";
+import { PolicyService } from "../admin-console/services/policy/policy.service";
+import { ListResponse } from "../models/response/list.response";
+
+import { ContainerService } from "./container.service";
+import { StateService } from "./state.service";
 
 describe("PolicyService", () => {
   let policyService: PolicyService;

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

@@ -2,11 +2,12 @@
 import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 import { BehaviorSubject, firstValueFrom } from "rxjs";
 
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { ContainerService } from "@bitwarden/common/services/container.service";
-import { SettingsService } from "@bitwarden/common/services/settings.service";
-import { StateService } from "@bitwarden/common/services/state.service";
+import { CryptoService } from "../abstractions/crypto.service";
+import { EncryptService } from "../abstractions/encrypt.service";
+
+import { ContainerService } from "./container.service";
+import { SettingsService } from "./settings.service";
+import { StateService } from "./state.service";
 
 describe("SettingsService", () => {
   let settingsService: SettingsService;

libs/common/src/services/state-migration.service.spec.ts

@@ -2,12 +2,13 @@
 import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 import { MockProxy, any, mock } from "jest-mock-extended";
 
-import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
-import { StateVersion } from "@bitwarden/common/enums";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Account } from "@bitwarden/common/models/domain/account";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
+import { AbstractStorageService } from "../abstractions/storage.service";
+import { StateVersion } from "../enums";
+import { StateFactory } from "../factories/stateFactory";
+import { Account } from "../models/domain/account";
+import { GlobalState } from "../models/domain/global-state";
+
+import { StateMigrationService } from "./stateMigration.service";
 
 const userId = "USER_ID";
 

libs/common/src/services/web-crypto-function.service.spec.ts

@@ -1,10 +1,11 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute } from "@fluffy-spoon/substitute";
 
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
-import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
+import { PlatformUtilsService } from "../abstractions/platformUtils.service";
+import { Utils } from "../misc/utils";
+import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
+
+import { WebCryptoFunctionService } from "./webCryptoFunction.service";
 
 const RsaPublicKey =
   "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" +

libs/common/src/tools/send/models/domain/send-access.spec.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
 
-import { mockEnc } from "../../../../../spec/utils";
+import { mockEnc } from "../../../../../spec";
 import { SendType } from "../../enums/send-type";
 import { SendAccessResponse } from "../response/send-access.response";
 

libs/common/src/tools/send/models/domain/send-file.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc } from "../../../../../spec/utils";
+import { mockEnc } from "../../../../../spec";
 import { SendFileData } from "../data/send-file.data";
 
 import { SendFile } from "./send-file";

libs/common/src/tools/send/models/domain/send-text.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc } from "../../../../../spec/utils";
+import { mockEnc } from "../../../../../spec";
 import { SendTextData } from "../data/send-text.data";
 
 import { SendText } from "./send-text";

libs/common/src/tools/send/models/domain/send.spec.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { makeStaticByteArray, mockEnc } from "../../../../../spec/utils";
+import { makeStaticByteArray, mockEnc } from "../../../../../spec";
 import { CryptoService } from "../../../../abstractions/crypto.service";
 import { EncryptService } from "../../../../abstractions/encrypt.service";
 import { EncString } from "../../../../models/domain/enc-string";

libs/common/src/vault/models/domain/attachment.spec.ts

@@ -1,6 +1,6 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
+import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec";
 import { CryptoService } from "../../../abstractions/crypto.service";
 import { EncryptService } from "../../../abstractions/encrypt.service";
 import { EncString } from "../../../models/domain/enc-string";

libs/common/src/vault/models/domain/card.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncString } from "../../../models/domain/enc-string";
 import { CardData } from "../../../vault/models/data/card.data";
 import { Card } from "../../models/domain/card";

libs/common/src/vault/models/domain/cipher.spec.ts

@@ -2,7 +2,7 @@
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
 import { Jsonify } from "type-fest";
 
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { FieldType, SecureNoteType, UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { InitializerKey } from "../../../services/cryptography/initializer-key";

libs/common/src/vault/models/domain/field.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { FieldType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { FieldData } from "../../models/data/field.data";

libs/common/src/vault/models/domain/folder.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncString } from "../../../models/domain/enc-string";
 import { FolderData } from "../../models/data/folder.data";
 import { Folder } from "../../models/domain/folder";

libs/common/src/vault/models/domain/identity.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncString } from "../../../models/domain/enc-string";
 import { IdentityData } from "../../models/data/identity.data";
 import { Identity } from "../../models/domain/identity";

libs/common/src/vault/models/domain/login-uri.spec.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { LoginUriData } from "../data/login-uri.data";

libs/common/src/vault/models/domain/login.spec.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
 
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { LoginData } from "../../models/data/login.data";

libs/common/src/vault/models/domain/password.spec.ts

@@ -1,4 +1,4 @@
-import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncString } from "../../../models/domain/enc-string";
 import { PasswordHistoryData } from "../../models/data/password-history.data";
 import { Password } from "../../models/domain/password";

libs/common/src/vault/models/view/attachment.view.spec.ts

@@ -1,4 +1,4 @@
-import { mockFromJson } from "../../../../spec/utils";
+import { mockFromJson } from "../../../../spec";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 
 import { AttachmentView } from "./attachment.view";

libs/common/src/vault/models/view/cipher.view.spec.ts

@@ -1,4 +1,4 @@
-import { mockFromJson } from "../../../../spec/utils";
+import { mockFromJson } from "../../../../spec";
 import { CipherType } from "../../enums/cipher-type";
 
 import { AttachmentView } from "./attachment.view";

libs/common/src/vault/models/view/login.view.spec.ts

@@ -1,4 +1,4 @@
-import { mockFromJson } from "../../../../spec/utils";
+import { mockFromJson } from "../../../../spec";
 
 import { LoginUriView } from "./login-uri.view";
 import { LoginView } from "./login.view";

libs/common/test.setup.ts

@@ -1,6 +1,6 @@
 import { webcrypto } from "crypto";
 
-import { toEqualBuffer } from "./spec/matchers/toEqualBuffer";
+import { toEqualBuffer } from "./spec";
 
 Object.defineProperty(window, "crypto", {
   value: webcrypto,