bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/sm-billing

Browse Source
This commit is contained in:
Thomas Rittson
2023-06-27 14:29:04 +10:00
parent 49b6519176 d814010bd3
commit 5d196ec17d
12 changed files with 136 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/common/src/auth/services/auth.service.ts
View File

@@ -304,13 +304,16 @@ export class AuthService implements AuthServiceAbstraction {
).encKey,
pubKey.buffer
);
const encryptedMasterPassword = await this.cryptoService.rsaEncrypt(
Utils.fromUtf8ToArray(await this.stateService.getKeyHash()),
pubKey.buffer
);
let encryptedMasterPassword = null;
if ((await this.stateService.getKeyHash()) != null) {
encryptedMasterPassword = await this.cryptoService.rsaEncrypt(
Utils.fromUtf8ToArray(await this.stateService.getKeyHash()),
pubKey.buffer
);
}
const request = new PasswordlessAuthRequest(
encryptedKey.encryptedString,
encryptedMasterPassword.encryptedString,
encryptedMasterPassword?.encryptedString,
await this.appIdService.getAppId(),
requestApproved
);