diff --git a/electron/src/services/electronPlatformUtils.service.ts b/electron/src/services/electronPlatformUtils.service.ts index c80218d2..78619664 100644 --- a/electron/src/services/electronPlatformUtils.service.ts +++ b/electron/src/services/electronPlatformUtils.service.ts @@ -183,13 +183,12 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService { return await this.stateService.getEnableBiometric(); } - authenticateBiometric(): Promise { - return new Promise((resolve) => { - const val = ipcRenderer.sendSync("biometric", { - action: "authenticate", - }); - resolve(val); + async authenticateBiometric(): Promise { + const val = await ipcRenderer.invoke("biometric", { + action: "authenticate", }); + + return val; } getDefaultSystemTheme() { diff --git a/electron/src/services/electronRendererSecureStorage.service.ts b/electron/src/services/electronRendererSecureStorage.service.ts index 5c3f3c74..4b52c8ac 100644 --- a/electron/src/services/electronRendererSecureStorage.service.ts +++ b/electron/src/services/electronRendererSecureStorage.service.ts @@ -5,39 +5,37 @@ import { StorageOptions } from "jslib-common/models/domain/storageOptions"; export class ElectronRendererSecureStorageService implements StorageService { async get(key: string, options?: StorageOptions): Promise { - const val = ipcRenderer.sendSync("keytar", { + const val = await ipcRenderer.invoke("keytar", { action: "getPassword", key: key, keySuffix: options?.keySuffix ?? "", }); - return Promise.resolve(val != null ? (JSON.parse(val) as T) : null); + return val != null ? (JSON.parse(val) as T) : null; } async has(key: string, options?: StorageOptions): Promise { - const val = ipcRenderer.sendSync("keytar", { + const val = await ipcRenderer.invoke("keytar", { action: "hasPassword", key: key, keySuffix: options?.keySuffix ?? "", }); - return Promise.resolve(!!val); + return !!val; } async save(key: string, obj: any, options?: StorageOptions): Promise { - ipcRenderer.sendSync("keytar", { + await ipcRenderer.invoke("keytar", { action: "setPassword", key: key, keySuffix: options?.keySuffix ?? "", value: JSON.stringify(obj), }); - return Promise.resolve(); } async remove(key: string, options?: StorageOptions): Promise { - ipcRenderer.sendSync("keytar", { + await ipcRenderer.invoke("keytar", { action: "deletePassword", key: key, keySuffix: options?.keySuffix ?? "", }); - return Promise.resolve(); } }