Pull request #1: Support Application JSON content for POST API

Merge in SDK/csharp_telesign from feature/PD-91980 to master

* commit '60ebd8519b6bbe214b7a1ba6d64ac74a56b3dab9':
  Fix Version SDK
  Support Application JSON content for POST API

Author: vaponte7S

.gitignore

@@ -28,7 +28,7 @@ bld/
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
-
+.vscode/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*

RELEASE.md

@@ -1,3 +1,7 @@
+2.3.0
+- Moved support for application/json content-type from PhoneIdClient class to RestClient class
+- Added two testing post method for application json test.
+
 2.2.1
 - Added support for application/json content-type
 

Telesign.Test/RestClientTest.cs

@@ -213,6 +213,36 @@ public void TestRestClientPost()
             Assert.IsNotNull(this.requestHeaders.Last()["Authorization"]);
         }
 
+        public void TestRestClientPost2()
+        {
+            string testResource = "/test/resource";
+            Dictionary<string, object> testParams = new Dictionary<string, object>();
+            testParams.Add("test", "123_\u03ff_test");
+            testParams.Add("testInteger", 123);
+
+            RestClient client = new RestClient(this.customerId,
+                                               this.apiKey,
+                                               string.Format("http://localhost:{0}", this.mockServer.Port));
+
+            client.Post(testResource, testParams);
+
+            Assert.AreEqual("POST", this.requests.Last().HttpMethod, "method is not as expected");
+            Assert.AreEqual("/test/resource", this.requests.Last().RawUrl, "path is not as expected");
+
+            Assert.AreEqual("{\"test\":\"123_Ͽ_test\",\"testInteger\":123}", this.requestBodies.Last(), "body is not as expected");
+
+            Assert.AreEqual("application/json", this.requestHeaders.Last()["Content-Type"], "Content-Type header is not as expected");
+            Assert.AreEqual("HMAC-SHA256", this.requestHeaders.Last()["x-ts-auth-method"], "x-ts-auth-method header is not as expected");
+
+            Guid dummyGuid;
+            Assert.IsTrue(Guid.TryParse(this.requestHeaders.Last()["x-ts-nonce"], out dummyGuid), "x-ts-nonce header is not a valid UUID");
+
+            DateTime dummyDateTime;
+            Assert.IsTrue(DateTime.TryParse(this.requestHeaders.Last()["Date"], out dummyDateTime), "Date header is not valid rfc2616 format");
+
+            Assert.IsNotNull(this.requestHeaders.Last()["Authorization"]);
+        }
+
         [Test]
         public void TestRestClientGet()
         {
@@ -302,8 +332,8 @@ public void TestRestClientDelete()
 
             Assert.IsNotNull(this.requestHeaders.Last()["Authorization"]);
         }
-        
-        
+
+
         [Test]
         public async Task TestRestClientPostAsync()
         {
@@ -334,6 +364,36 @@ public async Task TestRestClientPostAsync()
             Assert.IsNotNull(this.requestHeaders.Last()["Authorization"]);
         }
 
