diff --git a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts index 8f8e6b46945..5a681ec2913 100644 --- a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts +++ b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts @@ -1,12 +1,12 @@ import { mock } from "jest-mock-extended"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { SyncService } from "@bitwarden/common/platform/sync"; -import { UserId } from "@bitwarden/common/types/guid"; // eslint-disable-next-line no-restricted-imports import { KdfConfigService } from "@bitwarden/key-management"; import { LogService } from "@bitwarden/logging"; +import { ConfigService } from "../../platform/abstractions/config/config.service"; +import { SyncService } from "../../platform/sync"; +import { UserId } from "../../types/guid"; import { ChangeKdfService } from "../kdf/change-kdf.service.abstraction"; import { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction"; diff --git a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts index 6ecebb108b4..efd1c04bfe9 100644 --- a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts +++ b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts @@ -1,11 +1,11 @@ -import { assertNonNullish } from "@bitwarden/common/auth/utils"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { SyncService } from "@bitwarden/common/platform/sync"; -import { UserId } from "@bitwarden/common/types/guid"; // eslint-disable-next-line no-restricted-imports import { KdfConfigService } from "@bitwarden/key-management"; import { LogService } from "@bitwarden/logging"; +import { assertNonNullish } from "../../auth/utils"; +import { ConfigService } from "../../platform/abstractions/config/config.service"; +import { SyncService } from "../../platform/sync"; +import { UserId } from "../../types/guid"; import { ChangeKdfService } from "../kdf/change-kdf.service.abstraction"; import { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction"; diff --git a/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts b/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts index ea032168eb5..d2a885aa18b 100644 --- a/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts +++ b/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts @@ -1,4 +1,4 @@ -import { UserId } from "@bitwarden/common/types/guid"; +import { UserId } from "../../types/guid"; import { MigrationRequirement } from "./migrations/encrypted-migration"; diff --git a/libs/common/src/key-management/encrypted-migrator/migrations/encrypted-migration.ts b/libs/common/src/key-management/encrypted-migrator/migrations/encrypted-migration.ts index 3af60873019..e6b1dcc45f6 100644 --- a/libs/common/src/key-management/encrypted-migrator/migrations/encrypted-migration.ts +++ b/libs/common/src/key-management/encrypted-migrator/migrations/encrypted-migration.ts @@ -1,4 +1,4 @@ -import { UserId } from "@bitwarden/common/types/guid"; +import { UserId } from "../../../types/guid"; /** * @internal diff --git a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.spec.ts b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.spec.ts index b61e3f7bc85..049ba856fe5 100644 --- a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.spec.ts +++ b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.spec.ts @@ -1,8 +1,5 @@ import { mock } from "jest-mock-extended"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { UserId } from "@bitwarden/common/types/guid"; // eslint-disable-next-line no-restricted-imports import { Argon2KdfConfig, @@ -13,6 +10,9 @@ import { } from "@bitwarden/key-management"; import { LogService } from "@bitwarden/logging"; +import { FeatureFlag } from "../../../enums/feature-flag.enum"; +import { ConfigService } from "../../../platform/abstractions/config/config.service"; +import { UserId } from "../../../types/guid"; import { ChangeKdfService } from "../../kdf/change-kdf.service.abstraction"; import { MasterPasswordServiceAbstraction } from "../../master-password/abstractions/master-password.service.abstraction"; diff --git a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts index 4e2490f11f1..fe09bfc6b0b 100644 --- a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts +++ b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts @@ -1,6 +1,3 @@ -import { assertNonNullish } from "@bitwarden/common/auth/utils"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { UserId } from "@bitwarden/common/types/guid"; // eslint-disable-next-line no-restricted-imports import { @@ -11,6 +8,9 @@ import { } from "@bitwarden/key-management"; import { LogService } from "@bitwarden/logging"; +import { assertNonNullish } from "../../../auth/utils"; +import { FeatureFlag } from "../../../enums/feature-flag.enum"; +import { ConfigService } from "../../../platform/abstractions/config/config.service"; import { ChangeKdfService } from "../../kdf/change-kdf.service.abstraction"; import { MasterPasswordServiceAbstraction } from "../../master-password/abstractions/master-password.service.abstraction";