diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts b/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts index 0a98c55970b..ccb23a0b742 100644 --- a/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts +++ b/libs/common/src/platform/state/implementations/default-single-user-state.spec.ts @@ -7,11 +7,12 @@ import { mock } from "jest-mock-extended"; import { firstValueFrom, of } from "rxjs"; import { Jsonify } from "type-fest"; +import { newGuid } from "@bitwarden/guid"; + import { trackEmissions, awaitAsync } from "../../../../spec"; import { FakeStorageService } from "../../../../spec/fake-storage.service"; import { UserId } from "../../../types/guid"; import { LogService } from "../../abstractions/log.service"; -import { Utils } from "../../misc/utils"; import { StateDefinition } from "../state-definition"; import { StateEventRegistrarService } from "../state-event-registrar.service"; import { UserKeyDefinition } from "../user-key-definition"; @@ -39,7 +40,7 @@ const testKeyDefinition = new UserKeyDefinition(testStateDefinition, cleanupDelayMs, clearOn: [], }); -const userId = Utils.newGuid() as UserId; +const userId = newGuid() as UserId; const userKey = testKeyDefinition.buildKey(userId); describe("DefaultSingleUserState", () => { diff --git a/libs/common/src/platform/state/user-key-definition.ts b/libs/common/src/platform/state/user-key-definition.ts index d071d62fba5..699f136c1dc 100644 --- a/libs/common/src/platform/state/user-key-definition.ts +++ b/libs/common/src/platform/state/user-key-definition.ts @@ -1,10 +1,10 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore import { array, record } from "@bitwarden/serialization"; +import { isGuid } from "@bitwarden/guid"; import { UserId } from "../../types/guid"; import { StorageKey } from "../../types/state"; -import { Utils } from "../misc/utils"; import { DebugOptions, KeyDefinitionOptions } from "./key-definition"; import { StateDefinition } from "./state-definition"; @@ -129,7 +129,7 @@ export class UserKeyDefinition { } buildKey(userId: UserId) { - if (!Utils.isGuid(userId)) { + if (!isGuid(userId)) { throw new Error( `You cannot build a user key without a valid UserId, building for key ${this.fullName}`, );