Merge branch 'kendallb-feature/http-client-issue-1814' into dev

alexeyzimarev · alexeyzimarev · commit d3e133472ccd · 2022-06-07T14:06:06.000+02:00
diff --git a/src/RestSharp/Request/RequestContent.cs b/src/RestSharp/Request/RequestContent.cs
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Net;
 using System.Net.Http.Headers;
 using System.Runtime.Serialization;
 using RestSharp.Extensions;
 using static RestSharp.KnownHeaders;
+
 // ReSharper disable InvertIf
 // ReSharper disable SuggestBaseTypeForParameter
 
@@ -26,8 +28,6 @@ class RequestContent : IDisposable {
     readonly RestRequest  _request;
     readonly List<Stream> _streams = new();
 
-    
-
     HttpContent? Content { get; set; }
 
     public RequestContent(RestClient client, RestRequest request) {
@@ -55,8 +55,7 @@ void AddFiles() {
             _streams.Add(stream);
             var fileContent = new StreamContent(stream);
 
-            if (file.ContentType != null)
-                fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(file.ContentType);
+            if (file.ContentType != null) fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(file.ContentType);
 
             fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data") {
                 Name     = $"\"{file.Name}\"",
@@ -97,8 +96,7 @@ HttpContent GetSerialized() {
 
             var content = serializer.Serialize(body);
 
-            if (content == null)
-                throw new SerializationException("Request body serialized to null");
+            if (content == null) throw new SerializationException("Request body serialized to null");
 
             return new StringContent(
                 content,
@@ -150,20 +148,33 @@ void AddPostParameters(ParametersCollection? postParameters) {
             // we got the multipart form already instantiated, just add parameters to it
             foreach (var postParameter in postParameters!) {
                 var parameterName = postParameter.Name!;
+
                 mpContent.Add(
                     new StringContent(postParameter.Value!.ToString()!, _client.Options.Encoding, postParameter.ContentType),
                     _request.MultipartFormQuoteParameters ? $"\"{parameterName}\"" : parameterName
                 );
             }
         }
         else {
-            // we should not have anything else except the parameters, so we send them as form URL encoded
+#if NETCORE
+            // We should not have anything else except the parameters, so we send them as form URL encoded.
             var formContent = new FormUrlEncodedContent(
                 _request.Parameters
                     .Where(x => x.Type == ParameterType.GetOrPost)
                     .Select(x => new KeyValuePair<string, string>(x.Name!, x.Value!.ToString()!))!
             );
             Content = formContent;
+#else
+            // However due to bugs in HttpClient FormUrlEncodedContent (see https://github.com/restsharp/RestSharp/issues/1814) we
+            // do the encoding ourselves using WebUtility.UrlEncode instead.
+            var formData = _request.Parameters
+                .Where(x => x.Type == ParameterType.GetOrPost)
+                .Select(x => new KeyValuePair<string, string>(x.Name!, x.Value!.ToString()!))!;
+            var encodedItems   = formData.Select(i => $"{WebUtility.UrlEncode(i.Key)}={WebUtility.UrlEncode(i.Value)}" /*.Replace("%20", "+")*/);
+            var encodedContent = new StringContent(string.Join("&", encodedItems), null, "application/x-www-form-urlencoded");
+            
+            Content = encodedContent;
+#endif
         }
     }
 
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <IsTestProject>true</IsTestProject>
         <IsPackable>false</IsPackable>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net472;net6.0</TargetFrameworks>
         <Nullable>disable</Nullable>
     </PropertyGroup>
 
@@ -17,6 +17,9 @@
         <PackageReference Include="AutoFixture" Version="4.17.0"/>
         <PackageReference Include="FluentAssertions" Version="6.7.0"/>
     </ItemGroup>
+    <ItemGroup Condition="$(TargetFramework) == 'net472'">
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" PrivateAssets="All"/>
+    </ItemGroup>
 
     <ItemGroup>
         <Using Include="Xunit"/>
diff --git a/test/RestSharp.InteractiveTests/RestSharp.InteractiveTests.csproj b/test/RestSharp.InteractiveTests/RestSharp.InteractiveTests.csproj
@@ -2,6 +2,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <IsTestProject>false</IsTestProject>
+        <TargetFrameworks>net6</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\RestSharp\RestSharp.csproj" />
diff --git a/test/RestSharp.Tests.Integrated/PostTests.cs b/test/RestSharp.Tests.Integrated/PostTests.cs
@@ -1,3 +1,4 @@
+using System.Net;
 using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated;
@@ -14,23 +15,39 @@ public async Task Should_post_json() {
         var request  = new RestRequest("post/json").AddJsonBody(body);
         var response = await _client.ExecutePostAsync<TestResponse>(request);
 
-        response.Data.Message.Should().Be(body.Data);
+        response!.Data!.Message.Should().Be(body.Data);
     }
-    
+
     [Fact]
     public async Task Should_post_json_with_PostAsync() {
         var body     = new TestRequest("foo", 100);
         var request  = new RestRequest("post/json").AddJsonBody(body);
         var response = await _client.PostAsync<TestResponse>(request);
 
-        response.Message.Should().Be(body.Data);
+        response!.Message.Should().Be(body.Data);
     }
-    
+
     [Fact]
     public async Task Should_post_json_with_PostJsonAsync() {
         var body     = new TestRequest("foo", 100);
         var response = await _client.PostJsonAsync<TestRequest, TestResponse>("post/json", body);
 
-        response.Message.Should().Be(body.Data);
+        response!.Message.Should().Be(body.Data);
+    }
+
+    [Fact]
+    public async Task Should_post_large_form_data() {
+        const int length = 1024 * 1024;
+
+        var superLongString = new string('?', length);
+        var request         = new RestRequest("post/form", Method.Post).AddParameter("big_string", superLongString);
+        var response        = await _client.ExecuteAsync<Response>(request);
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        response.Data!.Message.Should().Be($"Works! Length: {length}");
+    }
+
+    class Response {
+        public string Message { get; set; }
     }
 }
diff --git a/test/RestSharp.Tests.Integrated/RestSharp.Tests.Integrated.csproj b/test/RestSharp.Tests.Integrated/RestSharp.Tests.Integrated.csproj
@@ -1,6 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Nullable>disable</Nullable>
+        <TargetFrameworks>net6</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\RestSharp.Serializers.Xml\RestSharp.Serializers.Xml.csproj" />
diff --git a/test/RestSharp.Tests.Integrated/Server/TestServer.cs b/test/RestSharp.Tests.Integrated/Server/TestServer.cs
@@ -53,6 +53,7 @@ public HttpServer(ITestOutputHelper output = null) {
         
         // POST
         _app.MapPost("/post/json", (TestRequest request) => new TestResponse { Message = request.Data });
+        _app.MapPost("/post/form", (HttpContext context) => new TestResponse { Message               = $"Works! Length: {context.Request.Form["big_string"].ToString().Length}" });
 
         IResult HandleHeaders(HttpContext ctx) {
             var response = ctx.Request.Headers.Select(x => new TestServerResponse(x.Key, x.Value));
diff --git a/test/RestSharp.Tests.Legacy/RestSharp.Tests.Legacy.csproj b/test/RestSharp.Tests.Legacy/RestSharp.Tests.Legacy.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net48</TargetFramework>
+        <TargetFramework>net472</TargetFramework>
         <Nullable>disable</Nullable>
     </PropertyGroup>
     <ItemGroup>
diff --git a/test/RestSharp.Tests.Serializers.Xml/RestSharp.Tests.Serializers.Xml.csproj b/test/RestSharp.Tests.Serializers.Xml/RestSharp.Tests.Serializers.Xml.csproj
@@ -11,7 +11,7 @@
         <None Update="SampleData\boolean_from_string.xml" CopyToOutputDirectory="PreserveNewest" />
         <None Update="SampleData\deserialize_as_list.xml" CopyToOutputDirectory="PreserveNewest" />
         <None Update="SampleData\directlists.xml" CopyToOutputDirectory="PreserveNewest" />
-        <None Update="SampleData\eventful.xml" CopyToOutputDirectory="PreserveNewest" />
+        <None Update="SampleData\eventful.xml" CopyToOutputDirectory="Always" />
         <None Update="SampleData\Goodreads.xml" CopyToOutputDirectory="PreserveNewest" />
         <None Update="SampleData\GoodreadsFormatError.xml" CopyToOutputDirectory="PreserveNewest" />
         <None Update="SampleData\GoogleWeather.xml" CopyToOutputDirectory="PreserveNewest" />
diff --git a/test/RestSharp.Tests.Serializers.Xml/XmlAttributeDeserializerTests.cs b/test/RestSharp.Tests.Serializers.Xml/XmlAttributeDeserializerTests.cs
@@ -3,15 +3,25 @@
 using RestSharp.Serializers.Xml;
 using RestSharp.Tests.Serializers.Xml.SampleClasses;
 
-namespace RestSharp.Tests.Serializers.Xml; 
+namespace RestSharp.Tests.Serializers.Xml;
 
 public class XmlAttributeDeserializerTests {
+    readonly ITestOutputHelper _output;
+
     const string GuidString = "AC1FC4BC-087A-4242-B8EE-C53EBE9887A5";
 
+    #if NETCORE
     readonly string _sampleDataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SampleData");
+    #else
+    readonly string _sampleDataPath = Path.Combine(Directory.GetCurrentDirectory(), "SampleData");
+    #endif
 
     string PathFor(string sampleFile) => Path.Combine(_sampleDataPath, sampleFile);
 
+    public XmlAttributeDeserializerTests(ITestOutputHelper output) {
+        _output = output;
+    }
+
     [Fact]
     public void Can_Deserialize_Lists_of_Simple_Types() {
         var xmlPath = PathFor("xmllists.xml");
@@ -24,7 +34,7 @@ public void Can_Deserialize_Lists_of_Simple_Types() {
 
         Assert.NotEmpty(output.Numbers);
         Assert.False(output.Names[0].Length == 0);
-        Assert.False(output.Numbers.Sum() == 0);
+        Assert.False(output.Numbers.Sum()   == 0);
     }
 
     [Fact]
@@ -572,7 +582,7 @@ static string CreateUnderscoresXml() {
             friends.Add(
                 new XElement(
                     "Friend",
-                    new XElement("Name", "Friend" + i),
+                    new XElement("Name", "Friend"             + i),
                     new XAttribute("Since", DateTime.Now.Year - i)
                 )
             );
@@ -621,7 +631,7 @@ static string CreateLowercaseUnderscoresXml() {
             friends.Add(
                 new XElement(
                     "Friend",
-                    new XElement("Name", "Friend" + i),
+                    new XElement("Name", "Friend"             + i),
                     new XAttribute("Since", DateTime.Now.Year - i)
                 )
             );
@@ -670,7 +680,7 @@ static string CreateDashesXml() {
             friends.Add(
                 new XElement(
                     "Friend",
-                    new XElement("Name", "Friend" + i),
+                    new XElement("Name", "Friend"             + i),
                     new XAttribute("Since", DateTime.Now.Year - i)
                 )
             );
@@ -738,7 +748,7 @@ static string CreateElementsXml() {
             friends.Add(
                 new XElement(
                     "Friend",
-                    new XElement("Name", "Friend" + i),
+                    new XElement("Name", "Friend"           + i),
                     new XElement("Since", DateTime.Now.Year - i)
                 )
             );
@@ -870,4 +880,4 @@ static string CreateXmlWithAttributesAndNullValuesAndPopulatedValues() {
 
         return doc.ToString();
     }
-}
+}
diff --git a/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs b/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs
@@ -9,7 +9,11 @@ namespace RestSharp.Tests.Serializers.Xml;
 public class XmlDeserializerTests {
     const string GuidString = "AC1FC4BC-087A-4242-B8EE-C53EBE9887A5";
 
+    #if NETCORE
     readonly string _sampleDataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SampleData");
+    #else
+    readonly string _sampleDataPath = Path.Combine(Directory.GetCurrentDirectory(), "SampleData");
+    #endif
 
     string PathFor(string sampleFile) => Path.Combine(_sampleDataPath, sampleFile);
 
