bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-14 07:23:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into vault/PM-12423

Browse Source
This commit is contained in:
gbubemismith
2025-04-15 15:22:29 -04:00
parent 69bc7cfb85 b09305577f
commit 56c86ef920
156 changed files with 6236 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/angular/src/auth/components/set-password.component.ts
View File

@@ -211,7 +211,10 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
// RSA Encrypt user key with organization public key
const userKey = await this.keyService.getUserKey();
const encryptedUserKey = await this.encryptService.rsaEncrypt(userKey.key, publicKey);
const encryptedUserKey = await this.encryptService.encapsulateKeyUnsigned(
userKey,
publicKey,
);
const resetRequest = new OrganizationUserResetPasswordEnrollmentRequest();
resetRequest.masterPasswordHash = masterPasswordHash;