Merge pull request #10 from amingolmahalle/fix/managing-url

Fix/managing url

Author: amingolmahalle

README.md

@@ -62,13 +62,13 @@ If you like this project, learn something or you are using it in your applicatio
 ### **Post Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{""name"":""amin"",""requestId"":""10001000"",""amount"":10000}";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -85,7 +85,7 @@ If you like this project, learn something or you are using it in your applicatio
 ### **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";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
          httpRequestMessage.Content = new FormUrlEncodedContent(new[]
         {
@@ -95,7 +95,7 @@ If you like this project, learn something or you are using it in your applicatio
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -120,12 +120,12 @@ If you like this project, learn something or you are using it in your applicatio
             <amount>240000</amount>
             </Order>";
 
-        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "/api/test");
+        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "api/test");
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -148,13 +148,13 @@ If the filename variable is null or empty, then the current date will be set for
         string path = string.Empty;
         string filename = "PostMethodResult" ;
         string requestBody = @"{""name"":""sara"",""requestId"":""10001001"",""amount"":20000}";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInFile(
             httpRequestMessage,
@@ -171,13 +171,13 @@ If the filename variable is null or empty, then the current date will be set for
 
 ### **Get Method** sample code (it will be written in the **console**):
 ```
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -199,13 +199,13 @@ If the filename variable is null or empty, then the current date will be set for
 ```
         string path = string.Empty;
         string filename = "GetMethodResult";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInFile(
             httpRequestMessage,
@@ -223,13 +223,13 @@ If the filename variable is null or empty, then the current date will be set for
 ### **Put Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{""name"":""jadi"",""requestId"":""10001003"",""amount"":30000}";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Put, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -252,13 +252,13 @@ If the filename variable is null or empty, then the current date will be set for
         string path = string.Empty;
         string filename = "PutMethodResult" ;
         string requestBody = @"{ ""name"" : ""reza"",""requestId"" : ""10001004"",""amount"":40000 }";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Put, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInFile(
             httpRequestMessage,
@@ -276,13 +276,13 @@ If the filename variable is null or empty, then the current date will be set for
 ### **Patch Method** sample code (it will be written in the **console**):
 ```
         string requestBody = @"{""name"":""hamed"",""requestId"":""10001005"",""amount"":50000}";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Patch, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -305,13 +305,13 @@ If the filename variable is null or empty, then the current date will be set for
         string path = string.Empty;
         string filename = "PatchMethodResult" ;
         string requestBody = @"{ ""name"" : ""zara"",""requestId"" : ""10001006"",""amount"":60000 }";
-        string requestUri = "/api/test";
+        string requestUri = "api/test";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Patch, requestUri);
         httpRequestMessage.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInFile(
             httpRequestMessage,
@@ -329,13 +329,13 @@ If the filename variable is null or empty, then the current date will be set for
 ### **Delete Method** sample code (it will be written in the **console**):
 ```
         int id = 12;
-        string requestUri = $"/api/test/{id}";
+        string requestUri = $"api/test/{id}";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInConsole(
             httpRequestMessage,
@@ -358,13 +358,13 @@ If the filename variable is null or empty, then the current date will be set for
         string path = string.Empty;
         string filename = "DeleteMethodResult";
         int id = 12;
-        string requestUri = $"/api/test/{id}";
+        string requestUri = $"api/test/{id}";
         var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
         httpRequestMessage.Content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
         httpRequestMessage.Headers.Add("Authorization", $"Bearer {Guid.NewGuid().ToString()}");
 
         using var httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri("http://localhost:1213/v1");
+        httpClient.BaseAddress = new Uri("http://localhost:1213/v1/");
 
         httpClient.GenerateCurlInFile(
             httpRequestMessage,

src/HttpClientToCurl/Builder.cs

@@ -1,7 +1,5 @@
 using System.Net;
 using System.Text;
-using System.Text.Json;
-using System.Web;
 using HttpClientToCurl.Utility;
 
 namespace HttpClientToCurl;
@@ -24,58 +22,29 @@ internal static StringBuilder Initialize(HttpMethod httpMethod)
         return stringBuilder.Append(' ');
     }
 
-    internal static StringBuilder AddAbsoluteUrl(this StringBuilder stringBuilder, string baseUrl, string requestUri)
+    internal static StringBuilder AddAbsoluteUrl(this StringBuilder stringBuilder, string inputBaseAddress, Uri inputRequestUri)
     {
-        bool hasSlashEndOfBaseUrl = false;
-        bool hasSlashFirstOfRequestUri = false;
-        string splitterUrl = string.Empty;
-
-        string inputBaseUrl = baseUrl?.Trim();
-        if (!string.IsNullOrWhiteSpace(inputBaseUrl))
-        {
-            if (inputBaseUrl.EndsWith('/'))
-                hasSlashEndOfBaseUrl = true;
-
-            string inputRequestUri = requestUri?.Trim();
-            if (!string.IsNullOrWhiteSpace(inputRequestUri))
-            {
-                if (inputRequestUri.StartsWith('/'))
-                    hasSlashFirstOfRequestUri = true;
-
-                string warningMessage = CheckAndAddWarningMessageForIncorrectSlash(hasSlashEndOfBaseUrl, hasSlashFirstOfRequestUri, out splitterUrl);
-                if (!string.IsNullOrEmpty(warningMessage))
-                {
-                    stringBuilder
-                        .Insert(0, warningMessage)
-                        .Insert(warningMessage.Length, Environment.NewLine);
-                }
-            }
-
-            if (hasSlashEndOfBaseUrl && (string.IsNullOrEmpty(inputRequestUri) || hasSlashFirstOfRequestUri))
-                inputBaseUrl = inputBaseUrl.Remove(inputBaseUrl.Length - 1);
-
-            return stringBuilder
-                .Append($"{inputBaseUrl}{splitterUrl}{inputRequestUri}")
-                .Append(' ');
-        }
-
-        throw new InvalidDataException("baseUrl argument is null or empty!");
-
-        string CheckAndAddWarningMessageForIncorrectSlash(bool hasOnBaseUrl, bool hasOnRequestUri, out string splitter)
-        {
-            string message = string.Empty;
-            splitter = string.Empty;
-
-            if (hasOnBaseUrl && hasOnRequestUri)
-                message = "# Warning: you must remove the Slash at the end of base url or at the first of the requestUri.";
-            else if (!hasOnBaseUrl && !hasOnRequestUri)
-            {
-                splitter = "/";
-                message = "# Warning: you must add the Slash at the end of base url or at the first of the requestUri.";
-            }
+        string requestUri;
+        Uri baseAddressUri = Helpers.CreateUri(inputBaseAddress);
+        bool baseAddressIsAbsoluteUri = Helpers.CheckAddressIsAbsoluteUri(baseAddressUri);
+        bool requestUriIsAbsoluteUri = Helpers.CheckAddressIsAbsoluteUri(inputRequestUri);
+
+        if (inputRequestUri is null && baseAddressUri is not null && baseAddressIsAbsoluteUri)
+            requestUri = baseAddressUri.ToString();
+        else if (baseAddressUri is null && inputRequestUri is not null && requestUriIsAbsoluteUri)
+            requestUri = inputRequestUri.ToString();
+        else if (baseAddressUri is not null && inputRequestUri is not null && baseAddressIsAbsoluteUri && !requestUriIsAbsoluteUri)
+            requestUri = new Uri(baseAddressUri, inputRequestUri).ToString();
+        else if (baseAddressUri is not null && inputRequestUri is not null && baseAddressIsAbsoluteUri)
+            requestUri = inputRequestUri.ToString();
+        else if (baseAddressUri is null && inputRequestUri is null)
+            requestUri = null;
+        else
+            requestUri = $"{baseAddressUri}{inputRequestUri}";
 
-            return message;
-        }
+        return stringBuilder
+            .Append($"{requestUri}")
+            .Append(' ');
     }
 
     internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpClient httpClient, HttpRequestMessage httpRequestMessage, bool needAddDefaultHeaders = true)
@@ -112,7 +81,7 @@ internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpC
             hasHeader = true;
         }
 
-        if (httpRequestMessage.Content != null && httpRequestMessage.Content.Headers.Any())
+        if (httpRequestMessage.Content is not null && httpRequestMessage.Content.Headers.Any())
         {
             foreach (var header in httpRequestMessage.Content.Headers.Where(h => h.Key != HttpRequestHeader.ContentLength.ToString()))
             {
@@ -137,36 +106,11 @@ 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 && !string.IsNullOrWhiteSpace(body) && !Helpers.IsValidBody(body, contentType))
-            throw new JsonException($"exception in parsing request body {contentType}!{Environment.NewLine}request body:{Environment.NewLine}{body}");
-
         if (contentType == "application/x-www-form-urlencoded")
-            _AddFormUrlEncodedContentBody(stringBuilder, body);
+            stringBuilder.AddFormUrlEncodedContentBody(body);
         else
-            _AppendBodyItem(stringBuilder, body);
+            stringBuilder.AppendBodyItem(body);
 
         return stringBuilder;
     }
-
-    private static void _AddFormUrlEncodedContentBody(StringBuilder stringBuilder, string body)
-    {
-        string decodedBody = HttpUtility.UrlDecode(body);
-        string[] splitBodyArray = decodedBody.Split('&');
-        if (splitBodyArray.Any())
-        {
-            foreach (string item in splitBodyArray)
-            {
-                _AppendBodyItem(stringBuilder, item);
-            }
-        }
-    }
-
-    private static void _AppendBodyItem(StringBuilder stringBuilder, object body)
-        => stringBuilder
-            .Append("-d")
-            .Append(' ')
-            .Append('\'')
-            .Append(body)
-            .Append('\'')
-            .Append(' ');
 }