Merge pull request #188 from L-Naej/develop

jdnichollsc · web-flow · commit 2771499cb8ef · 2021-12-09T14:20:02.000-05:00
Fix: Handle HTTP NO CONTENT status code (204) to prevent null reference exceptions in HttpBase.cs
diff --git a/src/Proyecto26.RestClient/Helpers/HttpBase.cs b/src/Proyecto26.RestClient/Helpers/HttpBase.cs
@@ -8,6 +8,8 @@ namespace Proyecto26
 {
     public static class HttpBase
     {
+        public static int HTTP_NO_CONTENT = 204;
+
         public static IEnumerator CreateRequestAndRetry(RequestHelper options, Action<RequestException, ResponseHelper> callback)
         {
 
@@ -118,7 +120,7 @@ public static IEnumerator DefaultUnityWebRequest<TResponse>(RequestHelper option
                 var body = default(TResponse);
                 try
                 {
-                    if (err == null && res.Data != null && options.ParseResponseBody)
+                    if (err == null && res.StatusCode != HTTP_NO_CONTENT && res.Data != null && options.ParseResponseBody)
                         body = JsonUtility.FromJson<TResponse>(res.Text);
                 }
                 catch (Exception error)
@@ -139,7 +141,7 @@ public static IEnumerator DefaultUnityWebRequest<TResponse>(RequestHelper option
                 var body = default(TResponse[]);
                 try
                 {
-                    if (err == null && res.Data != null && options.ParseResponseBody)
+                    if (err == null && res.StatusCode != HTTP_NO_CONTENT && res.Data != null && options.ParseResponseBody)
                         body = JsonHelper.ArrayFromJson<TResponse>(res.Text);
                 }
                 catch (Exception error)

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace Proyecto26`
`8`	`8`	`{`
`9`	`9`	`public static class HttpBase`
`10`	`10`	`{`
	`11`	`+ public static int HTTP_NO_CONTENT = 204;`
	`12`	`+`
`11`	`13`	`public static IEnumerator CreateRequestAndRetry(RequestHelper options, Action<RequestException, ResponseHelper> callback)`
`12`	`14`	`{`
`13`	`15`
`@@ -118,7 +120,7 @@ public static IEnumerator DefaultUnityWebRequest<TResponse>(RequestHelper option`
`118`	`120`	`var body = default(TResponse);`
`119`	`121`	`try`
`120`	`122`	`{`
`121`		`- if (err == null && res.Data != null && options.ParseResponseBody)`
	`123`	`+ if (err == null && res.StatusCode != HTTP_NO_CONTENT && res.Data != null && options.ParseResponseBody)`
`122`	`124`	`body = JsonUtility.FromJson<TResponse>(res.Text);`
`123`	`125`	`}`
`124`	`126`	`catch (Exception error)`
`@@ -139,7 +141,7 @@ public static IEnumerator DefaultUnityWebRequest<TResponse>(RequestHelper option`
`139`	`141`	`var body = default(TResponse[]);`
`140`	`142`	`try`
`141`	`143`	`{`
`142`		`- if (err == null && res.Data != null && options.ParseResponseBody)`
	`144`	`+ if (err == null && res.StatusCode != HTTP_NO_CONTENT && res.Data != null && options.ParseResponseBody)`
`143`	`145`	`body = JsonHelper.ArrayFromJson<TResponse>(res.Text);`
`144`	`146`	`}`
`145`	`147`	`catch (Exception error)`