fix error when post method request doesn't body

Author: Amin GolMahaleh

src/HttpClientToCurl/Builder.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Net.Mime;
 using System.Text;
 using System.Web;
 using HttpClientToCurl.Utility;
@@ -51,7 +50,8 @@ internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpC
         bool hasHeader = false;
         if (needAddDefaultHeaders && httpClient.DefaultRequestHeaders.Any())
         {
-            foreach (var header in httpClient.DefaultRequestHeaders.Where(dh => dh.Key != HttpRequestHeader.ContentLength.ToString()))
+            var defaultHeaders = httpClient.DefaultRequestHeaders.Where(dh => dh.Key != HttpRequestHeader.ContentLength.ToString());
+            foreach (var header in defaultHeaders)
             {
                 stringBuilder
                     .Append("-H")
@@ -65,7 +65,8 @@ internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpC
 
         if (httpRequestMessage.Headers.Any())
         {
-            foreach (var header in httpRequestMessage.Headers.Where(h => h.Key != HttpRequestHeader.ContentLength.ToString()))
+            var headers = httpRequestMessage.Headers.Where(h => h.Key != HttpRequestHeader.ContentLength.ToString());
+            foreach (var header in headers)
             {
                 stringBuilder
                     .Append("-H")
@@ -102,7 +103,7 @@ internal static StringBuilder AddBody(this StringBuilder stringBuilder, HttpCont
         string contentType = content?.Headers?.ContentType?.MediaType;
         string body = content?.ReadAsStringAsync().GetAwaiter().GetResult();
 
-        if (content is not null && !_IsValidBody(body, contentType))
+        if (content is not null && !string.IsNullOrWhiteSpace(body) && !Helpers.IsValidBody(body, contentType))
             throw new JsonException($"exception in parsing body {contentType}!");
 
         if (contentType == "application/x-www-form-urlencoded")
@@ -134,16 +135,4 @@ private static void _AppendBodyItem(StringBuilder stringBuilder, object body)
             .Append(body)
             .Append('\'')
             .Append(' ');
-
-    private static bool _IsValidBody(string body, string contentType)
-    {
-        switch (contentType)
-        {
-            case MediaTypeNames.Application.Json when body.IsValidJson() == false:
-            case MediaTypeNames.Text.Xml when body.IsValidXml() == false:
-                return false;
-            default:
-                return true;
-        }
-    }
 }

src/HttpClientToCurl/HttpClientToCurl.csproj

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

src/HttpClientToCurl/Utility/Helpers.cs

@@ -1,4 +1,5 @@
 using System.Net.Http.Headers;
+using System.Net.Mime;
 
 namespace HttpClientToCurl.Utility;
 
@@ -54,4 +55,16 @@ public static HttpRequestMessage FillHttpRequestMessage(HttpMethod httpMethod, H
 
         return httpRequestMessage;
     }
+    
+    public static bool IsValidBody(string body, string contentType)
+    {
+        switch (contentType)
+        {
+            case MediaTypeNames.Application.Json when body.IsValidJson() == false:
+            case MediaTypeNames.Text.Xml when body.IsValidXml() == false:
+                return false;
+            default:
+                return true;
+        }
+    }
 }

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

@@ -11,11 +11,40 @@ public class SuccessCurlGeneratorTests
     #region :: GenerateCurl_For_PostMethod ::
 
     [Theory]
-    public void GenerateCurl_For_PostMethods()
+    public void GenerateCurl_Without_Body_For_PostMethod()
     {
         // Arrange
         var requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
+        httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
+        httpRequestMessage.Headers.Add("Authorization", "c332e9a1-1e0e-44c2-b819-b0e7e8ff7d45");
+
+        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 -H 'Authorization: c332e9a1-1e0e-44c2-b819-b0e7e8ff7d45' -H 'Content-Type: application/json; charset=utf-8' -d ''"));
+    }
+    
+    [Theory]
+    public void GenerateCurl_Without_Content_For_PostMethod()
+    {
+        // Arrange
+        var requestUri = "api/test";
+        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
+        httpRequestMessage.Content = null;
         httpRequestMessage.Headers.Add("Authorization", "56bfa7a0-0541-4d71-9efc-8b28219ac31a");
 
         using var httpClient = new HttpClient();
@@ -67,6 +96,37 @@ public void GenerateCurl_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_ContentLength_For_PostMethod()
+    {
+        // Arrange
+        string requestBody = @"{ ""name"" : ""sara"",""requestId"" : 10001001,""amount"":20000 }";
+
+        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", "f69406a4-6b62-4734-a8dc-158f0fc308ab");
+        httpRequestMessage.Headers.Add("ContentLength", "123");
+
+        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 -H 'Authorization: f69406a4-6b62-4734-a8dc-158f0fc308ab' -H 'Content-Type: application/json; charset=utf-8' -d '{ ""name"" : ""sara"",""requestId"" : 10001001,""amount"":20000 }'"));
+    }
+    
     [Theory]
     public void GenerateCurl_With_QueryString_For_PostMethod()
     {