fix error when post method request doesn't body

Author: Amin GolMahaleh

README.md

@@ -37,7 +37,7 @@ If you like this project, learn something or you are using it in your applicatio
 
 ## **How to use HttpClientToCurlGenerator**:
 
-### Sample code for **Post Method** (it will be written in the **console**):
+### **Post Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{ ""name"" : ""amin"",""requestId"" : ""10001000"",""amount"":10000 }";
         string requestUri = "api/test";
@@ -61,7 +61,7 @@ If you like this project, learn something or you are using it in your applicatio
         // Call PostAsync => await client.PostAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code **Post Method** for FormUrlEncodedContent (it will be written in the **console**):
+### **Post Method** sample code for FormUrlEncodedContent (it will be written in the **console**):
 ```
         string requestBody = @"{ ""name"" : ""justin"",""requestId"" : 10001026,""amount"":26000 }";
         string requestUri = "api/test";
@@ -89,7 +89,7 @@ If you like this project, learn something or you are using it in your applicatio
         // Call PostAsync => await client.PostAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Post Method** without set the requestUri (it will be written in the **console**):
+### **Post Method** sample code without set the requestUri (it will be written in the **console**):
 ```
         string requestBody = @"{ ""name"" : ""soozan"",""requestId"" : ""10001027"",""amount"":27000 }";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "api/test");
@@ -111,7 +111,39 @@ If you like this project, learn something or you are using it in your applicatio
         // Call PostAsync => await client.PostAsync(httpRequestMessage.RequestUri?.ToString(), httpRequest.Content);
 ```
 
-### Sample code for **Post Method** (it will be written in the **file**):
+### **Post Method** sample code for xml (it will be written in the **console**):
+
+```
+  public void GenerateCurl_For_PostMethod()
+    {
+        string requestBody = @"<?xml version = ""1.0"" encoding = ""UTF-8""?>
+            <Order>
+            <Id>12</Id>
+            <name>Jason</name>
+            <requestId>10001024</requestId>
+            <amount>240000</amount>
+            </Order>";
+
+        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "api/test");
+        httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
+        httpRequestMessage.Headers.Add("Authorization", Guid.NewGuid().ToString());
+
+        using var httpClient = new HttpClient();
+        httpClient.BaseAddress = new Uri("http://localhost:1213");
+
+        httpClient.GenerateCurlInConsole(
+            httpRequestMessage,
+            config: config =>
+            {
+                config.TurnOn = true;
+                config.NeedAddDefaultHeaders = true;
+                config.EnableCodeBeautification = false;
+            });
+
+      // Call PostAsync => await client.PostAsync(requestUri, httpRequest.Content);
+```
+
+### **Post Method** sample code (it will be written in the **file**):
 
 If the path variable is null or empty, then the file is created in the **root project**.
 
@@ -142,7 +174,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call PostAsync => await client.PostAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Get Method** (it will be written in the **console**):
+### **Get Method** sample code (it will be written in the **console**):
 ```
         string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
@@ -165,7 +197,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call GetAsync => await client.GetAsync(requestUri);
 ```
 
-### Sample code for **Get Method** (it will be written in the **file**):
+### **Get Method** sample code (it will be written in the **file**):
 
 If the path variable is null or empty, then the file is created in the **root project**.
 
@@ -195,7 +227,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call GetAsync => await client.GetAsync(requestUri);
 ```
 
-### Sample code for **Put Method** (it will be written in the **console**):
+### **Put Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{ ""name"" : ""jadi"",""requestId"" : ""10001003"",""amount"":30000 }";
         string requestUri = "api/test";
@@ -219,7 +251,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call PutAsync => await client.PutAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Put Method** (it will be written in the **file**):
+### **Put Method** sample code (it will be written in the **file**):
 
 If the path variable is null or empty, then the file is created in the **root project**.
 
@@ -250,7 +282,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call PutAsync => await client.PutAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Patch Method** (it will be written in the **console**):
+### **Patch Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{ ""name"" : ""hamed"",""requestId"" : ""10001005"",""amount"":50000 }";
         string requestUri = "api/test";
@@ -274,7 +306,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call PatchAsync => await client.PatchAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Patch Method** (it will be written in the **file**):
+### **Patch Method** sample code (it will be written in the **file**):
 
 If the path variable is null or empty, then the file is created in the **root project**.
 
@@ -305,7 +337,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call PatchAsync => await client.PatchAsync(requestUri, httpRequest.Content);
 ```
 
-### Sample code for **Delete Method** (it will be written in the **console**):
+### **Delete Method** sample code (it will be written in the **console**):
 ```
         int id = 12;
         string requestUri = $"api/test/{id}";
