bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-09 21:20:27 +00:00
Code Issues Releases Wiki Activity

update newMasterKeyEncryptedUserKey creating in legacy performSubmitActions method

Browse Source
This commit is contained in:
rr-bw
2025-04-03 13:52:35 -07:00
parent 2e056a0f41
commit cc52fcc1e6
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/auth/src/angular/change-password/change-password.component.ts
View File

@@ -13,8 +13,10 @@ import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
import { SyncService } from "@bitwarden/common/platform/sync";
import { UserId } from "@bitwarden/common/types/guid";
import { UserKey } from "@bitwarden/common/types/key";
import { ToastService } from "@bitwarden/components";
import { KeyService } from "@bitwarden/key-management";
@@ -119,20 +121,19 @@ export class ChangePasswordComponent implements OnInit {
const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
const decryptedUserKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(
passwordInputResult.currentMasterKey,
userId,
);
let newMasterKeyEncryptedUserKey: [UserKey, EncString] = null;
if (decryptedUserKey == null) {
throw new Error("Could not decrypt user key");
const userKey = await this.keyService.getUserKey();
if (userKey == null) {
newMasterKeyEncryptedUserKey = await this.keyService.makeUserKey(
passwordInputResult.newMasterKey,
);
} else {
newMasterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(
passwordInputResult.newMasterKey,
);
}
const newMasterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(
passwordInputResult.newMasterKey,
decryptedUserKey,
);
const request = new PasswordRequest();
request.masterPasswordHash = passwordInputResult.currentServerMasterKeyHash;
request.masterPasswordHint = passwordInputResult.newPasswordHint;