Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-02 18:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Do not drop optional parameters in overrides (#7176)

Browse Source
This commit is contained in:
Matt Gibson 2023-12-11 13:44:23 -05:00 committed by GitHub
parent a40643d9d6
commit b4dbace7a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/browser/src/platform/services/browser-crypto.service.ts
View File

@ -18,15 +18,18 @@ export class BrowserCryptoService extends CryptoService {
* Browser doesn't store biometric keys, so we retrieve them from the desktop and return * Browser doesn't store biometric keys, so we retrieve them from the desktop and return
* if we successfully saved it into memory as the User Key * if we successfully saved it into memory as the User Key
*/ */
protected override async getKeyFromStorage(keySuffix: KeySuffixOptions): Promise<UserKey> { protected override async getKeyFromStorage(
keySuffix: KeySuffixOptions,
userId?: string,
): Promise<UserKey> {
if (keySuffix === KeySuffixOptions.Biometric) { if (keySuffix === KeySuffixOptions.Biometric) {
await this.platformUtilService.authenticateBiometric(); await this.platformUtilService.authenticateBiometric();
const userKey = await this.stateService.getUserKey(); const userKey = await this.stateService.getUserKey({ userId: userId });
if (userKey) { if (userKey) {
return new SymmetricCryptoKey(Utils.fromB64ToArray(userKey.keyB64)) as UserKey; return new SymmetricCryptoKey(Utils.fromB64ToArray(userKey.keyB64)) as UserKey;
} }
} }
return await super.getKeyFromStorage(keySuffix); return await super.getKeyFromStorage(keySuffix, userId);
} }
} }