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

[PM-11593] Fix backgroundbrowserbiometricservice initialization (#10861)

Browse Source 
* Fix backgroundbrowserbiometricservice initialization

* Cleanup according to review
This commit is contained in:
Bernd Schoolmann 2024-09-03 16:56:55 +02:00 committed by GitHub
parent 60fca9c118
commit 5f5e4498e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/browser/src/background/main.background.ts
View File

@ -401,6 +401,8 @@ export default class MainBackground {
const logoutCallback = async (logoutReason: LogoutReason, userId?: UserId) => const logoutCallback = async (logoutReason: LogoutReason, userId?: UserId) =>
await this.logout(logoutReason, userId); await this.logout(logoutReason, userId);
const runtimeNativeMessagingBackground = () => this.nativeMessagingBackground;
const refreshAccessTokenErrorCallback = () => { const refreshAccessTokenErrorCallback = () => {
// Send toast to popup // Send toast to popup
this.messagingService.send("showToast", { this.messagingService.send("showToast", {
@ -616,7 +618,9 @@ export default class MainBackground {
this.i18nService = new I18nService(BrowserApi.getUILanguage(), this.globalStateProvider); this.i18nService = new I18nService(BrowserApi.getUILanguage(), this.globalStateProvider);
this.biometricsService = new BackgroundBrowserBiometricsService(this.nativeMessagingBackground); this.biometricsService = new BackgroundBrowserBiometricsService(
runtimeNativeMessagingBackground,
);
this.kdfConfigService = new KdfConfigService(this.stateProvider); this.kdfConfigService = new KdfConfigService(this.stateProvider);

10
apps/browser/src/platform/services/background-browser-biometrics.service.ts
View File

@ -6,20 +6,20 @@ import { BrowserBiometricsService } from "./browser-biometrics.service";
@Injectable() @Injectable()
export class BackgroundBrowserBiometricsService extends BrowserBiometricsService { export class BackgroundBrowserBiometricsService extends BrowserBiometricsService {
constructor(private nativeMessagingBackground: NativeMessagingBackground) { constructor(private nativeMessagingBackground: () => NativeMessagingBackground) {
super(); super();
} }
async authenticateBiometric(): Promise<boolean> { async authenticateBiometric(): Promise<boolean> {
const responsePromise = this.nativeMessagingBackground.getResponse(); const responsePromise = this.nativeMessagingBackground().getResponse();
await this.nativeMessagingBackground.send({ command: "biometricUnlock" }); await this.nativeMessagingBackground().send({ command: "biometricUnlock" });
const response = await responsePromise; const response = await responsePromise;
return response.response === "unlocked"; return response.response === "unlocked";
} }
async isBiometricUnlockAvailable(): Promise<boolean> { async isBiometricUnlockAvailable(): Promise<boolean> {
const responsePromise = this.nativeMessagingBackground.getResponse(); const responsePromise = this.nativeMessagingBackground().getResponse();
await this.nativeMessagingBackground.send({ command: "biometricUnlockAvailable" }); await this.nativeMessagingBackground().send({ command: "biometricUnlockAvailable" });
const response = await responsePromise; const response = await responsePromise;
return response.response === "available"; return response.response === "available";
} }