[PM-4917, PM-8707, PM-9119] Persist login email memory through 2fa on browser (#9811)

* persist email memory through 2fa on browser

* fix tests

* fix desktop

apps/browser/src/auth/popup/home.component.ts

@@ -1,11 +1,10 @@
 import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
-import { Subject, firstValueFrom, takeUntil } from "rxjs";
+import { Subject, firstValueFrom, switchMap, takeUntil } from "rxjs";
 
 import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components/environment-selector.component";
 import { LoginEmailServiceAbstraction, RegisterRouteService } from "@bitwarden/auth/common";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
@@ -34,7 +33,6 @@ export class HomeComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private router: Router,
     private i18nService: I18nService,
-    private environmentService: EnvironmentService,
     private loginEmailService: LoginEmailServiceAbstraction,
     private accountSwitcherService: AccountSwitcherService,
     private registerRouteService: RegisterRouteService,
@@ -55,13 +53,14 @@ export class HomeComponent implements OnInit, OnDestroy {
     }
 
     this.environmentSelector.onOpenSelfHostedSettings
-      .pipe(takeUntil(this.destroyed$))
-      .subscribe(() => {
-        this.setLoginEmailValues();
-        // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.router.navigate(["environment"]);
-      });
+      .pipe(
+        switchMap(async () => {
+          await this.setLoginEmailValues();
+          await this.router.navigate(["environment"]);
+        }),
+        takeUntil(this.destroyed$),
+      )
+      .subscribe();
   }
 
   ngOnDestroy(): void {
@@ -85,12 +84,14 @@ export class HomeComponent implements OnInit, OnDestroy {
       return;
     }
 
-    this.setLoginEmailValues();
+    await this.setLoginEmailValues();
     await this.router.navigate(["login"], { queryParams: { email: this.formGroup.value.email } });
   }
 
-  setLoginEmailValues() {
-    this.loginEmailService.setEmail(this.formGroup.value.email);
+  async setLoginEmailValues() {
+    // Note: Browser saves email settings here instead of the login component
     this.loginEmailService.setRememberEmail(this.formGroup.value.rememberEmail);
+    this.loginEmailService.setEmail(this.formGroup.value.email);
+    await this.loginEmailService.saveEmailSettings();
   }
 }

apps/browser/src/auth/popup/login.component.html

@@ -52,7 +52,7 @@
         </div>
       </div>
       <div class="box-footer">
-        <button type="button" class="btn link" routerLink="/hint" (click)="setLoginEmailValues()">
+        <button type="button" class="btn link" routerLink="/hint" (click)="saveEmailSettings()">
           <b>{{ "getMasterPasswordHint" | i18n }}</b>
         </button>
       </div>

apps/browser/src/auth/popup/login.component.ts

@@ -99,7 +99,7 @@ export class LoginComponent extends BaseLoginComponent {
   async launchSsoBrowser() {
     // Save off email for SSO
     await this.ssoLoginService.setSsoEmail(this.formGroup.value.email);
-    await this.loginEmailService.saveEmailSettings();
+
     // Generate necessary sso params
     const passwordOptions: any = {
       type: "password",
@@ -142,4 +142,9 @@ export class LoginComponent extends BaseLoginComponent {
         encodeURIComponent(this.formGroup.controls.email.value),
     );
   }
+
+  async saveEmailSettings() {
+    // values should be saved on home component
+    return;
+  }
 }

apps/desktop/src/auth/login/login.component.html

@@ -99,7 +99,7 @@
                 class="btn block"
                 type="button"
                 routerLink="/accessibility-cookie"
-                (click)="setLoginEmailValues()"
+                (click)="saveEmailSettings()"
               >
                 <i class="bwi bwi-universal-access" aria-hidden="true"></i>
                 {{ "loadAccessibilityCookie" | i18n }}
@@ -139,7 +139,7 @@
             type="button"
             class="text text-primary password-hint-btn"
             routerLink="/hint"
-            (click)="setLoginEmailValues()"
+            (click)="saveEmailSettings()"
           >
             {{ "getMasterPasswordHint" | i18n }}
           </button>

apps/web/src/app/auth/login/login.component.html

@@ -75,7 +75,7 @@
         class="tw-mt-2"
         routerLink="/hint"
         (mousedown)="goToHint()"
-        (click)="setLoginEmailValues()"
+        (click)="saveEmailSettings()"
         >{{ "getMasterPasswordHint" | i18n }}</a
       >
     </div>

apps/web/src/app/auth/login/login.component.ts

@@ -160,7 +160,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit {
   }
 
   async goToHint() {
-    this.setLoginEmailValues();
+    await this.saveEmailSettings();
     await this.router.navigateByUrl("/hint");
   }