bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

Handle desktop logged into a different account for biometrics (#1533)

Browse Source
This commit is contained in:
Oscar Hinton
2021-01-15 16:44:27 +01:00
committed by GitHub
parent c4388dad66
commit 0511905ab4
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/background/nativeMessaging.background.ts
View File

@@ -106,6 +106,13 @@ export class NativeMessagingBackground {
}
break;
}
case 'wrongUserId':
this.messagingService.send('showDialog', {
text: this.i18nService.t('nativeMessagingWrongUserDesc'),
title: this.i18nService.t('nativeMessagingWrongUserTitle'),
confirmText: this.i18nService.t('ok'),
type: 'error',
});
default:
// Ignore since it belongs to another device
if (message.appId !== this.appId) {
@@ -247,7 +254,11 @@ export class NativeMessagingBackground {
this.publicKey = publicKey;
this.privateKey = privateKey;
this.sendUnencrypted({command: 'setupEncryption', publicKey: Utils.fromBufferToB64(publicKey)});
this.sendUnencrypted({
command: 'setupEncryption',
publicKey: Utils.fromBufferToB64(publicKey),
userId: await this.userService.getUserId()
});
return new Promise((resolve, reject) => this.secureSetupResolve = resolve);
}