From b264a3f4424998a3d3f2853c7981c44bcf95f9c8 Mon Sep 17 00:00:00 2001
From: Ike <137194738+ike-kottlowski@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:49:18 -0700
Subject: [PATCH] toast is how showing; removed event emitter to use built in
 emitter in base class; (#10761)

---
 .../settings/two-factor-setup.component.ts    |  2 +-
 .../settings/two-factor-webauthn.component.ts | 32 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor-setup.component.ts
index 8be6c7a3cc..3b8a9edd95 100644
--- a/apps/web/src/app/auth/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-setup.component.ts
@@ -220,7 +220,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
           this.dialogService,
           { data: result },
         );
-        this.twoFactorSetupSubscription = webAuthnComp.componentInstance.onChangeStatus
+        this.twoFactorSetupSubscription = webAuthnComp.componentInstance.onUpdated
           .pipe(first(), takeUntil(this.destroy$))
           .subscribe((enabled: boolean) => {
             webAuthnComp.close();
diff --git a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
index 9aeafaf2c6..6dfee92099 100644
--- a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
@@ -1,5 +1,5 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { Component, EventEmitter, Inject, NgZone, Output } from "@angular/core";
+import { Component, Inject, NgZone } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -33,7 +33,6 @@ interface Key {
   templateUrl: "two-factor-webauthn.component.html",
 })
 export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
-  @Output() onChangeStatus = new EventEmitter<boolean>();
   type = TwoFactorProviderType.WebAuthn;
   name: string;
   keys: Key[];
@@ -85,34 +84,33 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
       // Should never happen.
       return Promise.reject();
     }
+    return this.enable();
+  };
+
+  protected async enable() {
     const request = await this.buildRequestModel(UpdateTwoFactorWebAuthnRequest);
     request.deviceResponse = this.webAuthnResponse;
     request.id = this.keyIdAvailable;
     request.name = this.formGroup.value.name;
 
-    return this.enableWebAuth(request);
-  };
-
-  private enableWebAuth(request: any) {
-    return super.enable(async () => {
-      this.formPromise = this.apiService.putTwoFactorWebAuthn(request);
-      const response = await this.formPromise;
-      this.processResponse(response);
+    const response = await this.apiService.putTwoFactorWebAuthn(request);
+    this.processResponse(response);
+    this.toastService.showToast({
+      title: this.i18nService.t("success"),
+      message: this.i18nService.t("twoFactorProviderEnabled"),
+      variant: "success",
     });
+    this.onUpdated.emit(response.enabled);
   }
 
   disable = async () => {
-    await this.disableWebAuth();
+    await this.disableMethod();
     if (!this.enabled) {
-      this.onChangeStatus.emit(this.enabled);
+      this.onUpdated.emit(this.enabled);
       this.dialogRef.close();
     }
   };
 
-  private async disableWebAuth() {
-    return super.disable(this.formPromise);
-  }
-
   async remove(key: Key) {
     if (this.keysConfiguredCount <= 1 || key.removePromise != null) {
       return;
@@ -208,7 +206,7 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
       }
     }
     this.enabled = response.enabled;
-    this.onChangeStatus.emit(this.enabled);
+    this.onUpdated.emit(this.enabled);
   }
 
   static open(