From 09b4a5b0daeb50b8838430f6651b07977cdcfd65 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Thu, 3 Jan 2019 16:24:29 +0300
Subject: [PATCH] Add mime type: application/x-www-form-urlencoded and use
 constants.

---
 .../Client/DynamicProxying/DynamicHttpProxyInterceptor.cs  | 4 ++--
 .../Http/Client/DynamicProxying/RequestPayloadBuilder.cs   | 4 ++--
 framework/src/Volo.Abp.Http/Volo/Abp/Http/MimeTypes.cs     | 1 +
 .../Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs      | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index f70c5f40c3..b84c8c087c 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -174,8 +174,8 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             if (!apiVersion.Version.IsNullOrEmpty())
             {
                 //TODO: What about other media types?
-                requestMessage.Headers.Add("accept", $"text/plain; v={apiVersion.Version}");
-                requestMessage.Headers.Add("accept", $"application/json; v={apiVersion.Version}");
+                requestMessage.Headers.Add("accept", $"{MimeTypes.Text.Plain}; v={apiVersion.Version}");
+                requestMessage.Headers.Add("accept", $"{MimeTypes.Application.Json}; v={apiVersion.Version}");
                 requestMessage.Headers.Add("api-version", apiVersion.Version);
             }
 
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs
index 8f5fbd0c39..afc5f9e4f0 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/RequestPayloadBuilder.cs
@@ -17,13 +17,13 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             var body = GenerateBody(action, methodArguments, jsonSerializer);
             if (body != null)
             {
-                return new StringContent(body, Encoding.UTF8, "application/json"); //TODO: application/json to a constant
+                return new StringContent(body, Encoding.UTF8, MimeTypes.Application.Json);
             }
 
             body = GenerateFormPostData(action, methodArguments);
             if (body != null)
             {
-                return new StringContent(body, Encoding.UTF8, "application/x-www-form-urlencoded"); //TODO: application/x-www-form-urlencoded to a constant
+                return new StringContent(body, Encoding.UTF8, MimeTypes.Application.XWwwFormUrlencoded);
             }
 
             return null;
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/MimeTypes.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/MimeTypes.cs
index 850a070c8f..a4768a6af1 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/MimeTypes.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/MimeTypes.cs
@@ -32,6 +32,7 @@ namespace Volo.Abp.Http
             public const string XPkcs12 = "application/x-pkcs12";
             public const string XShockwaveFlash = "application/x-shockwave-flash";
             public const string XSilverlightApp = "application/x-silverlight-app";
+            public const string XWwwFormUrlencoded = "application/x-www-form-urlencoded";
             public const string XhtmlXml = "application/xhtml+xml";
             public const string Xml = "application/xml";
             public const string XmlDtd = "application/xml-dtd";
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs
index 031a6d6c89..8bf86a3ace 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using Volo.Abp.Http;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Json;
 using Volo.Abp.TestApp.Application.Dto;
@@ -66,7 +67,7 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             var response = await Client.PostAsync(
                 "/api/app/people",
-                new StringContent(postData, Encoding.UTF8, "application/json")
+                new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json)
             );
 
             response.StatusCode.ShouldBe(HttpStatusCode.OK);
@@ -98,7 +99,7 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             var response = await Client.PutAsync(
                 $"/api/app/people/{updateDto.Id}",
-                new StringContent(putData, Encoding.UTF8, "application/json")
+                new StringContent(putData, Encoding.UTF8, MimeTypes.Application.Json)
             );
 
             response.StatusCode.ShouldBe(HttpStatusCode.OK);
@@ -131,7 +132,7 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             var response = await Client.PostAsync(
                 $"/api/app/people/{personToAddNewPhone.Id}/phones",
-                new StringContent(postData, Encoding.UTF8, "application/json")
+                new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json)
             );
 
             response.StatusCode.ShouldBe(HttpStatusCode.OK);