reactiveui · clairernovotny · Jan 29, 2018 · Jan 29, 2018 · Jan 29, 2018 · bennor
diff --git a/Refit.Tests/InterfaceStubGenerator.cs b/Refit.Tests/InterfaceStubGenerator.cs
@@ -85,7 +85,7 @@ public void GenerateClassInfoForInterfaceSmokeTest()
 
             var result = fixture.GenerateClassInfoForInterface(input);
 
-            Assert.Equal(10, result.MethodList.Count);
+            Assert.Equal(11, result.MethodList.Count);
             Assert.Equal("GetUser", result.MethodList[0].Name);
             Assert.Equal("string userName", result.MethodList[0].ArgumentListWithTypes);
             Assert.Equal("IGitHubApi", result.InterfaceName);

diff --git a/Refit.Tests/RefitStubs.Net46.cs b/Refit.Tests/RefitStubs.Net46.cs
@@ -603,6 +603,9 @@ public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilde
         {
             Client = client;
             methodImpls.Add("Post()", requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] {  }));
+            methodImpls.Add("PostRawStringDefault(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }));
+            methodImpls.Add("PostRawStringJson(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }));
+            methodImpls.Add("PostRawStringUrlEncoded(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }));
         }
 
         /// <inheritdoc />
@@ -612,6 +615,27 @@ public virtual Task Post()
             return (Task) methodImpls["Post()"](Client, arguments);
         }
 
+        /// <inheritdoc />
+        public virtual Task PostRawStringDefault(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringDefault(string str)"](Client, arguments);
+        }
+
+        /// <inheritdoc />
+        public virtual Task PostRawStringJson(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringJson(string str)"](Client, arguments);
+        }
+
+        /// <inheritdoc />
+        public virtual Task PostRawStringUrlEncoded(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringUrlEncoded(string str)"](Client, arguments);
+        }
+
     }
 }
 

diff --git a/Refit.Tests/RefitStubs.NetCore2.cs b/Refit.Tests/RefitStubs.NetCore2.cs
@@ -603,6 +603,9 @@ public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilde
         {
             Client = client;
             methodImpls.Add("Post()", requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] {  }));
+            methodImpls.Add("PostRawStringDefault(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }));
+            methodImpls.Add("PostRawStringJson(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }));
+            methodImpls.Add("PostRawStringUrlEncoded(string str)", requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }));
         }
 
         /// <inheritdoc />
@@ -612,6 +615,27 @@ public virtual Task Post()
             return (Task) methodImpls["Post()"](Client, arguments);
         }
 
+        /// <inheritdoc />
+        public virtual Task PostRawStringDefault(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringDefault(string str)"](Client, arguments);
+        }
+
+        /// <inheritdoc />
+        public virtual Task PostRawStringJson(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringJson(string str)"](Client, arguments);
+        }
+
+        /// <inheritdoc />
+        public virtual Task PostRawStringUrlEncoded(string str)
+        {
+            var arguments = new object[] { str };
+            return (Task) methodImpls["PostRawStringUrlEncoded(string str)"](Client, arguments);
+        }
+
     }
 }
 

diff --git a/Refit.Tests/RequestBuilder.cs b/Refit.Tests/RequestBuilder.cs
@@ -293,7 +293,7 @@ public void ValueTypesDontBlowUp()
             var fixture = new RestMethodInfo(input, input.GetMethods().First(x => x.Name == "OhYeahValueTypes"));
             Assert.Equal("id", fixture.ParameterMap[0]);
             Assert.Empty(fixture.QueryParameterMap);
-            Assert.Equal(BodySerializationMethod.Json, fixture.BodyParameterInfo.Item1);
+            Assert.Equal(BodySerializationMethod.Default, fixture.BodyParameterInfo.Item1);
             Assert.False(fixture.BodyParameterInfo.Item2);
             Assert.Equal(1, fixture.BodyParameterInfo.Item3);
 
@@ -307,7 +307,7 @@ public void StreamMethodPullWorks()
             var fixture = new RestMethodInfo(input, input.GetMethods().First(x => x.Name == "PullStreamMethod"));
             Assert.Equal("id", fixture.ParameterMap[0]);
             Assert.Empty(fixture.QueryParameterMap);
-            Assert.Equal(BodySerializationMethod.Json, fixture.BodyParameterInfo.Item1);
+            Assert.Equal(BodySerializationMethod.Default, fixture.BodyParameterInfo.Item1);
             Assert.True(fixture.BodyParameterInfo.Item2);
             Assert.Equal(1, fixture.BodyParameterInfo.Item3);
 

diff --git a/Refit.Tests/RestService.cs b/Refit.Tests/RestService.cs
@@ -34,6 +34,15 @@ public interface IRequestBin
     {
         [Post("/1h3a5jm1")]
         Task Post();
+
+        [Post("/foo")]
+        Task PostRawStringDefault([Body] string str);
+
+        [Post("/foo")]
+        Task PostRawStringJson([Body(BodySerializationMethod.Json)] string str);
+
+        [Post("/foo")]
+        Task PostRawStringUrlEncoded([Body(BodySerializationMethod.UrlEncoded)] string str);
     }
 
     public interface INoRefitHereBuddy
