utf-8 media type header parse fix

Author: gencebay

src/NetCoreStack.Proxy/Binders/BodyContentBinder.cs

@@ -2,6 +2,7 @@
 using NetCoreStack.Contracts;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -27,7 +28,21 @@ protected virtual void AddFile(string key, MultipartFormDataContent multipartFor
             {
                 formFile.CopyTo(ms);
                 var fileContent = new ByteArrayContent(ms.ToArray());
-                fileContent.Headers.ContentType = new MediaTypeHeaderValue(formFile.ContentType) { CharSet = Encoding.UTF8.WebName };
+
+                if (MediaTypeHeaderValue.TryParse(formFile.ContentType, out MediaTypeHeaderValue media))
+                {
+                    if (media.CharSet == null)
+                    {
+                        media.CharSet = Encoding.UTF8.WebName;
+                    }
+
+                    fileContent.Headers.ContentType = media;
+                }
+                else
+                {
+                    // TODO  Log
+                }
+                
                 fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue(formData)
                 {
                     Name = formFile.Name,

test/NetCoreStack.Proxy.Mvc.Hosting/SampleĞüişçWord.docx

@@ -29,6 +29,9 @@
     <None Update="ObjFile.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="SampleĞüişçWord.docx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj

@@ -159,14 +159,31 @@ public async Task GetSingleFileWithKeyTemplate()
             Assert.True(true);
         }
 
+        [Fact]
+        public async Task GetSingleFileWithKeyTemplateAndUtf8()
+        {
+            var proxy = Resolver.GetService<IFileProxyApi>();
+
+            await proxy.UploadAsync(new FileProxyUploadContext
+            {
+                Directory = "5a6ee0791653ff2348f1cd32",
+                Files = new[]
+                {
+                    TestHelper.GetFormFile("files", "SampleĞüişçWord.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document; charset=utf-8")
+                }
+            });
+
+            Assert.True(true);
+        }
+
         [Fact]
         public async Task TaskSingleFileModel()
         {
             var guidelineApi = Resolver.GetService<IGuidelineApi>();
 
             var model = new SingleFileModel
             {
-                File = TestHelper.GetFormFile("file")
+                File = TestHelper.GetFormFile("file", "SampleĞüişçWord.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document; charset=utf-8")
             };
 
             await guidelineApi.TaskSingleFileModel(model);

test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 using Moq;
+using NetCoreStack.Mvc.Helpers;
 using NetCoreStack.Proxy.Test.Contracts;
 using System;
 using System.Collections.Generic;
@@ -112,5 +113,25 @@ public static FormFile GetFormFile(string name, string fileName = "")
 
             return formFile;
         }
+
+        public static FormFile GetFormFile(string name, string fileName, string contentType = null)
+        {
+            var bytes = File.ReadAllBytes(fileName);
+            var length = bytes.Length;
+            var ms = new MemoryStream(bytes);
+
+            contentType = contentType ?? MimeTypeHelper.Resolve(Path.GetExtension(fileName));
+
+            var formFile = new FormFile(ms, 0, length, name, fileName)
+            {
+                Headers = new HeaderDictionary
+                {
+                    [HeaderNames.ContentType] = contentType,
+                    [HeaderNames.ContentDisposition] = $"form-data; name=\"{name}\"; filename=\"{fileName}\""
+                }
+            };
+
+            return formFile;
+        }
     }
 }