Added FileName to IFormFile

Author: khellang

src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs

@@ -20,6 +20,8 @@ public interface IFormFile
 
         string Name { get; }
 
+        string FileName { get; }
+
         Stream OpenReadStream();
     }
 }

src/Microsoft.AspNet.Http/Features/FormFeature.cs

@@ -149,9 +149,7 @@ private async Task<IFormCollection> InnerReadFormAsync(CancellationToken cancell
                             // Find the end
                             await section.Body.DrainAsync(cancellationToken);
 
-                            var name = HeaderUtilities.RemoveQuotes(contentDisposition.Name);
-
-                            var file = new FormFile(_request.Body, section.BaseStreamOffset.Value, section.Body.Length, name)
+                            var file = new FormFile(_request.Body, section.BaseStreamOffset.Value, section.Body.Length, contentDisposition)
                             {
                                 Headers = new HeaderDictionary(section.Headers),
                             };

src/Microsoft.AspNet.Http/Features/FormFile.cs

@@ -3,6 +3,8 @@
 
 using System.IO;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.Net.Http.Headers;
+using static Microsoft.Net.Http.Headers.HeaderUtilities;
 
 namespace Microsoft.AspNet.Http.Features.Internal
 {
@@ -11,12 +13,13 @@ public class FormFile : IFormFile
         private readonly Stream _baseStream;
         private readonly long _baseStreamOffset;
 
-        public FormFile(Stream baseStream, long baseStreamOffset, long length, string name)
+        public FormFile(Stream baseStream, long baseStreamOffset, long length, ContentDispositionHeaderValue contentDisposition)
         {
             _baseStream = baseStream;
             _baseStreamOffset = baseStreamOffset;
             Length = length;
-            Name = name;
+            Name = RemoveQuotes(contentDisposition.Name) ?? string.Empty;
+            FileName = RemoveQuotes(contentDisposition.FileName) ?? string.Empty;
         }
 
         public string ContentDisposition
@@ -37,6 +40,8 @@ public string ContentType
 
         public string Name { get; }
 
+        public string FileName { get; }
+
         public Stream OpenReadStream()
         {
             return new ReferenceReadStream(_baseStream, _baseStreamOffset, Length);

test/Microsoft.AspNet.Http.Tests/FormFeatureTests.cs

@@ -216,6 +216,7 @@ public async Task ReadFormAsync_MultipartWithFile_ReturnsParsedFormCollection()
 
             var file = formCollection.Files["myfile1"];
             Assert.Equal("myfile1", file.Name);
+            Assert.Equal("temp.html", file.FileName);
             Assert.Equal("text/html", file.ContentType);
             Assert.Equal(@"form-data; name=""myfile1""; filename=""temp.html""", file.ContentDisposition);
             var body = file.OpenReadStream();