Merge pull request #12 from sendgrid/256-bad-json

Fix for issue #7

Author: thinkingserious

CSharpHTTPClient/Client.cs

@@ -272,7 +272,7 @@ public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMe
         /// <param name="requestBody">JSON formatted string</param>
         /// <param name="queryParams">JSON formatted queary paramaters</param>
         /// <returns>Response object</returns>
-        private async Task<Response> RequestAsync(string method, String requestBody = null, String queryParams = null)
+        private async Task<Response> RequestAsync(string method, string requestBody = null, string queryParams = null)
         {
             using (var client = new HttpClient())
             {
@@ -308,7 +308,7 @@ private async Task<Response> RequestAsync(string method, String requestBody = nu
                     StringContent content = null;
                     if (requestBody != null)
                     {
-                        content = new StringContent(requestBody.ToString().Replace("'", "\""), Encoding.UTF8, MediaType);
+                        content = new StringContent(requestBody, Encoding.UTF8, MediaType);
                     }
 
                     // Build the final request

Example/Example.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using SendGrid.CSharp.HTTP.Client;
 using System.Web.Script.Serialization;
+using Newtonsoft.Json;
 
 // This is a working example, using the SendGrid API
 // You will need a SendGrid account and an active API Key
@@ -28,9 +29,9 @@ static void Main(string[] args)
             Dictionary<String, String> requestHeaders = new Dictionary<String, String>();
             requestHeaders.Add("X-Test", "test");
             dynamic response = client.api_keys.get(queryParams: queryParams, requestHeaders: requestHeaders);
-            // Console.WriteLine(response.StatusCode);
-            // Console.WriteLine(response.Body.ReadAsStringAsync().Result);
-            // Console.WriteLine(response.Headers.ToString());
+            Console.WriteLine(response.StatusCode);
+            Console.WriteLine(response.Body.ReadAsStringAsync().Result);
+            Console.WriteLine(response.Headers.ToString());
 
             var dssResponseBody = response.DeserializeResponseBody(response.Body);
             foreach ( var value in dssResponseBody["result"])
@@ -56,9 +57,10 @@ static void Main(string[] args)
                     'alerts.read'
                 ]
             }";
+            Object json = JsonConvert.DeserializeObject<Object>(requestBody);
             requestHeaders.Clear();
             requestHeaders.Add("X-Test", "test2");
-            response = client.api_keys.post(requestBody: requestBody, requestHeaders: requestHeaders);
+            response = client.api_keys.post(requestBody: json.ToString(), requestHeaders: requestHeaders);
             Console.WriteLine(response.StatusCode);
             Console.WriteLine(response.Body.ReadAsStringAsync().Result);
             Console.WriteLine(response.Headers.ToString());
@@ -82,7 +84,8 @@ static void Main(string[] args)
             requestBody = @"{
                 'name': 'A New Hope'
             }";
-            response = client.api_keys._(api_key_id).patch(requestBody: requestBody);
+            json = JsonConvert.DeserializeObject<Object>(requestBody);
+            response = client.api_keys._(api_key_id).patch(requestBody: json.ToString());
             Console.WriteLine(response.StatusCode);
             Console.WriteLine(response.Body.ReadAsStringAsync().Result);
             Console.WriteLine(response.Headers.ToString());
@@ -98,7 +101,8 @@ static void Main(string[] args)
                     'user.profile.update'
                 ]
             }";
-            response = client.api_keys._(api_key_id).put(requestBody: requestBody);
+            json = JsonConvert.DeserializeObject<Object>(requestBody);
+            response = client.api_keys._(api_key_id).put(requestBody: json.ToString());
             Console.WriteLine(response.StatusCode);
             Console.WriteLine(response.Body.ReadAsStringAsync().Result);
             Console.WriteLine(response.Headers.ToString());

Example/Example.csproj

@@ -34,6 +34,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\CSharpHTTPClient\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web.Extensions" />
@@ -50,6 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CSharpHTTPClient\CSharpHTTPClient.csproj">

Example/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+</packages>