feat: Correctly parse error message

Author: mediumTaj

Connection/RESTConnector.cs

@@ -26,7 +26,10 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
-
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using MiniJSON;
+
 #if !NETFX_CORE
 using System.Net;
 using System.Net.Security;
@@ -89,8 +92,8 @@ public class Response
             /// </summary>
             public Dictionary<string, string> Headers { get; set; }
             #endregion
-        };
-        
+        };
+
         /// <summary>
         /// Multi-part form data class.
         /// </summary>
@@ -485,7 +488,7 @@ private IEnumerator ProcessRequestQueue()
                         method = req.HttpMethod
                     };
 
-                    if(req.HttpMethod == UnityWebRequest.kHttpVerbPOST)
+                    if (req.HttpMethod == UnityWebRequest.kHttpVerbPOST)
                     {
                         unityWebRequest.SetRequestHeader("Content-Type", "application/json");
                     }
@@ -568,11 +571,13 @@ private IEnumerator ProcessRequestQueue()
                             break;
                     }
 
+                    string errorMessage = GetErrorMessage(unityWebRequest.downloadHandler.text);
+
                     error = new IBMError()
                     {
                         Url = url,
                         StatusCode = unityWebRequest.responseCode,
-                        ErrorMessage = unityWebRequest.error,
+                        ErrorMessage = errorMessage,
                         Response = unityWebRequest.downloadHandler.text,
                         ResponseHeaders = unityWebRequest.GetResponseHeaders()
                     };
@@ -628,6 +633,29 @@ private IEnumerator ProcessRequestQueue()
             // reduce the connection count before we exit.
             _activeConnections -= 1;
             yield break;
+        }
+        #endregion
+
+        #region Get Error Message
+        public string GetErrorMessage(string error)
+        {
+            dynamic deserializedObject = Json.Deserialize(error);
+            if ((deserializedObject as Dictionary<string, object>).ContainsKey("errors"))
+            {
+                return deserializedObject["errors"][0]["message"];
+            }
+
+            if ((deserializedObject as Dictionary<string, object>).ContainsKey("error"))
+            {
+                return deserializedObject["error"];
+            }
+
+            if ((deserializedObject as Dictionary<string, object>).ContainsKey("message"))
+            {
+                return deserializedObject["message"];
+            }
+
+            return "Unknown error";
         }
         #endregion
     }

Tests.meta

@@ -0,0 +1,54 @@
+/**
+* Copyright 2019 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using IBM.Cloud.SDK.Connection;
+
+namespace IBM.Cloud.SDK.Tests
+{
+    public class CoreTests
+    {
+        [Test]
+        public void GetErrorFromArray()
+        {
+            string json = "{\"errors\":[{\"code\":\"missing_field\",\"message\":\"The request path is not valid. Make sure that the endpoint is correct.\",\"more_info\":\"https://cloud.ibm.com/apidocs/visual-recognition-v4\",\"target\":{\"type\":\"field\",\"name\":\"URL path\"}}],\"trace\":\"4e1b7b85-4dba-4219-b46b-6cdd2e2c06fd\"}";
+            RESTConnector restConnector = new RESTConnector();
+            string errorMessage = restConnector.GetErrorMessage(json);
+            Assert.IsTrue(errorMessage == "The request path is not valid. Make sure that the endpoint is correct.");
+        }
+
+        [Test]
+        public void GetErrorFromError()
+        {
+            string json = "{\"code\":\"400\",\"error\":\"Error: Too many images in collection\"}";
+            RESTConnector restConnector = new RESTConnector();
+            string errorMessage = restConnector.GetErrorMessage(json);
+            Assert.IsTrue(errorMessage == "Error: Too many images in collection");
+        }
+
+        [Test]
+        public void GetErrorFromMessage()
+        {
+            string json = "{\"code\":\"string\",\"message\":\"string\"}";
+            RESTConnector restConnector = new RESTConnector();
+            string errorMessage = restConnector.GetErrorMessage(json);
+            Assert.IsTrue(errorMessage == "string");
+        }
+    }
+}

Tests/CoreTests.cs

@@ -0,0 +1,9 @@
+{
+  "name": "IBM.Cloud.SDK.Tests",
+  "references": [
+    "IBM.Cloud.SDK"
+  ],
+  "optionalUnityReferences": [
+    "TestAssemblies"
+  ]
+}