Allow option for ApiRequest to directly return the response object

derekantrican · Nov 17, 2023 · 9f52409 · 9f52409
1 parent cc03f3e
commit 9f52409
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/ClockworkFramework.Core/Utilities.cs b/ClockworkFramework.Core/Utilities.cs
@@ -44,17 +44,25 @@ public static void WriteToConsoleWithColor(object obj, ConsoleColor color)
         public static string ApiRequest(string url, HttpMethod method, Dictionary<string, string> headers = null,
                                         Dictionary<string, string> parameters = null, HttpContent content = null) 
         {
-            return ApiRequest(new ApiRequestParams
+            var response = ApiRequest(new ApiRequestParams
             {
                 Url = url,
                 Method = method,
                 Headers = headers,
                 Parameters = parameters,
                 Content = content,
             });
+
+            using (var stream = response.Content.ReadAsStream())
+            {
+                using (var streamReader = new StreamReader(stream))
+                {
+                    return streamReader.ReadToEnd();
+                }
+            }
         }
 
-        public static string ApiRequest(ApiRequestParams parameters)
+        public static HttpResponseMessage ApiRequest(ApiRequestParams parameters)
         {
             using (var client = new HttpClient())
             {
@@ -75,14 +83,7 @@ public static string ApiRequest(ApiRequestParams parameters)
 
                 request.Content = parameters.Content;
 
-                var response = client.Send(request);
-                using (var stream = response.Content.ReadAsStream())
-                {
-                    using (var streamReader = new StreamReader(stream))
-                    {
-                        return streamReader.ReadToEnd();
-                    }
-                }
+                return client.Send(request);
             }
         }