bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-30 00:03:30 +00:00
Code Issues Releases Wiki Activity

[PM-27086] re-add setKdfConfig and setUserKey

Browse Source
This commit is contained in:
rr-bw
2025-12-16 10:22:39 -08:00
parent 75d16df6af
commit 1ade3a5db5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
View File

@@ -321,7 +321,7 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
await this.masterPasswordService.setForceSetPasswordReason(ForceSetPasswordReason.None, userId);
// User now has a password so update account decryption options in state
await this.updateAccountDecryptionPropertiesV2(unlockData, userId);
await this.updateAccountDecryptionPropertiesV2(unlockData, userKey, userId);
/**
* Set the private key only for new JIT provisioned users in MP encryption orgs.
@@ -334,8 +334,6 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
await this.keyService.setPrivateKey(keyPair[1].encryptedString, userId);
}
// await this.masterPasswordService.setMasterKeyHash(newLocalMasterKeyHash, userId); // TODO-rr-bw: how to handle local key hash?
if (resetPasswordAutoEnroll) {
await this.handleResetPasswordAutoEnroll(
authenticationData.masterPasswordAuthenticationHash,
@@ -395,19 +393,21 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
private async updateAccountDecryptionPropertiesV2(
unlockData: MasterPasswordUnlockData,
userKey: UserKey,
userId: UserId,
) {
const userDecryptionOpts = await firstValueFrom(
this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
);
userDecryptionOpts.hasMasterPassword = true;
await this.userDecryptionOptionsService.setUserDecryptionOptionsById(
userId,
userDecryptionOpts,
);
await this.masterPasswordService.setMasterPasswordUnlockData(unlockData, userId);
// await this.masterPasswordService.setMasterKey(masterKey, userId); // TODO-rr-bw: how to handle this? remove this?
await this.kdfConfigService.setKdfConfig(userId, unlockData.kdf);
await this.keyService.setUserKey(userKey, userId);
}
/**