Refactor form data and MIME handling

Author: zotanmew

src/Todoist.Net/IAdvancedTodoistClient.cs

@@ -88,15 +88,17 @@ Task<T> PostFormAsync<T>(
         /// </summary>
         /// <typeparam name="T">The result type.</typeparam>
         /// <param name="resource">The resource.</param>
-        /// <param name="data">The form data.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// <param name="files">The files.</param>
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <returns>
         /// The result.
         /// </returns>
         /// <exception cref="HttpRequestException">API exception.</exception>
         Task<T> PostFormAsync<T>(
             string resource,
-            MultipartFormDataContent data,
+            ICollection<KeyValuePair<string, string>> parameters,
+            IEnumerable<FormFile> files,
             CancellationToken cancellationToken = default);
 
         /// <summary>

src/Todoist.Net/Models/FormFile.cs

@@ -0,0 +1,16 @@
+namespace Todoist.Net.Models
+{
+    internal class FormFile
+    {
+        public FormFile(byte[] content, string filename, string mimeType = null)
+        {
+            Content  = content;
+            Filename = filename;
+            MimeType = mimeType;
+        }
+
+        public byte[] Content;
+        public string Filename;
+        public string MimeType;
+    }
+}

src/Todoist.Net/Services/IUploadService.cs

@@ -40,17 +40,5 @@ public interface IUploadService
         /// <returns>The uploaded file.</returns>
         /// <exception cref="HttpRequestException">API exception.</exception>
         Task<FileAttachment> UploadAsync(string fileName, byte[] fileContent, CancellationToken cancellationToken = default);
-
-
-        /// <summary>
-        /// Uploads a file asynchronous.
-        /// </summary>
-        /// <param name="fileName">Name of the file.</param>
-        /// <param name="fileContent">Content of the file.</param>
-        /// <param name="mimeType">MIME type of the file.</param>
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <returns>The uploaded file.</returns>
-        /// <exception cref="HttpRequestException">API exception.</exception>
-        Task<FileAttachment> UploadAsync(string fileName, string mimeType, byte[] fileContent, CancellationToken cancellationToken = default);
     }
 }

src/Todoist.Net/Services/UploadService.cs

@@ -4,6 +4,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+#if NETSTANDARD2_0
+using Microsoft.AspNetCore.StaticFiles;
+#else
+using System.Web;
+#endif
+
 using Todoist.Net.Models;
 
 namespace Todoist.Net.Services
@@ -16,6 +22,10 @@ internal class UploadService : IUploadService
     {
         private readonly IAdvancedTodoistClient _todoistClient;
 
+        #if NETSTANDARD2_0
+        private static readonly FileExtensionContentTypeProvider MimeProvider = new FileExtensionContentTypeProvider();
+        #endif
+
         internal UploadService(IAdvancedTodoistClient todoistClient)
         {
             _todoistClient = todoistClient;
@@ -45,34 +55,17 @@ public Task<FileAttachment> UploadAsync(
             string fileName, byte[] fileContent, CancellationToken cancellationToken = default
         )
         {
-            var data = new MultipartFormDataContent
-            {
-                {
-                    new ByteArrayContent(fileContent), "file", fileName
-                }
-            };
-
-            return _todoistClient.PostFormAsync<FileAttachment>("uploads/add", data, cancellationToken);
-        }
+#if NETSTANDARD2_0
+            MimeProvider.TryGetContentType(fileName, out var mimeType);
+#else
+            var mimeType = MimeMapping.GetMimeMapping(fileName);
+#endif
 
-        /// <inheritdoc/>
-        public Task<FileAttachment> UploadAsync(
-            string fileName, string mimeType, byte[] fileContent, CancellationToken cancellationToken = default
-        )
-        {
-            var mime = mimeType != null ? MediaTypeHeaderValue.Parse(mimeType) : null;
-            var data = new MultipartFormDataContent
-            {
-                {
-                    new ByteArrayContent(fileContent)
-                    {
-                        Headers = { ContentType = mime }
-                    },
-                    "file", fileName
-                }
-            };
+            var parameters = new Dictionary<string, string>();
+            var file = new FormFile(fileContent, fileName, mimeType);
+            var files = new[] { file };
 
-            return _todoistClient.PostFormAsync<FileAttachment>("uploads/add", data, cancellationToken);
+            return _todoistClient.PostFormAsync<FileAttachment>("uploads/add", parameters, files, cancellationToken);
         }
     }
 }

src/Todoist.Net/Todoist.Net.csproj

@@ -31,6 +31,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Web" />
   </ItemGroup>
 
   <ItemGroup>
@@ -46,6 +47,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
   </ItemGroup>
 
 </Project>

src/Todoist.Net/TodoistClient.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -301,9 +302,24 @@ Task<T> IAdvancedTodoistClient.PostFormAsync<T>(
         /// <inheritdoc/>
         Task<T> IAdvancedTodoistClient.PostFormAsync<T>(
             string resource,
-            MultipartFormDataContent data,
+            ICollection<KeyValuePair<string, string>> parameters,
+            IEnumerable<FormFile> files,
             CancellationToken cancellationToken)
         {
+            var data = new MultipartFormDataContent();
+
+            foreach (var file in files)
+            {
+                var mime    = file.MimeType != null ? MediaTypeHeaderValue.Parse(file.MimeType) : null;
+                var content = new ByteArrayContent(file.Content) { Headers = { ContentType = mime } };
+                data.Add(content, "file", file.Filename);
+            }
+
+            foreach (var keyValuePair in parameters)
+            {
+                data.Add(new StringContent(keyValuePair.Value), $"\"{keyValuePair.Key}\"");
+            }
+
             return ProcessFormAsync<T>(resource, data, cancellationToken);
         }