From 0c869c5e8071b215694103c00ffe3e6703a1964a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 5 Sep 2025 09:25:48 +0200 Subject: [PATCH] Fix test --- .../os-biometrics-linux.service.spec.ts | 2 +- .../os-biometrics-mac.service.spec.ts | 2 +- .../os-biometrics-windows.service.spec.ts | 2 +- .../os-biometrics-linux.service.spec.ts | 20 +++++++------- .../os-biometrics-mac.service.spec.ts | 2 +- .../os-biometrics-windows.service.spec.ts | 26 +++++++++---------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-linux.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-linux.service.spec.ts index b0847ec692b..b2b4e08cb2b 100644 --- a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-linux.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-linux.service.spec.ts @@ -7,7 +7,7 @@ import { UserId } from "@bitwarden/common/types/guid"; import { passwords } from "@bitwarden/desktop-napi"; import { BiometricStateService } from "@bitwarden/key-management"; -import OsBiometricsServiceLinux from "../os-biometrics-linux.service"; +import { default as OsBiometricsServiceLinux } from "./os-biometrics-linux.service"; jest.mock("@bitwarden/desktop-napi", () => ({ biometrics: { diff --git a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-mac.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-mac.service.spec.ts index 6d20095d8bb..bef80eb31e9 100644 --- a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-mac.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-mac.service.spec.ts @@ -5,7 +5,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { UserId } from "@bitwarden/common/types/guid"; import { passwords } from "@bitwarden/desktop-napi"; -import OsBiometricsServiceMac from "./os-biometrics-mac.service"; +import { default as OsBiometricsServiceMac } from "./os-biometrics-mac.service"; jest.mock("@bitwarden/desktop-napi", () => ({ biometrics: { diff --git a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-windows.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-windows.service.spec.ts index 9f8f15763d5..565a1bc7f75 100644 --- a/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-windows.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v1/os-biometrics-windows.service.spec.ts @@ -15,7 +15,7 @@ import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-manageme import { WindowMain } from "../../../main/window.main"; -import OsBiometricsServiceWindows from "./os-biometrics-windows.service"; +import { default as OsBiometricsServiceWindows } from "./os-biometrics-windows.service"; import OsDerivedKey = biometrics.OsDerivedKey; diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts index 0e39b1a90e2..91e2caba0cb 100644 --- a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts @@ -1,12 +1,12 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { UserId } from "@bitwarden/common/types/guid"; -import { biometrics, passwords } from "@bitwarden/desktop-napi"; +import { biometrics_v2, passwords } from "@bitwarden/desktop-napi"; import { BiometricsStatus } from "@bitwarden/key-management"; import OsBiometricsServiceLinux from "./os-biometrics-linux.service"; jest.mock("@bitwarden/desktop-napi", () => ({ - biometrics: { + biometrics_v2: { initBiometricSystem: jest.fn(() => "mockSystem"), provideKey: jest.fn(), unenroll: jest.fn(), @@ -22,7 +22,7 @@ jest.mock("@bitwarden/desktop-napi", () => ({ const mockKey = new Uint8Array(64); -jest.mock("../../utils", () => ({ +jest.mock("../../../utils", () => ({ isFlatpak: jest.fn(() => false), isLinux: jest.fn(() => true), isSnapStore: jest.fn(() => false), @@ -40,28 +40,28 @@ describe("OsBiometricsServiceLinux", () => { it("should set biometric key", async () => { await service.setBiometricKey(userId, key); - expect(biometrics.provideKey).toHaveBeenCalled(); + expect(biometrics_v2.provideKey).toHaveBeenCalled(); }); it("should delete biometric key", async () => { await service.deleteBiometricKey(userId); - expect(biometrics.unenroll).toHaveBeenCalled(); + expect(biometrics_v2.unenroll).toHaveBeenCalled(); }); it("should get biometric key", async () => { - (biometrics.unlock as jest.Mock).mockResolvedValue(mockKey); + (biometrics_v2.unlock as jest.Mock).mockResolvedValue(mockKey); const result = await service.getBiometricKey(userId); expect(result).toBeInstanceOf(SymmetricCryptoKey); }); it("should return null if no biometric key", async () => { - (biometrics.unlock as jest.Mock).mockResolvedValue(null); + (biometrics_v2.unlock as jest.Mock).mockResolvedValue(null); const result = await service.getBiometricKey(userId); expect(result).toBeNull(); }); it("should authenticate biometric", async () => { - (biometrics.authenticate as jest.Mock).mockResolvedValue(true); + (biometrics_v2.authenticate as jest.Mock).mockResolvedValue(true); const result = await service.authenticateBiometric(); expect(result).toBe(true); }); @@ -73,7 +73,7 @@ describe("OsBiometricsServiceLinux", () => { }); it("should check if setup is needed", async () => { - (biometrics.authenticateAvailable as jest.Mock).mockResolvedValue(false); + (biometrics_v2.authenticateAvailable as jest.Mock).mockResolvedValue(false); const result = await service.needsSetup(); expect(result).toBe(true); }); @@ -84,7 +84,7 @@ describe("OsBiometricsServiceLinux", () => { }); it("should get biometrics first unlock status for user", async () => { - (biometrics.unlockAvailable as jest.Mock).mockResolvedValue(true); + (biometrics_v2.unlockAvailable as jest.Mock).mockResolvedValue(true); const result = await service.getBiometricsFirstUnlockStatusForUser(userId); expect(result).toBe(BiometricsStatus.Available); }); diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-mac.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-mac.service.spec.ts index 6d20095d8bb..45a008e09b2 100644 --- a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-mac.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-mac.service.spec.ts @@ -8,7 +8,7 @@ import { passwords } from "@bitwarden/desktop-napi"; import OsBiometricsServiceMac from "./os-biometrics-mac.service"; jest.mock("@bitwarden/desktop-napi", () => ({ - biometrics: { + biometrics_v2: { setBiometricSecret: jest.fn(), getBiometricSecret: jest.fn(), deleteBiometricSecret: jest.fn(), diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts index 711deadd8ec..07dff80d44d 100644 --- a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts @@ -3,7 +3,7 @@ import { mock } from "jest-mock-extended"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { UserId } from "@bitwarden/common/types/guid"; -import { biometrics } from "@bitwarden/desktop-napi"; +import { biometrics_v2 } from "@bitwarden/desktop-napi"; import { BiometricsStatus } from "@bitwarden/key-management"; import { WindowMain } from "../../main/window.main"; @@ -11,7 +11,7 @@ import { WindowMain } from "../../main/window.main"; import OsBiometricsServiceWindows from "./os-biometrics-windows.service"; jest.mock("@bitwarden/desktop-napi", () => ({ - biometrics: { + biometrics_v2: { initBiometricSystem: jest.fn(() => "mockSystem"), provideKey: jest.fn(), enrollPersistent: jest.fn(), @@ -29,7 +29,7 @@ jest.mock("@bitwarden/desktop-napi", () => ({ const mockKey = new Uint8Array(64); -jest.mock("../../utils", () => ({ +jest.mock("../../../utils", () => ({ isFlatpak: jest.fn(() => false), isLinux: jest.fn(() => true), isSnapStore: jest.fn(() => false), @@ -51,39 +51,39 @@ describe("OsBiometricsServiceWindows", () => { it("should enroll persistent biometric key", async () => { await service.enrollPersistent("user-id" as UserId, new SymmetricCryptoKey(mockKey)); - expect(biometrics.enrollPersistent).toHaveBeenCalled(); + expect(biometrics_v2.enrollPersistent).toHaveBeenCalled(); }); it("should set biometric key", async () => { await service.setBiometricKey(userId, new SymmetricCryptoKey(mockKey)); - expect(biometrics.provideKey).toHaveBeenCalled(); + expect(biometrics_v2.provideKey).toHaveBeenCalled(); }); it("should delete biometric key", async () => { await service.deleteBiometricKey(userId); - expect(biometrics.unenroll).toHaveBeenCalled(); + expect(biometrics_v2.unenroll).toHaveBeenCalled(); }); it("should get biometric key", async () => { - (biometrics.unlock as jest.Mock).mockResolvedValue(mockKey); + (biometrics_v2.unlock as jest.Mock).mockResolvedValue(mockKey); const result = await service.getBiometricKey(userId); expect(result).toBeInstanceOf(SymmetricCryptoKey); }); it("should return null if no biometric key", async () => { - (biometrics.unlock as jest.Mock).mockRejectedValue(new Error("No key found")); + (biometrics_v2.unlock as jest.Mock).mockRejectedValue(new Error("No key found")); const result = await service.getBiometricKey(userId); expect(result).toBeNull(); }); it("should authenticate biometric", async () => { - (biometrics.authenticate as jest.Mock).mockResolvedValue(true); + (biometrics_v2.authenticate as jest.Mock).mockResolvedValue(true); const result = await service.authenticateBiometric(); expect(result).toBe(true); }); it("should check if biometrics is supported", async () => { - (biometrics.authenticateAvailable as jest.Mock).mockResolvedValue(true); + (biometrics_v2.authenticateAvailable as jest.Mock).mockResolvedValue(true); const result = await service.supportsBiometrics(); expect(result).toBe(true); }); @@ -99,19 +99,19 @@ describe("OsBiometricsServiceWindows", () => { }); it("should get biometrics first unlock status for user", async () => { - (biometrics.unlockAvailable as jest.Mock).mockResolvedValue(true); + (biometrics_v2.unlockAvailable as jest.Mock).mockResolvedValue(true); const result = await service.getBiometricsFirstUnlockStatusForUser(userId); expect(result).toBe(BiometricsStatus.Available); }); it("should return false for hasPersistentKey false", async () => { - (biometrics.hasPersistent as jest.Mock).mockResolvedValue(false); + (biometrics_v2.hasPersistent as jest.Mock).mockResolvedValue(false); const result = await service.hasPersistentKey(userId); expect(result).toBe(false); }); it("should return false for hasPersistentKey true", async () => { - (biometrics.hasPersistent as jest.Mock).mockResolvedValue(true); + (biometrics_v2.hasPersistent as jest.Mock).mockResolvedValue(true); const result = await service.hasPersistentKey(userId); expect(result).toBe(true); });