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

update activeAccount retreival to happen just once

Browse Source
This commit is contained in:
rr-bw
2025-04-08 15:55:07 -07:00
parent b0020c278b
commit d806ea2d31
2 changed files with 12 additions and 13 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

@@ -4,7 +4,7 @@ import { firstValueFrom } from "rxjs";
import { ChangePasswordService } from "@bitwarden/auth/common";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -34,6 +34,7 @@ import { PasswordInputResult } from "../input-password/password-input-result";
export class ChangePasswordComponent implements OnInit {
@Input() inputPasswordFlow: InputPasswordFlow = InputPasswordFlow.ChangePassword;
activeAccount?: Account;
email?: string;
userId?: UserId;
masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
@@ -57,9 +58,9 @@ export class ChangePasswordComponent implements OnInit {
async ngOnInit() {
this.userkeyRotationV2 = await this.configService.getFeatureFlag(FeatureFlag.UserKeyRotationV2);
const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
this.userId = activeAccount?.id;
this.email = activeAccount?.email;
this.activeAccount = await firstValueFrom(this.accountService.activeAccount$);
this.userId = this.activeAccount?.id;
this.email = this.activeAccount?.email;
this.masterPasswordPolicyOptions = await firstValueFrom(
this.policyService.masterPasswordPolicyOptions$(this.userId),
@@ -86,16 +87,15 @@ export class ChangePasswordComponent implements OnInit {
try {
if (passwordInputResult.rotateUserKey) {
await this.syncService.fullSync(true);
const user = await firstValueFrom(this.accountService.activeAccount$);
if (user == null) {
if (this.activeAccount == null) {
throw new Error("User not found");
}
await this.changePasswordService.rotateUserKeyMasterPasswordAndEncryptedData(
passwordInputResult.currentPassword,
passwordInputResult.newPassword,
user,
this.activeAccount,
passwordInputResult.newPasswordHint,
);
} else {
@@ -188,12 +188,13 @@ export class ChangePasswordComponent implements OnInit {
}
private async updateKey(newPassword: string) {
const user = await firstValueFrom(this.accountService.activeAccount$);
if (user == null) {
if (this.activeAccount == null) {
throw new Error("User not found");
}
await this.changePasswordService.rotateUserKeyAndEncryptedDataLegacy(newPassword, user);
await this.changePasswordService.rotateUserKeyAndEncryptedDataLegacy(
newPassword,
this.activeAccount,
);
}
}

2
libs/auth/src/angular/input-password/input-password.component.ts
View File

@@ -15,7 +15,6 @@ import {
import { AuditService } from "@bitwarden/common/abstractions/audit.service";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -146,7 +145,6 @@ export class InputPasswordComponent implements OnInit {
);
constructor(
private accountService: AccountService,
private auditService: AuditService,
private cipherService: CipherService,
private dialogService: DialogService,