From 62b7234ad6af47d8c2b06aaeebe05b6d8b305ed3 Mon Sep 17 00:00:00 2001
From: Kobe Albright <kobe.albright@gmail.com>
Date: Mon, 27 Jan 2025 21:58:07 -0500
Subject: [PATCH] Mfa improvements

---
 .../Modals/Users/Edit/EditUserInfoComponent.razor      |  9 +++++++--
 .../Menus/Modals/Users/Edit/SetupMfaModal.razor        | 10 ++++++++--
 Valour/Sdk/Services/AuthService.cs                     |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Valour/Client/Components/Menus/Modals/Users/Edit/EditUserInfoComponent.razor b/Valour/Client/Components/Menus/Modals/Users/Edit/EditUserInfoComponent.razor
index d4b68b79..c965d070 100644
--- a/Valour/Client/Components/Menus/Modals/Users/Edit/EditUserInfoComponent.razor
+++ b/Valour/Client/Components/Menus/Modals/Users/Edit/EditUserInfoComponent.razor
@@ -261,8 +261,13 @@ else
             Description = "Enter your password to disable Multi-Factor Authentication",
             OnConfirmAsync = async (password) =>
             {
-                var result = await AuthService.RemoveMfaAsync(password);
-
+                var result = await ToastContainer.Instance.WaitToastWithTaskResult(new ProgressToastData<TaskResult>()
+                {
+                    ProgressTask = AuthService.RemoveMfaAsync(password),
+                    Title = "Removing MFA",
+                    Message = "Verifying password...",
+                });
+                
                 if (result.Success)
                 {
                     _multiAuthMethods = new List<string>();
diff --git a/Valour/Client/Components/Menus/Modals/Users/Edit/SetupMfaModal.razor b/Valour/Client/Components/Menus/Modals/Users/Edit/SetupMfaModal.razor
index 49e20a05..98fbc116 100644
--- a/Valour/Client/Components/Menus/Modals/Users/Edit/SetupMfaModal.razor
+++ b/Valour/Client/Components/Menus/Modals/Users/Edit/SetupMfaModal.razor
@@ -77,8 +77,14 @@
     
     private async Task OnClickMultiFactorAuth()
     {
-        var multiResult = await AuthService.VerifyMfaAsync(_multiFactorCode);
-        if (multiResult.Success)
+        var result = await ToastContainer.Instance.WaitToastWithTaskResult(new ProgressToastData<TaskResult>()
+        {
+            ProgressTask = AuthService.VerifyMfaAsync(_multiFactorCode),
+            Title = "Setting up MFA",
+            Message = "Sending code...",
+        });
+
+        if (result.Success)
         {
             _complete = true;
             StateHasChanged();
diff --git a/Valour/Sdk/Services/AuthService.cs b/Valour/Sdk/Services/AuthService.cs
index cb272277..3e7803ea 100644
--- a/Valour/Sdk/Services/AuthService.cs
+++ b/Valour/Sdk/Services/AuthService.cs
@@ -195,7 +195,7 @@ public async Task<TaskResult> VerifyMfaAsync(string code)
             return new TaskResult(false, result.Message);
         
         if (!result.Data)
-            return new TaskResult(true, "Invalid code");
+            return new TaskResult(false, "Invalid code");
 
         return TaskResult.SuccessResult;
     }