Buf fix: server messages are fetched and displayed correctly

Author: Yelo420

gamevault/Helper/Web/OAuthHttpClient.cs

@@ -48,13 +48,7 @@ public async Task<bool> LoginBasicAuthAsync(string username, string password)
             _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", authValue);
 
             var response = await _httpClient.GetAsync($"{ServerUrl}/api/auth/basic/login");
-
-            if (!response.IsSuccessStatusCode)
-            {               
-                using JsonDocument serverResponseJson = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
-                throw new HttpRequestException(serverResponseJson.RootElement.GetProperty("message").GetString(), null, response.StatusCode);
-            }
-
+            await WebExceptionHelper.EnsureSuccessStatusCode(response);
             var responseContent = await response.Content.ReadAsStringAsync();
             var json = JsonSerializer.Deserialize<AuthResponse>(responseContent);
 

gamevault/Helper/Web/WebExceptionHelper.cs

@@ -5,6 +5,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
@@ -36,6 +37,40 @@ internal static string TryGetServerMessage(Exception ex)
             }
             return ex.Message;
         }
+        public static async Task EnsureSuccessStatusCode(HttpResponseMessage msg)
+        {
+            if (!msg.IsSuccessStatusCode)
+            {
+                string? serverMessage = "";
+                try
+                {
+                    string message = await msg.Content.ReadAsStringAsync();
+                    using JsonDocument serverResponseJson = JsonDocument.Parse(message);
+                    if (serverResponseJson.RootElement.TryGetProperty("message", out JsonElement messageElement))
+                    {
+                        serverMessage = messageElement.ValueKind switch
+                        {
+                            JsonValueKind.String => messageElement.GetString(),
+                            JsonValueKind.Array => string.Join("; ", messageElement.EnumerateArray().Select(e => e.GetString())),
+                            _ => ""
+                        };
+                    }
+                }
+                catch
+                {
+                    msg.EnsureSuccessStatusCode();
+                }
+                if (string.IsNullOrWhiteSpace(serverMessage))
+                {
+                    msg.EnsureSuccessStatusCode();
+                }
+                else
+                {
+                    serverMessage = $"Server responded: {serverMessage}";
+                }
+                throw new HttpRequestException(serverMessage, null, msg.StatusCode);
+            }
+        }
         internal static string GetServerStatusCode(Exception ex)
         {
             if (ex is WebException webex)

gamevault/Helper/Web/WebHelper.cs

@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 
@@ -61,68 +62,67 @@ internal static void SetAdditionalRequestHeaders(RequestHeader[] additionalReque
         internal static async Task<string> BaseGetAsync(string url)
         {
             var response = await BaseHttpClient.GetAsync(url);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
         internal static async Task<string> BasePostAsync(string url, string payload)
         {
             var content = new StringContent(payload, Encoding.UTF8, "application/json");
             var response = await BaseHttpClient.PostAsync(url, content);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
         internal static async Task<string> BaseSendRequest(HttpRequestMessage request)
         {
             var response = await BaseHttpClient.SendAsync(request);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
         #endregion
         internal static async Task<string> GetAsync(string url)
         {
             var response = await HttpClient.GetAsync(url, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
         internal static async Task<HttpResponseMessage> GetAsync(string url, HttpCompletionOption option = HttpCompletionOption.ResponseContentRead)
         {
             var response = await HttpClient.GetAsync(url, AdditionalRequestHeaders, option);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return response;
         }
         internal static async Task<string> PostAsync(string url, string payload)
         {
             var content = new StringContent(payload, Encoding.UTF8, "application/json");
             var response = await HttpClient.PostAsync(url, content, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
 
         internal static async Task<string> PutAsync(string url, string payload)
         {
             var content = new StringContent(payload, Encoding.UTF8, "application/json");
             var response = await HttpClient.PutAsync(url, content, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+            await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
-
         internal static async Task<string> DeleteAsync(string url)
         {
             var response = await HttpClient.DeleteAsync(url, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             return await response.Content.ReadAsStringAsync();
         }
         public static async Task DownloadImageFromUrlAsync(string imageUrl, string cacheFile)
         {
             var response = await HttpClient.GetAsync(imageUrl, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             var imageBytes = await response.Content.ReadAsByteArrayAsync();
             await File.WriteAllBytesAsync(cacheFile, imageBytes);
         }
         public static async Task<BitmapImage> DownloadImageFromUrlAsync(string imageUrl)
         {
             var response = await HttpClient.GetAsync(imageUrl, AdditionalRequestHeaders);
-            response.EnsureSuccessStatusCode();
+           await WebExceptionHelper.EnsureSuccessStatusCode(response);
             var imageData = await response.Content.ReadAsByteArrayAsync();
             using (var memoryStream = new MemoryStream(imageData))
             {
@@ -158,7 +158,7 @@ public static async Task<string> UploadFileAsync(string apiUrl, Stream imageStre
                 imageContent.Headers.ContentType = new MediaTypeHeaderValue(mimeType);
                 formData.Add(imageContent, "file", fileName);
                 var response = await HttpClient.PostAsync(apiUrl, formData, mixedHeaders);
-                response.EnsureSuccessStatusCode();
+               await WebExceptionHelper.EnsureSuccessStatusCode(response);
                 var responseContent = await response.Content.ReadAsStringAsync();
                 return responseContent;
             }
@@ -184,6 +184,7 @@ public static string RemoveSpecialCharactersFromUrl(string url)
             }
             return sb.ToString();
         }
+        
     }
 }