[PM-18721] add ChangePasswordDelegation logic to InputPasswordComponent submit method

apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html

@@ -10,17 +10,14 @@
     }}</bit-callout>
 
     <auth-input-password
-      *ngIf="!initializing"
       [flow]="inputPasswordFlow"
       [masterPasswordPolicyOptions]="masterPasswordPolicyOptions"
       (onPasswordFormSubmit)="handlePasswordFormSubmit($event)"
     ></auth-input-password>
-
-    <auth-change-password [inputPasswordFlow]="inputPasswordFlow"></auth-change-password>
   </div>
 
   <ng-container bitDialogFooter>
-    <button type="submit" bitButton bitFormButton buttonType="primary">
+    <button type="button" bitButton bitFormButton buttonType="primary" (click)="submit()">
       {{ "save" | i18n }}
     </button>
     <button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>

apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts

@@ -1,9 +1,8 @@
 import { CommonModule } from "@angular/common";
-import { Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnInit, ViewChild } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
 import {
-  ChangePasswordComponent,
   InputPasswordComponent,
   InputPasswordFlow,
   PasswordInputResult,
@@ -54,7 +53,6 @@ export enum EmergencyAccessTakeoverDialogResultType {
     ButtonModule,
     CommonModule,
     CalloutModule,
-    ChangePasswordComponent,
     DialogModule,
     FormFieldModule,
     I18nPipe,
@@ -62,9 +60,10 @@ export enum EmergencyAccessTakeoverDialogResultType {
   ],
 })
 export class EmergencyAccessTakeoverDialogComponent implements OnInit {
-  inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
+  @ViewChild(InputPasswordComponent)
+  inputPasswordComponent: InputPasswordComponent;
 
-  initializing = true;
+  inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
   masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
 
   constructor(
@@ -91,6 +90,10 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
     );
   }
 
+  submit = async () => {
+    await this.inputPasswordComponent.submit();
+  };
+
   async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
     try {
       await this.emergencyAccessService.takeover(

libs/auth/src/angular/input-password/input-password.component.html

@@ -122,7 +122,11 @@
     </bit-label>
   </bit-form-control>
 
-  <div class="tw-flex tw-gap-2" [ngClass]="inlineButtons ? 'tw-flex-row' : 'tw-flex-col'">
+  <div
+    *ngIf="flow !== InputPasswordFlow.ChangePasswordDelegation"
+    class="tw-flex tw-gap-2"
+    [ngClass]="inlineButtons ? 'tw-flex-row' : 'tw-flex-col'"
+  >
     <button type="submit" bitButton bitFormButton buttonType="primary" [loading]="loading">
       {{ primaryButtonTextStr || ("setMasterPassword" | i18n) }}
     </button>

libs/auth/src/angular/input-password/input-password.component.ts

@@ -246,7 +246,7 @@ export class InputPasswordComponent implements OnInit {
     }
   }
 
-  protected submit = async () => {
+  submit = async () => {
     this.verifyFlow();
 
     this.formGroup.markAllAsTouched();
@@ -256,6 +256,18 @@ export class InputPasswordComponent implements OnInit {
       return;
     }
 
+    if (this.flow === InputPasswordFlow.ChangePasswordDelegation) {
+      const newPassword = this.formGroup.controls.newPassword.value;
+
+      const passwordInputResult: PasswordInputResult = {
+        newPassword,
+      };
+
+      this.onPasswordFormSubmit.emit(passwordInputResult);
+
+      return;
+    }
+
     if (!this.email) {
       throw new Error("Email is required to create master key.");
     }

libs/auth/src/angular/input-password/password-input-result.ts

@@ -8,11 +8,11 @@ export interface PasswordInputResult {
   currentLocalMasterKeyHash?: string;
 
   newPassword: string;
-  newPasswordHint: string;
-  newMasterKey: MasterKey;
-  newServerMasterKeyHash: string;
-  newLocalMasterKeyHash: string;
+  newPasswordHint?: string;
+  newMasterKey?: MasterKey;
+  newServerMasterKeyHash?: string;
+  newLocalMasterKeyHash?: string;
 
-  kdfConfig: KdfConfig;
+  kdfConfig?: KdfConfig;
   rotateUserKey?: boolean;
 }

libs/auth/src/angular/set-password-jit/set-password-jit.component.ts

@@ -98,7 +98,11 @@ export class SetPasswordJitComponent implements OnInit {
     this.submitting = true;
 
     const credentials: SetPasswordCredentials = {
-      ...passwordInputResult,
+      newMasterKey: passwordInputResult.newMasterKey,
+      newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash,
+      newLocalMasterKeyHash: passwordInputResult.newLocalMasterKeyHash,
+      newPasswordHint: passwordInputResult.newPasswordHint,
+      kdfConfig: passwordInputResult.kdfConfig,
       orgSsoIdentifier: this.orgSsoIdentifier,
       orgId: this.orgId,
       resetPasswordAutoEnroll: this.resetPasswordAutoEnroll,