Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

[PM-3681] Remove ipcRenderer from lock.component (#6479)

Browse Source 
* [PM-3681] Remove ipcRenderer from lock.component

* Break out biometric method into two separate functions
This commit is contained in:
Daniel García 2023-11-06 19:05:09 +01:00 committed by GitHub
parent ffd08a6d6d
commit aae9bdd586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/desktop/src/auth/lock.component.ts
View File

@ -1,6 +1,5 @@
import { Component, NgZone } from "@angular/core"; import { Component, NgZone } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { ipcRenderer } from "electron";
import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component"; import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service";
@ -10,7 +9,7 @@ import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abs
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { DeviceType, KeySuffixOptions } from "@bitwarden/common/enums"; import { DeviceType } from "@bitwarden/common/enums";
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@ -22,7 +21,6 @@ import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/pass
import { DialogService } from "@bitwarden/components"; import { DialogService } from "@bitwarden/components";
import { ElectronStateService } from "../platform/services/electron-state.service.abstraction"; import { ElectronStateService } from "../platform/services/electron-state.service.abstraction";
import { BiometricAction, BiometricMessage } from "../types/biometric-message";
const BroadcasterSubscriptionId = "LockComponent"; const BroadcasterSubscriptionId = "LockComponent";
@ -92,7 +90,7 @@ export class LockComponent extends BaseLockComponent {
return; return;
} }
if (await ipcRenderer.invoke("windowVisible")) { if (await ipc.platform.isWindowVisible()) {
this.unlockBiometric(); this.unlockBiometric();
} }
}, 1000); }, 1000);
@ -132,13 +130,7 @@ export class LockComponent extends BaseLockComponent {
private async canUseBiometric() { private async canUseBiometric() {
const userId = await this.stateService.getUserId(); const userId = await this.stateService.getUserId();
const val = await ipcRenderer.invoke("biometric", { return await ipc.platform.biometric.enabled(userId);
action: BiometricAction.EnabledForUser,
key: `${userId}_user_biometric`,
keySuffix: KeySuffixOptions.Biometric,
userId: userId,
} as BiometricMessage);
return val != null ? (JSON.parse(val) as boolean) : null;
} }
private focusInput() { private focusInput() {

11
apps/desktop/src/platform/preload.ts
View File

@ -1,6 +1,6 @@
import { ipcRenderer } from "electron"; import { ipcRenderer } from "electron";
import { DeviceType, ThemeType } from "@bitwarden/common/enums"; import { DeviceType, ThemeType, KeySuffixOptions } from "@bitwarden/common/enums";
import { BiometricMessage, BiometricAction } from "../types/biometric-message"; import { BiometricMessage, BiometricAction } from "../types/biometric-message";
import { isDev, isWindowsStore } from "../utils"; import { isDev, isWindowsStore } from "../utils";
@ -29,6 +29,13 @@ const passwords = {
}; };
const biometric = { const biometric = {
enabled: (userId: string): Promise<boolean> =>
ipcRenderer.invoke("biometric", {
action: BiometricAction.EnabledForUser,
key: `${userId}_user_biometric`,
keySuffix: KeySuffixOptions.Biometric,
userId: userId,
} satisfies BiometricMessage),
osSupported: (): Promise<boolean> => osSupported: (): Promise<boolean> =>
ipcRenderer.invoke("biometric", { ipcRenderer.invoke("biometric", {
action: BiometricAction.OsSupported, action: BiometricAction.OsSupported,
@ -58,6 +65,8 @@ export default {
ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) => callback(theme)); ipcRenderer.on("systemThemeUpdated", (_event, theme: ThemeType) => callback(theme));
}, },
isWindowVisible: (): Promise<boolean> => ipcRenderer.invoke("windowVisible"),
getLanguageFile: (formattedLocale: string): Promise<object> => getLanguageFile: (formattedLocale: string): Promise<object> =>
ipcRenderer.invoke("getLanguageFile", formattedLocale), ipcRenderer.invoke("getLanguageFile", formattedLocale),