+        public async Task TestRestClientPost2Async()
+        {
+            string testResource = "/test/resource";
+            Dictionary<string, object> testParams = new Dictionary<string, object>();
+            testParams.Add("test", "123_\u03ff_test");
+            testParams.Add("testInteger", 123);
+
+            RestClient client = new RestClient(this.customerId,
+                                               this.apiKey,
+                                               string.Format("http://localhost:{0}", this.mockServer.Port));
+
+            client.Post(testResource, testParams);
+
+            Assert.AreEqual("POST", this.requests.Last().HttpMethod, "method is not as expected");
+            Assert.AreEqual("/test/resource", this.requests.Last().RawUrl, "path is not as expected");
+
+            Assert.AreEqual("{\"test\":\"123_Ͽ_test\",\"testInteger\":123}", this.requestBodies.Last(), "body is not as expected");
+
+            Assert.AreEqual("application/json", this.requestHeaders.Last()["Content-Type"], "Content-Type header is not as expected");
+            Assert.AreEqual("HMAC-SHA256", this.requestHeaders.Last()["x-ts-auth-method"], "x-ts-auth-method header is not as expected");
+
+            Guid dummyGuid;
+            Assert.IsTrue(Guid.TryParse(this.requestHeaders.Last()["x-ts-nonce"], out dummyGuid), "x-ts-nonce header is not a valid UUID");
+
+            DateTime dummyDateTime;
+            Assert.IsTrue(DateTime.TryParse(this.requestHeaders.Last()["Date"], out dummyDateTime), "Date header is not valid rfc2616 format");
+
+            Assert.IsNotNull(this.requestHeaders.Last()["Authorization"]);
+        }
+
         [Test]
         public async Task TestRestClientGetAsync()
         {

Telesign/PhoneIdClient.cs

@@ -45,77 +45,6 @@ public PhoneIdClient(string customerId,
                    proxyPassword)
         { }
 
-        /// <summary>
-        /// Generic TeleSign REST API request handler.
-        /// </summary>
-        /// <param name="resource">The partial resource URI to perform the request against.</param>
-        /// <param name="method">The HTTP method name, as an upper case string.</param>
-        /// <param name="parameters">Params to perform the request with. With application/json content type, Dictionary with string keys and object values should be used, otherwise string keys and string values</param>
-        /// <returns></returns>
-        protected TelesignResponse Execute(string resource, HttpMethod method, Dictionary<string, object> parameters)
-        {
-            return ExecuteAsync(resource, method, parameters).Result;
-        }
-
-        protected async Task<TelesignResponse> ExecuteAsync(string resource, HttpMethod method, Dictionary<string, object> parameters)
-        {
-            string contentType = "application/json";
-            HttpRequestMessage request;
-            string fieldsToSign = null;
-            if (parameters == null)
-                parameters = new Dictionary<string, object>();
-
-            string resourceUri = string.Format("{0}{1}", this.restEndpoint, resource);
-
-            fieldsToSign = JsonConvert.SerializeObject(parameters);
-            request = new HttpRequestMessage(method, resourceUri);
-            request.Content = new StringContent(fieldsToSign);
-            request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
-
-            Dictionary<string, string> headers = RestClient.GenerateTelesignHeaders(
-                this.customerId,
-                this.apiKey,
-                method.ToString().ToUpper(),
-                resource,
-                fieldsToSign,
-                null,
-                null,
-                RestClient.UserAgent,
-                contentType);
-
-            foreach (KeyValuePair<string, string> header in headers)
-            {
-                // .NET considers content-type header to be part of the content, not the request
-                // when content-type is set as request header, exception is raised
-                // proper way to set content-type is through content property of the request object
-                if (header.Key == "Content-Type")
-                    continue;
-                request.Headers.Add(header.Key, header.Value);
-            }
-
-            HttpResponseMessage response = await this.httpClient.SendAsync(request).ConfigureAwait(false);
-
-            TelesignResponse tsResponse = new TelesignResponse(response, isAsync: true);
-            await tsResponse.Initialize();
-            return tsResponse;
-        }
-
-        /// <summary>
-        /// Generic TeleSign REST API POST handler.
-        /// </summary>
-        /// <param name="resource">The partial resource URI to perform the request against.</param>
-        /// <param name="parameters">Body params to perform the POST request with.</param>
-        /// <returns>The TelesignResponse for the request.</returns>
-        public TelesignResponse Post(string resource, Dictionary<string, object> parameters)
-        {
-            return Execute(resource, HttpMethod.Post, parameters);
-        }
-
-        public Task<TelesignResponse> PostAsync(string resource, Dictionary<string, object> parameters)
-        {
-            return ExecuteAsync(resource, HttpMethod.Post, parameters);
-        }
-
         /// <summary>
         /// The PhoneID API provides a cleansed phone number, phone type, and telecom carrier information to determine the
         /// best communication method - SMS or voice.

Telesign/RestClient.cs

@@ -381,5 +381,78 @@ private async Task<TelesignResponse> ExecuteAsync(string resource, HttpMethod me
             await tsResponse.Initialize();
             return tsResponse;
         }
+
+        /*Overriding Method only work for Json Content type*/
+
+        /// <summary>
+        /// Generic TeleSign REST API request handler.
+        /// </summary>
+        /// <param name="resource">The partial resource URI to perform the request against.</param>
+        /// <param name="method">The HTTP method name, as an upper case string.</param>
+        /// <param name="parameters">Params to perform the request with. With application/json content type, Dictionary with string keys and object values should be used, otherwise string keys and string values</param>
+        /// <returns></returns>
+        protected TelesignResponse Execute(string resource, HttpMethod method, Dictionary<string, object> parameters)
+        {
+            return ExecuteAsync(resource, method, parameters).Result;
+        }
+
+        protected async Task<TelesignResponse> ExecuteAsync(string resource, HttpMethod method, Dictionary<string, object> parameters)
+        {
+            string contentType = "application/json";
+            HttpRequestMessage request;
+            string fieldsToSign = null;
+            if (parameters == null)
+                parameters = new Dictionary<string, object>();
+
+            string resourceUri = string.Format("{0}{1}", this.restEndpoint, resource);
+
+            fieldsToSign = JsonConvert.SerializeObject(parameters);
+            request = new HttpRequestMessage(method, resourceUri);
+            request.Content = new StringContent(fieldsToSign);
+            request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
+
+            Dictionary<string, string> headers = RestClient.GenerateTelesignHeaders(
+                this.customerId,
+                this.apiKey,
+                method.ToString().ToUpper(),
+                resource,
+                fieldsToSign,
+                null,
+                null,
+                RestClient.UserAgent,
+                contentType);
+
+            foreach (KeyValuePair<string, string> header in headers)
+            {
+                // .NET considers content-type header to be part of the content, not the request
+                // when content-type is set as request header, exception is raised
+                // proper way to set content-type is through content property of the request object
+                if (header.Key == "Content-Type")
+                    continue;
+                request.Headers.Add(header.Key, header.Value);
+            }
+
+            HttpResponseMessage response = await this.httpClient.SendAsync(request).ConfigureAwait(false);
+
+            TelesignResponse tsResponse = new TelesignResponse(response, isAsync: true);
+            await tsResponse.Initialize();
+            return tsResponse;
+        }
+
+        /// <summary>
+        /// Generic TeleSign REST API POST handler.
+        /// </summary>
+        /// <param name="resource">The partial resource URI to perform the request against.</param>
+        /// <param name="parameters">Body params to perform the POST request with.</param>
+        /// <returns>The TelesignResponse for the request.</returns>
+        public TelesignResponse Post(string resource, Dictionary<string, object> parameters)
+        {
+            return Execute(resource, HttpMethod.Post, parameters);
+        }
+
+        public Task<TelesignResponse> PostAsync(string resource, Dictionary<string, object> parameters)
+        {
+            return ExecuteAsync(resource, HttpMethod.Post, parameters);
+        }
     }
 }

Telesign/telesign.nuspec

@@ -2,7 +2,7 @@
 <package>
     <metadata>
     <id>Telesign</id>
-    <version>2.2.2</version>
+    <version>2.3.0</version>
     <title>Telesign</title>
     <authors>Telesign</authors>
     <owners>Telesign</owners>