From df019da8919bcd92af520d9bffce5ee1bb1586fd Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Thu, 2 Nov 2023 10:42:55 +0800
Subject: [PATCH] complete cancel registration

---
 .../View/Dialog/HutaoPassportUnregisterDialog.xaml.cs     | 4 ++--
 .../ViewModel/Setting/HutaoPassportViewModel.cs           | 8 ++++----
 src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml.cs
index 5fd8379c..b3c8b380 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml.cs
@@ -26,12 +26,12 @@ internal sealed partial class HutaoPassportUnregisterDialog : ContentDialog
         infoBarService = serviceProvider.GetRequiredService<IInfoBarService>();
     }
 
-    public async ValueTask<ValueResult<bool, (string UserName, string Passport)>> GetInputAsync()
+    public async ValueTask<ValueResult<bool, (string UserName, string Passport, string VerifyCode)>> GetInputAsync()
     {
         await taskContext.SwitchToMainThreadAsync();
         ContentDialogResult result = await ShowAsync();
 
-        return new(result is ContentDialogResult.Primary, (UserName, Password));
+        return new(result is ContentDialogResult.Primary, (UserName, Password, VerifyCode));
     }
 
     [Command("VerifyCommand")]
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/HutaoPassportViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/HutaoPassportViewModel.cs
index 019a4e7b..f63a5a4e 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/HutaoPassportViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/HutaoPassportViewModel.cs
@@ -67,18 +67,18 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
     private async Task UnregisterAsync()
     {
         HutaoPassportUnregisterDialog dialog = await contentDialogFactory.CreateInstanceAsync<HutaoPassportUnregisterDialog>().ConfigureAwait(false);
-        ValueResult<bool, (string UserName, string Password)> result = await dialog.GetInputAsync().ConfigureAwait(false);
+        ValueResult<bool, (string UserName, string Password, string VerifyCode)> result = await dialog.GetInputAsync().ConfigureAwait(false);
 
         if (result.IsOk)
         {
-            (string username, string password) = result.Value;
+            (string username, string password, string verifyCode) = result.Value;
 
-            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
+            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(verifyCode))
             {
                 return;
             }
 
-            HutaoResponse response = await homaPassportClient.UnregisterAsync(username, password).ConfigureAwait(false);
+            HutaoResponse response = await homaPassportClient.UnregisterAsync(username, password, verifyCode).ConfigureAwait(false);
 
             if (response.IsOk())
             {
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs
index 15b12558..bd219590 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs
@@ -96,12 +96,13 @@ internal sealed partial class HomaPassportClient
         return HutaoResponse.DefaultIfNull(resp);
     }
 
-    public async ValueTask<HutaoResponse> UnregisterAsync(string email, string password, CancellationToken token = default)
+    public async ValueTask<HutaoResponse> UnregisterAsync(string email, string password, string verifyCode, CancellationToken token = default)
     {
         Dictionary<string, string> data = new()
         {
             ["UserName"] = Encrypt(email),
             ["Password"] = Encrypt(password),
+            ["VerifyCode"] = Encrypt(verifyCode),
         };
 
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()