chore(Assistant V2): Revised service abstraction, added support for POST with no data

Author: mediumTaj

Scripts/Connection/RESTConnector.cs

@@ -214,6 +214,10 @@ public Request()
             /// </summary>
             public bool Delete { get; set; }
             /// <summary>
+            /// True to send a post method.
+            /// </summary>
+            public bool Post { get; set; }
+            /// <summary>
             /// The name of the function to invoke on the server.
             /// </summary>
             public string Function { get; set; }
@@ -406,7 +410,7 @@ private IEnumerator ProcessRequestQueue()
                 Response resp = new Response();
 
                 DateTime startTime = DateTime.Now;
-                if (!req.Delete)
+                if (!req.Delete && !req.Post)
                 {
                     WWW www = null;
                     if (req.Forms != null)
@@ -549,6 +553,33 @@ private IEnumerator ProcessRequestQueue()
 
                     www.Dispose();
                 }
+                else if(req.Post)
+                {
+                    float timeout = Mathf.Max(Constants.Config.Timeout, req.Timeout);
+
+                    PostRequest postReq = new PostRequest();
+                    Runnable.Run(postReq.Send(url, req.Headers));
+                    while (!postReq.IsComplete)
+                    {
+                        if (req.Cancel)
+                            break;
+                        if ((DateTime.Now - startTime).TotalSeconds > timeout)
+                            break;
+                        yield return null;
+                    }
+
+                    if (req.Cancel)
+                        continue;
+
+                    resp.Success = postReq.Success;
+                    resp.Data = postReq.Data;
+                    resp.Error = postReq.Error;
+                    resp.HttpResponseCode = postReq.HttpResponseCode;
+                    resp.ElapsedTime = (float)(DateTime.Now - startTime).TotalSeconds;
+                    resp.Headers = postReq.ResponseHeaders;
+                    if (req.OnResponse != null)
+                        req.OnResponse(req, resp);
+                }
                 else
                 {
 
@@ -695,6 +726,72 @@ public IEnumerator Send(string url, Dictionary<string, string> headers)
                 IsComplete = true;
             }
         };
+
+        private class PostRequest
+        {
+            public string URL { get; set; }
+            public Dictionary<string, string> Headers { get; set; }
+            public bool IsComplete { get; set; }
+            public bool Success { get; set; }
+            public long HttpResponseCode { get; set; }
+            public byte[] Data { get; set; }
+            public Error Error { get; set; }
+            public Dictionary<string, string> ResponseHeaders { get; set; }
+
+            public IEnumerator Send(string url, Dictionary<string, string> headers)
+            {
+#if ENABLE_DEBUGGING
+                Log.Debug("PostRequest.Send()", "PostRequest, Send: {0}", url);
+#endif
+
+                URL = url;
+                Headers = new Dictionary<string, string>();
+                foreach (var kp in headers)
+                {
+                    if (kp.Key != "User-Agent")
+                        Headers[kp.Key] = kp.Value;
+                }
+
+#if !NETFX_CORE
+                // This fixes the exception thrown by self-signed certificates.
+                ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
+#endif
+
+#if ENABLE_DEBUGGING
+                Log.Debug("PostRequest.Send()", "PostRequest, ProcessRequest {0}", URL);
+#endif
+                UnityWebRequest postReq = UnityWebRequest.Get(URL);
+                postReq.method = UnityWebRequest.kHttpVerbPOST;
+                postReq.downloadHandler = new DownloadHandlerBuffer();
+
+                foreach (var kp in Headers)
+                    postReq.SetRequestHeader(kp.Key, kp.Value);
+#if UNITY_2017_2_OR_NEWER
+                yield return postReq.SendWebRequest();
+#else
+                yield return postReq.Send();
+#endif
+                Error error = null;
+                if (!string.IsNullOrEmpty(postReq.error))
+                {
+                    error = new Error()
+                    {
+                        URL = url,
+                        ErrorCode = postReq.responseCode,
+                        ErrorMessage = postReq.error,
+                        Response = postReq.downloadHandler.text,
+                        ResponseHeaders = postReq.GetResponseHeaders()
+                    };
+                }
+
+                Success = postReq.responseCode == HTTP_STATUS_OK || postReq.responseCode == HTTP_STATUS_OK || postReq.responseCode == HTTP_STATUS_NO_CONTENT || postReq.responseCode == HTTP_STATUS_ACCEPTED;
+                HttpResponseCode = postReq.responseCode;
+                ResponseHeaders = postReq.GetResponseHeaders();
+                Data = postReq.downloadHandler.data;
+                Error = error;
+                IsComplete = true;
+            }
+        };
         #endregion
     }
 }

Scripts/Services/Assistant/v2/Assistant.cs

@@ -141,8 +141,10 @@ public bool CreateSession(SuccessCallback<SessionResponse> successCallback, Fail
                     req.Headers.Add(kvp.Key, kvp.Value);
                 }
             }
+            req.Headers["Content-Type"] = "application/json";
             req.Parameters["version"] = VersionDate;
             req.OnResponse = OnCreateSessionResponse;
+            req.Post = true;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v2/assistants/{0}/sessions", assistantId));
             if (connector == null)
@@ -244,6 +246,7 @@ public bool DeleteSession(SuccessCallback<object> successCallback, FailCallback
             }
             req.Parameters["version"] = VersionDate;
             req.OnResponse = OnDeleteSessionResponse;
+            req.Delete = true;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v2/assistants/{0}/sessions/{1}", assistantId, sessionId));
             if (connector == null)
@@ -346,6 +349,22 @@ public bool Message(SuccessCallback<MessageResponse> successCallback, FailCallba
                     req.Headers.Add(kvp.Key, kvp.Value);
                 }
             }
+
+            IDictionary<string, string> requestDict = new Dictionary<string, string>();
+            int iterator = 0;
+            StringBuilder stringBuilder = new StringBuilder("{");
+            foreach (KeyValuePair<string, string> property in requestDict)
+            {
+                string delimeter = iterator < requestDict.Count - 1 ? "," : "";
+                stringBuilder.Append(string.Format("\"{0}\": {1}{2}", property.Key, property.Value, delimeter));
+                iterator++;
+            }
+            stringBuilder.Append("}");
+
+            string stringToSend = stringBuilder.ToString();
+
+            req.Send = Encoding.UTF8.GetBytes(stringToSend);
+            req.Headers["Content-Type"] = "application/json";
             req.Parameters["version"] = VersionDate;
             req.OnResponse = OnMessageResponse;
 

Scripts/UnitTests/TestAssistantV2.cs

@@ -37,7 +37,7 @@ public class TestAssistantV2 : UnitTest
         private fsSerializer _serializer = new fsSerializer();
 
         private Assistant _service;
-        private string _assistantVersionDate = "2018-09-17";
+        private string _assistantVersionDate = "2018-09-20";
 
         private string _assistantId;
         private string _sessionId;
@@ -77,7 +77,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.GetCredentialByname("assistantV2-sdk-staging")[0].Credentials;
+            Credential credential = vcapCredentials.GetCredentialByname("assistant-sdk")[0].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();