From 19e3cef7ddfd10720799d4f365a3bbaf093e29d4 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Sat, 5 Aug 2023 09:00:38 -0400
Subject: [PATCH] introduce new GetJsonAsync method with default value
 parameter

---
 Oqtane.Client/Services/AliasService.cs |  2 +-
 Oqtane.Client/Services/ServiceBase.cs  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs
index c2e59799..714f1061 100644
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@@ -22,7 +22,7 @@ namespace Oqtane.Services
         /// <inheritdoc />
         public async Task<List<Alias>> GetAliasesAsync()
         {
-            List<Alias> aliases = await GetJsonAsync<List<Alias>>(ApiUrl);
+            List<Alias> aliases = await GetJsonAsync<List<Alias>>(ApiUrl, Enumerable.Empty<Alias>().ToList());
             return aliases.OrderBy(item => item.Name).ToList();
         }
 
diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs
index fb81b65b..b290aee8 100644
--- a/Oqtane.Client/Services/ServiceBase.cs
+++ b/Oqtane.Client/Services/ServiceBase.cs
@@ -145,10 +145,19 @@ namespace Oqtane.Services
             {
                 return await response.Content.ReadFromJsonAsync<T>();
             }
-
             return default;
         }
 
+        protected async Task<T> GetJsonAsync<T>(string uri, T defaultvalue)
+        {
+            var response = await GetHttpClient().GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
+            if (await CheckResponse(response, uri) && ValidateJsonContent(response.Content))
+            {
+                return await response.Content.ReadFromJsonAsync<T>();
+            }
+            return defaultvalue;
+        }
+
         protected async Task PutAsync(string uri)
         {
             var response = await GetHttpClient().PutAsync(uri, null);