Fix TOTP, accidentally attempted to apply OTP at the wrong stage.

Author: sakakun

Classes/pveAPI/ApiClient.cs

@@ -86,17 +86,13 @@ public bool LoginRequest(string username, string password, string realm, string
                 loginData.Add("password", password);
                 loginData.Add("realm", realm);
 
-                if (otp != null)
-                {
-                    loginData.Add("otp", otp);
-                }
-
                 // Serialize the object to JSON
                 var jsonContent = JsonConvert.SerializeObject(loginData);
                 var httpContent = new StringContent(jsonContent, Encoding.UTF8, "application/json");
 
                 // Attempt Ticket Request
                 var response = _httpClient.PostAsync("access/ticket", httpContent).GetAwaiter().GetResult();
+                Program.DebugPoint("Program Error (Login Request): " + Environment.NewLine + JsonConvert.SerializeObject(response));
 
                 // Process If Successful
                 if (response.IsSuccessStatusCode)
@@ -155,10 +151,13 @@ private bool TotpChallengeRequest(string otpCode)
                 var httpContent = new StringContent(jsonContent, Encoding.UTF8, "application/json");
                 var response = _httpClient.PostAsync("access/ticket", httpContent).GetAwaiter().GetResult();
 
-                Console.WriteLine(JsonConvert.SerializeObject(response.Content));
+                Program.DebugPoint("Program Error (TOTPChallengeRequest): " + Environment.NewLine + JsonConvert.SerializeObject(response));
+                
                 if (response.IsSuccessStatusCode)
                 {
-                    dynamic apiResponse = JsonConvert.DeserializeObject(response.Content.ReadAsStringAsync().GetAwaiter().GetResult());
+                    string responseData = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+                    dynamic apiResponse = JsonConvert.DeserializeObject(responseData);
+                    
                     DataTicket = new DataTicket
                     {
                         ticket = apiResponse!.data.ticket,

Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -37,9 +38,10 @@ static void Main()
 
         public static void DebugPoint(string content)
         {
-            #if DEBUG
+            if (Debugger.IsAttached)
+            {
                 Console.WriteLine(content);
-            #endif
+            }
         }
 
     }