@@ -329,7 +361,7 @@ If the filename variable is null or empty, then the current date will be set for
         // Call DeleteAsync => await client.DeleteAsync(requestUri);
 ```
 
-### Sample code for **Delete Method** (it will be written in the **file**):
+### **Delete Method** sample code (it will be written in the **file**):
 
 If the path variable is null or empty, then the file is created in the **root project**.
 
@@ -360,4 +392,6 @@ If the filename variable is null or empty, then the current date will be set for
         // Call DeleteAsync => await client.DeleteAsync(requestUri);
 ```
 
-I Hope Enjoying this extension in your projects.
+**You can see more samples in UnitTest files in Project.**
+
+I hope enjoying this extension in your projects.

src/HttpClientToCurl/Builder.cs

@@ -22,8 +22,7 @@ internal static StringBuilder Initialize(HttpMethod httpMethod)
                 .Append(httpMethod.Method);
         }
 
-        return stringBuilder
-            .Append(' ');
+        return stringBuilder.Append(' ');
     }
 
     internal static StringBuilder AddAbsoluteUrl(this StringBuilder stringBuilder, string baseUrl, string requestUri)
@@ -100,10 +99,10 @@ internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpC
 
     internal static StringBuilder AddBody(this StringBuilder stringBuilder, HttpContent content)
     {
-        string contentType = content.Headers.ContentType?.MediaType;
-        string body = content.ReadAsStringAsync().GetAwaiter().GetResult();
+        string contentType = content?.Headers?.ContentType?.MediaType;
+        string body = content?.ReadAsStringAsync().GetAwaiter().GetResult();
 
-        if (!_IsValidBody(body, contentType))
+        if (content is not null && !_IsValidBody(body, contentType))
             throw new JsonException($"exception in parsing body {contentType}!");
 
         if (contentType == "application/x-www-form-urlencoded")

src/HttpClientToCurl/HttpClientToCurl.csproj

@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <Authors>Amin Golmahalleh</Authors>
-        <Version>1.8.5</Version>
-        <PackageReleaseNotes>1.8.5</PackageReleaseNotes>
+        <Version>1.8.6</Version>
+        <PackageReleaseNotes>1.8.6</PackageReleaseNotes>
         <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>

src/HttpClientToCurlGeneratorTest/UnitTest/MediaTypes/Json/SuccessCurlGeneratorTests.cs

@@ -11,19 +11,12 @@ public class SuccessCurlGeneratorTests
     #region :: GenerateCurl_For_PostMethod ::
 
     [Theory]
-    public void GenerateCurl_With_QueryString_For_PostMethod()
+    public void GenerateCurl_For_PostMethods()
     {
         // Arrange
-        string requestBody = @"{ ""name"" : ""amin"",""requestId"" : 10001000,""amount"":10000 }";
-
-        var queryString = new Dictionary<string, string>()
-        {
-            { "id", "12" }
-        };
-        var requestUri = QueryHelpers.AddQueryString("api/test", queryString);
+        var requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
-        httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json);
-        httpRequestMessage.Headers.Add("Authorization", "4797c126-3f8a-454a-aff1-96c0220dae61");
+        httpRequestMessage.Headers.Add("Authorization", "56bfa7a0-0541-4d71-9efc-8b28219ac31a");
 
         using var httpClient = new HttpClient();
         httpClient.BaseAddress = new Uri("http://localhost:1213");
@@ -41,11 +34,11 @@ public void GenerateCurl_With_QueryString_For_PostMethod()
         Assert.That(script, Does.StartWith("curl -X POST"));
         Assert.That(script?.Trim(),
             Is.EqualTo(
-                @"curl -X POST http://localhost:1213/api/test?id=12 -H 'Authorization: 4797c126-3f8a-454a-aff1-96c0220dae61' -H 'Content-Type: application/json; charset=utf-8' -d '{ ""name"" : ""amin"",""requestId"" : 10001000,""amount"":10000 }'"));
+                @"curl -X POST http://localhost:1213/api/test -H 'Authorization: 56bfa7a0-0541-4d71-9efc-8b28219ac31a' -d ''"));
     }
-
+    
     [Theory]
-    public void GenerateCurl_Without_QueryString_For_PostMethod()
+    public void GenerateCurl_For_PostMethod()
     {
         // Arrange
         string requestBody = @"{ ""name"" : ""sara"",""requestId"" : 10001001,""amount"":20000 }";
@@ -74,6 +67,40 @@ public void GenerateCurl_Without_QueryString_For_PostMethod()
                 @"curl -X POST http://localhost:1213/api/test -H 'Authorization: 4797c126-3f8a-454a-aff1-96c0220dae61' -H 'Content-Type: application/json; charset=utf-8' -d '{ ""name"" : ""sara"",""requestId"" : 10001001,""amount"":20000 }'"));
     }
 