@@ -463,6 +472,74 @@ public async Task PostToRequestBin()
             mockHttp.VerifyNoOutstandingExpectation();
         }
 
+        [Fact]
+        public async Task PostStringDefaultToRequestBin()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+
+            var settings = new RefitSettings
+            {
+                HttpMessageHandlerFactory = () => mockHttp
+            };
+
+            mockHttp.Expect(HttpMethod.Post, "http://httpbin.org/foo")
+                    .WithContent("raw string")
+                    .Respond(HttpStatusCode.OK);
+
+            var fixture = RestService.For<IRequestBin>("http://httpbin.org/", settings);
+
+
+            await fixture.PostRawStringDefault("raw string");
+
+            mockHttp.VerifyNoOutstandingExpectation();
+        }
+
+        [Fact]
+        public async Task PostStringJsonToRequestBin()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+
+            var settings = new RefitSettings
+            {
+                HttpMessageHandlerFactory = () => mockHttp
+            };
+
+            mockHttp.Expect(HttpMethod.Post, "http://httpbin.org/foo")
+                    .WithContent("\"json string\"")
+                    .WithHeaders("Content-Type", "application/json")
+                    .Respond(HttpStatusCode.OK);
+
+            var fixture = RestService.For<IRequestBin>("http://httpbin.org/", settings);
+
+
+            await fixture.PostRawStringJson("json string");
+
+            mockHttp.VerifyNoOutstandingExpectation();
+        }
+
+        [Fact]
+        public async Task PostStringUrlToRequestBin()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+
+            var settings = new RefitSettings
+            {
+                HttpMessageHandlerFactory = () => mockHttp
+            };
+
+            mockHttp.Expect(HttpMethod.Post, "http://httpbin.org/foo")
+                    .WithContent("url%26string")
+                    .WithHeaders("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
+                    .Respond(HttpStatusCode.OK);
+
+            var fixture = RestService.For<IRequestBin>("http://httpbin.org/", settings);
+
+
+            await fixture.PostRawStringUrlEncoded ("url&string");
+
+            mockHttp.VerifyNoOutstandingExpectation();
+        }
+
         [Fact]
         public async Task CanGetDataOutOfErrorResponses() 
         {

diff --git a/Refit/Attributes.cs b/Refit/Attributes.cs
@@ -95,14 +95,26 @@ public class MultipartAttribute : Attribute { }
 
     public enum BodySerializationMethod
     {
+        /// <summary>
+        /// JSON encodes data except for strings. Strings are set as-is
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Json encodes everything, including strings
+        /// </summary>
         Json,
+
+        /// <summary>
+        /// Form-UrlEncode's the values
+        /// </summary>
         UrlEncoded
     }
 
     [AttributeUsage(AttributeTargets.Parameter)]
     public class BodyAttribute : Attribute
     {
-        public BodyAttribute(BodySerializationMethod serializationMethod = BodySerializationMethod.Json,
+        public BodyAttribute(BodySerializationMethod serializationMethod = BodySerializationMethod.Default,
                              bool buffered = false)
         {
             SerializationMethod = serializationMethod;

diff --git a/Refit/RequestBuilderImplementation.cs b/Refit/RequestBuilderImplementation.cs
@@ -393,18 +393,17 @@ Func<object[], HttpRequestMessage> BuildRequestFactoryForMethod(RestMethodInfo r
                     // if marked as body, add to content
                     if (restMethod.BodyParameterInfo != null && restMethod.BodyParameterInfo.Item3 == i)
                     {
-                        var streamParam = paramList[i] as Stream;
-                        var stringParam = paramList[i] as string;
-
                         if (paramList[i] is HttpContent httpContentParam)
                         {
                             ret.Content = httpContentParam;
                         }
-                        else if (streamParam != null)
+                        else if (paramList[i] is Stream streamParam)
                         {
                             ret.Content = new StreamContent(streamParam);
                         }
-                        else if (stringParam != null)
+                        // Default sends raw strings
+                        else if (restMethod.BodyParameterInfo.Item1 == BodySerializationMethod.Default &&
+                                 paramList[i] is string stringParam)
                         {
                             ret.Content = new StringContent(stringParam);
                         }
@@ -413,8 +412,9 @@ Func<object[], HttpRequestMessage> BuildRequestFactoryForMethod(RestMethodInfo r
                             switch (restMethod.BodyParameterInfo.Item1)
                             {
                                 case BodySerializationMethod.UrlEncoded:
-                                    ret.Content = new FormUrlEncodedContent(new FormValueDictionary(paramList[i], settings));
+                                    ret.Content = paramList[i] is string str ? (HttpContent)new StringContent(Uri.EscapeDataString(str), Encoding.UTF8, "application/x-www-form-urlencoded") :  new FormUrlEncodedContent(new FormValueDictionary(paramList[i], settings));
                                     break;
+                                case BodySerializationMethod.Default:
                                 case BodySerializationMethod.Json:
                                     var param = paramList[i];
                                     switch (restMethod.BodyParameterInfo.Item2)