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

feat(change-password-component): Change Password Update [18720] - Pausing work for now while we wait for product to hear back.

Browse Source
This commit is contained in:
Patrick Pimentel
2025-05-23 14:30:46 -04:00
parent 913b7ec5d6
commit 0be93fa65f
8 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
import { ReactiveFormsModule, FormBuilder, Validators, FormControl } from "@angular/forms";
import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
import { firstValueFrom } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
@@ -10,6 +10,7 @@ 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 { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
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";
@@ -66,6 +67,8 @@ export enum InputPasswordFlow {
ChangePassword,
/**
* All form elements above, plus: [Checkbox] Rotate account encryption key (as the last element in the UI)
*
* Consider changing this to an input.
*/
ChangePasswordWithOptionalUserKeyRotation,
}
@@ -108,7 +111,8 @@ export class InputPasswordComponent implements OnInit {
@Input() userId?: UserId;
@Input() loading = false;
@Input() masterPasswordPolicyOptions: MasterPasswordPolicyOptions | null = null;
@Input() masterPasswordPolicyOptions: MasterPasswordPolicyOptions | undefined = undefined;
@Input() forceSetPasswordReason?: ForceSetPasswordReason;
@Input() inlineButtons = false;
@Input() primaryButtonText?: Translation;
@@ -116,6 +120,8 @@ export class InputPasswordComponent implements OnInit {
@Input() secondaryButtonText?: Translation;
protected secondaryButtonTextStr: string = "";
@Input() showChangePasswordWarning: boolean = true;
protected InputPasswordFlow = InputPasswordFlow;
private kdfConfig: KdfConfig | null = null;
private minHintLength = 0;
@@ -188,10 +194,7 @@ export class InputPasswordComponent implements OnInit {
}
private addFormFieldsIfNecessary() {
if (
this.flow === InputPasswordFlow.ChangePassword ||
this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
) {
if (this.isChangePasswordFlow()) {
this.formGroup.addControl(
"currentPassword",
this.formBuilder.nonNullable.control("", Validators.required),
@@ -262,10 +265,7 @@ export class InputPasswordComponent implements OnInit {
}
// 2. Verify current password is correct (if necessary)
if (
this.flow === InputPasswordFlow.ChangePassword ||
this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
) {
if (this.isChangePasswordFlow()) {
const currentPasswordVerified = await this.verifyCurrentPassword(
currentPassword,
this.kdfConfig,
@@ -313,10 +313,7 @@ export class InputPasswordComponent implements OnInit {
kdfConfig: this.kdfConfig,
};
if (
this.flow === InputPasswordFlow.ChangePassword ||
this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
) {
if (this.isChangePasswordFlow()) {
const currentMasterKey = await this.keyService.makeMasterKey(
currentPassword,
this.email,
@@ -550,4 +547,15 @@ export class InputPasswordComponent implements OnInit {
protected getPasswordStrengthScore(score: PasswordStrengthScore) {
this.passwordStrengthScore = score;
}
/**
* Checks if the flow is either ChangePassword or ChangePasswordWithOptionalUserKeyRotation
* @private
*/
protected isChangePasswordFlow(): boolean {
return (
this.flow === InputPasswordFlow.ChangePassword ||
this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
);
}
}