Merge branch 'main' into auth/pm-9115/implement-view-data-persistence-in-2FA-flows

libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts

@@ -505,11 +505,6 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
       );
     }
 
-    // note: this flow affects both TDE & standard users
-    if (this.isForcePasswordResetRequired(authResult)) {
-      return await this.handleForcePasswordReset(this.orgSsoIdentifier);
-    }
-
     const userDecryptionOpts = await firstValueFrom(
       this.userDecryptionOptionsService.userDecryptionOptions$,
     );
@@ -524,6 +519,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     const requireSetPassword =
       !userDecryptionOpts.hasMasterPassword && userDecryptionOpts.keyConnectorOption === undefined;
 
+    // New users without a master password must set a master password before advancing.
     if (requireSetPassword || authResult.resetMasterPassword) {
       // Change implies going no password -> password in this case
       return await this.handleChangePasswordRequired(this.orgSsoIdentifier);
@@ -633,14 +629,6 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     return forceResetReasons.includes(authResult.forcePasswordReset);
   }
 
-  private async handleForcePasswordReset(orgIdentifier: string | undefined) {
-    await this.router.navigate(["update-temp-password"], {
-      queryParams: {
-        identifier: orgIdentifier,
-      },
-    });
-  }
-
   showContinueButton() {
     return (
       this.selectedProviderType != null &&