From 451d27e282af9a3dfecdf660bf6d018095716d49 Mon Sep 17 00:00:00 2001
From: Stephen Hodgson <hodgson.designs@gmail.com>
Date: Thu, 29 Feb 2024 14:00:19 -0500
Subject: [PATCH] com.utilities.rest 2.5.4

- Fixed parsing json in request and body responses
---
 .../Packages/com.utilities.rest/Runtime/BaseEndPoint.cs   | 3 ++-
 .../Packages/com.utilities.rest/Runtime/Response.cs       | 8 ++++----
 Utilities.Rest/Packages/com.utilities.rest/package.json   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Utilities.Rest/Packages/com.utilities.rest/Runtime/BaseEndPoint.cs b/Utilities.Rest/Packages/com.utilities.rest/Runtime/BaseEndPoint.cs
index 3620450..d61c006 100644
--- a/Utilities.Rest/Packages/com.utilities.rest/Runtime/BaseEndPoint.cs
+++ b/Utilities.Rest/Packages/com.utilities.rest/Runtime/BaseEndPoint.cs
@@ -27,6 +27,7 @@ public abstract class BaseEndPoint<TClient, TAuthentication, TSettings>
         /// <summary>
         /// <see cref="IClient"/> for this endpoint.
         /// </summary>
+        /// ReSharper disable once InconsistentNaming
         protected readonly TClient client;
 
         /// <summary>
@@ -39,7 +40,7 @@ public abstract class BaseEndPoint<TClient, TAuthentication, TSettings>
         /// </summary>
         /// <param name="endpoint">The endpoint url.</param>
         /// <param name="queryParameters">Optional, parameters to add to the endpoint.</param>
-        protected string GetUrl(string endpoint = "", Dictionary<string, string> queryParameters = null)
+        protected virtual string GetUrl(string endpoint = "", Dictionary<string, string> queryParameters = null)
         {
             var result = string.Format(client.Settings.BaseRequestUrlFormat, $"{Root}{endpoint}");
 
diff --git a/Utilities.Rest/Packages/com.utilities.rest/Runtime/Response.cs b/Utilities.Rest/Packages/com.utilities.rest/Runtime/Response.cs
index 6e75ad8..18c2bb6 100644
--- a/Utilities.Rest/Packages/com.utilities.rest/Runtime/Response.cs
+++ b/Utilities.Rest/Packages/com.utilities.rest/Runtime/Response.cs
@@ -134,7 +134,7 @@ public string ToString(string methodName)
             {
                 try
                 {
-                    debugMessageObject["request"]["body"] = JObject.Parse(RequestBody);
+                    debugMessageObject["request"]["body"] = JToken.Parse(RequestBody);
                 }
                 catch
                 {
@@ -144,7 +144,7 @@ public string ToString(string methodName)
 
             debugMessageObject["response"] = new()
             {
-                ["code"] = Code,
+                ["code"] = Code
             };
 
             if (Headers != null)
@@ -171,7 +171,7 @@ public string ToString(string methodName)
 
                         try
                         {
-                            ((JArray)debugMessageObject["response"]["body"]).Add(JObject.Parse(part));
+                            ((JArray)debugMessageObject["response"]["body"]).Add(JToken.Parse(part));
                         }
                         catch
                         {
@@ -183,7 +183,7 @@ public string ToString(string methodName)
                 {
                     try
                     {
-                        debugMessageObject["response"]["body"] = JObject.Parse(Body);
+                        debugMessageObject["response"]["body"] = JToken.Parse(Body);
                     }
                     catch
                     {
diff --git a/Utilities.Rest/Packages/com.utilities.rest/package.json b/Utilities.Rest/Packages/com.utilities.rest/package.json
index 3ee344c..57e25d7 100644
--- a/Utilities.Rest/Packages/com.utilities.rest/package.json
+++ b/Utilities.Rest/Packages/com.utilities.rest/package.json
@@ -3,7 +3,7 @@
   "displayName": "Utilities.Rest",
   "description": "This package contains useful RESTful utilities for the Unity Game Engine.",
   "keywords": [],
-  "version": "2.5.3",
+  "version": "2.5.4",
   "unity": "2021.3",
   "documentationUrl": "https://github.com/RageAgainstThePixel/com.utilities.rest#documentation",
   "changelogUrl": "https://github.com/RageAgainstThePixel/com.utilities.rest/releases",