response headers, rename request headers to custom request headers

Author: mediumTaj

Examples/ServiceExamples/Scripts/ExampleCustomHeaders.cs

@@ -68,15 +68,34 @@ void Start()
         //  Add to the header dictionary
         customHeaders.Add("X-Watson-Metadata", "customer_id=some-customer-id");
         //  Add the header dictionary to the custom data object
-        customData.Add(Constants.String.CUSTOM_HEADERS, customHeaders);
+        customData.Add(Constants.String.CUSTOM_REQUEST_HEADERS, customHeaders);
+
+        if (customData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
+        {
+            Log.Debug("ExampleCustomHeader.Start()", "Custom Request headers:");
+            foreach (KeyValuePair<string, string> kvp in customData[Constants.String.CUSTOM_REQUEST_HEADERS] as Dictionary<string, string>)
+            {
+                Log.Debug("ExampleCustomHeader.Start()", "\t{0}: {1}", kvp.Key, kvp.Value);
+            }
+        }
 
         //  Call service using custom data object
-        _service.Message(OnMessage, OnFail, _assistantWorkspaceId, messageRequest, customData:customData);
+        _service.Message(OnMessage, OnFail, _assistantWorkspaceId, messageRequest, customData: customData);
     }
 
     private void OnMessage(MessageResponse response, Dictionary<string, object> customData)
     {
         Log.Debug("ExampleCustomHeader.OnMessage()", "Response: {0}", customData["json"].ToString());
+
+        if (customData.ContainsKey(Constants.String.RESPONSE_HEADERS))
+        {
+            Log.Debug("ExampleCustomHeader.OnMessage()", "Response headers:");
+
+            foreach (KeyValuePair<string, string> kvp in customData[Constants.String.RESPONSE_HEADERS] as Dictionary<string, string>)
+            {
+                Log.Debug("ExampleCustomHeader.OnMessage()", "\t{0}: {1}", kvp.Key, kvp.Value);
+            }
+        }
     }
 
     private void OnFail(RESTConnector.Error error, Dictionary<string, object> customData)

Scripts/Connection/RESTConnector.cs

@@ -84,6 +84,10 @@ public class Response
             /// The http response code from the server
             /// </summary>
             public long HttpResponseCode { get; set; }
+            /// <summary>
+            /// The response headers
+            /// </summary>
+            public Dictionary<string, string> Headers { get; set; }
             #endregion
         };
 
@@ -524,6 +528,8 @@ private IEnumerator ProcessRequestQueue()
                         resp.Error = error;
                     }
 
+                    resp.Headers = www.responseHeaders;
+
                     resp.ElapsedTime = (float)(DateTime.Now - startTime).TotalSeconds;
 
                     // if the response is over a threshold, then log with status instead of debug
@@ -563,6 +569,7 @@ private IEnumerator ProcessRequestQueue()
                     resp.Error = deleteReq.Error;
                     resp.HttpResponseCode = deleteReq.HttpResponseCode;
                     resp.ElapsedTime = (float)(DateTime.Now - startTime).TotalSeconds;
+                    resp.Headers = deleteReq.ResponseHeaders;
                     if (req.OnResponse != null)
                         req.OnResponse(req, resp);
                 }
@@ -624,6 +631,7 @@ private class DeleteRequest
             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)
             {
@@ -673,6 +681,7 @@ public IEnumerator Send(string url, Dictionary<string, string> headers)
 
                 Success = deleteReq.responseCode == HTTP_STATUS_OK || deleteReq.responseCode == HTTP_STATUS_OK || deleteReq.responseCode == HTTP_STATUS_NO_CONTENT;
                 HttpResponseCode = deleteReq.responseCode;
+                ResponseHeaders = deleteReq.GetResponseHeaders();
                 Data = deleteReq.downloadHandler.data;
                 Error = error;
                 IsComplete = true;

Scripts/Services/Assistant/v1/Assistant.cs

@@ -121,9 +121,9 @@ public bool Message(SuccessCallback<MessageResponse> successCallback, FailCallba
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
-            if(req.CustomData.ContainsKey(Constants.String.CUSTOM_HEADERS))
+            if(req.CustomData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
             {
-                foreach(KeyValuePair<string, string> kvp in req.CustomData[Constants.String.CUSTOM_HEADERS] as Dictionary<string, string>)
+                foreach(KeyValuePair<string, string> kvp in req.CustomData[Constants.String.CUSTOM_REQUEST_HEADERS] as Dictionary<string, string>)
                 {
                     req.Headers.Add(kvp.Key, kvp.Value);
                 }
@@ -186,6 +186,8 @@ private void OnMessageResponse(RESTConnector.Request req, RESTConnector.Response
                 }
             }
 
+            customData.Add(Constants.String.RESPONSE_HEADERS, resp.Headers);
+
             if (resp.Success)
             {
                 if (((MessageRequestObj)req).SuccessCallback != null)

Scripts/Utilities/Constants.cs

@@ -53,7 +53,11 @@ public static class String
             /// <summary>
             /// Name for creating custom headers in CustomData.
             /// </summary>
-            public const string CUSTOM_HEADERS = "custom_header";
+            public const string CUSTOM_REQUEST_HEADERS = "request_headers";
+            /// <summary>
+            /// Name for accessing response headers in CustomData.
+            /// </summary>
+            public const string RESPONSE_HEADERS = "response_headers";
         }
 
         /// <summary>