+    [Theory]
+    public void GenerateCurl_With_QueryString_For_PostMethod()
+    {
+        // Arrange
+        string requestBody = @"{ ""name"" : ""amin"",""requestId"" : 10001000,""amount"":10000 }";
+
+        var queryString = new Dictionary<string, string>()
+        {
+            { "id", "12" }
+        };
+        var requestUri = QueryHelpers.AddQueryString("api/test", queryString);
+        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
+        httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json);
+        httpRequestMessage.Headers.Add("Authorization", "4797c126-3f8a-454a-aff1-96c0220dae61");
+
+        using var httpClient = new HttpClient();
+        httpClient.BaseAddress = new Uri("http://localhost:1213");
+
+        // Act
+        string script = Generator.GenerateCurl(
+            httpClient,
+            httpRequestMessage,
+            requestUri,
+            true);
+
+        // Assert
+        Assert.That(script, Is.Not.Null);
+        Assert.That(script, Is.Not.Empty);
+        Assert.That(script, Does.StartWith("curl -X POST"));
+        Assert.That(script?.Trim(),
+            Is.EqualTo(
+                @"curl -X POST http://localhost:1213/api/test?id=12 -H 'Authorization: 4797c126-3f8a-454a-aff1-96c0220dae61' -H 'Content-Type: application/json; charset=utf-8' -d '{ ""name"" : ""amin"",""requestId"" : 10001000,""amount"":10000 }'"));
+    }
+
     [Theory]
     public void GenerateCurl_Without_RequestUri_For_PostMethod()
     {
@@ -142,14 +169,11 @@ public void GenerateCurl_UrlEncoded_For_PostMethod()
     #region :: GenerateCurl_For_GetMethod ::
 
     [Theory]
-    public void GenerateCurl_With_QueryString_For_GetMethod()
+    public void GenerateCurl_For_GetMethod()
     {
         // Arrange
-        var queryString = new Dictionary<string, string>()
-        {
-            { "id", "12" }
-        };
-        var requestUri = QueryHelpers.AddQueryString("api/test", queryString);
+
+        var requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json);
         httpRequestMessage.Headers.Add("Authorization", "703438f3-16ad-4ba5-b923-8f72cd0f2db9");
@@ -169,15 +193,18 @@ public void GenerateCurl_With_QueryString_For_GetMethod()
         Assert.That(script, Is.Not.Empty);
         Assert.That(script, Does.StartWith("curl"));
         Assert.That(script?.Trim(),
-            Is.EqualTo(@"curl http://localhost:1213/api/test?id=12 -H 'Authorization: 703438f3-16ad-4ba5-b923-8f72cd0f2db9' -H 'Content-Type: application/json; charset=utf-8'"));
+            Is.EqualTo(@"curl http://localhost:1213/api/test -H 'Authorization: 703438f3-16ad-4ba5-b923-8f72cd0f2db9' -H 'Content-Type: application/json; charset=utf-8'"));
     }
-
+    
     [Theory]
-    public void GenerateCurl_Without_QueryString_For_GetMethod()
+    public void GenerateCurl_With_QueryString_For_GetMethod()
     {
         // Arrange
-
-        var requestUri = "api/test";
+        var queryString = new Dictionary<string, string>()
+        {
+            { "id", "12" }
+        };
+        var requestUri = QueryHelpers.AddQueryString("api/test", queryString);
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json);
         httpRequestMessage.Headers.Add("Authorization", "703438f3-16ad-4ba5-b923-8f72cd0f2db9");
@@ -197,7 +224,7 @@ public void GenerateCurl_Without_QueryString_For_GetMethod()
         Assert.That(script, Is.Not.Empty);
         Assert.That(script, Does.StartWith("curl"));
         Assert.That(script?.Trim(),
-            Is.EqualTo(@"curl http://localhost:1213/api/test -H 'Authorization: 703438f3-16ad-4ba5-b923-8f72cd0f2db9' -H 'Content-Type: application/json; charset=utf-8'"));
+            Is.EqualTo(@"curl http://localhost:1213/api/test?id=12 -H 'Authorization: 703438f3-16ad-4ba5-b923-8f72cd0f2db9' -H 'Content-Type: application/json; charset=utf-8'"));
     }
 
     #endregion