From c82d1b3c509eb39b5a4fcddecbef1bdf24ea191a Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Mon, 13 Sep 2021 08:46:16 -0400
Subject: [PATCH] Use api action directive for confirm action (#1153)

---
 src/app/common/base.people.component.ts                  | 7 +++----
 src/app/organizations/manage/user-confirm.component.html | 2 +-
 src/app/organizations/manage/user-confirm.component.ts   | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/common/base.people.component.ts b/src/app/common/base.people.component.ts
index c38ac0d294..9ce01ea221 100644
--- a/src/app/common/base.people.component.ts
+++ b/src/app/common/base.people.component.ts
@@ -253,11 +253,10 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
                     comp.publicKey = publicKey;
                     comp.onConfirmedUser.subscribe(async () => {
                         try {
-                            await confirmUser(publicKey);
+                            comp.formPromise = confirmUser(publicKey);
+                            await comp.formPromise;
                             modal.close();
-                        } catch (e) {
-                            this.logService.error(`Handled exception: ${e}`);
-                        }
+                        } catch { }
                     });
                 });
                 return;
diff --git a/src/app/organizations/manage/user-confirm.component.html b/src/app/organizations/manage/user-confirm.component.html
index d27bc927db..289c33f844 100644
--- a/src/app/organizations/manage/user-confirm.component.html
+++ b/src/app/organizations/manage/user-confirm.component.html
@@ -1,6 +1,6 @@
 <div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="confirmUserTitle">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
-        <form class="modal-content" #form (ngSubmit)="submit()">
+        <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-header">
                 <h2 class="modal-title" id="confirmUserTitle">
                     {{'confirmUser' | i18n}}
diff --git a/src/app/organizations/manage/user-confirm.component.ts b/src/app/organizations/manage/user-confirm.component.ts
index 872bd37644..14e6bd4e3b 100644
--- a/src/app/organizations/manage/user-confirm.component.ts
+++ b/src/app/organizations/manage/user-confirm.component.ts
@@ -24,6 +24,7 @@ export class UserConfirmComponent implements OnInit {
     dontAskAgain = false;
     loading = true;
     fingerprint: string;
+    formPromise: Promise<any>;
 
     constructor(private cryptoService: CryptoService, private storageService: StorageService) { }