#10472 csharp-netcore client - allow to specify content-type for files (

#10473)
OpenAPITools · Sep 26, 2021 · 60b29e1 · 60b29e1
1 parent 1193700
commit 60b29e1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/...enapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/...enapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
@@ -279,7 +279,7 @@ namespace {{packageName}}.Client
                 foreach (var fileParam in options.FileParameters)
                 {
                     var content = new StreamContent(fileParam.Value.Content);
-                    content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+                    content.Headers.ContentType = new MediaTypeHeaderValue(fileParam.Value.ContentType);
                     multipartContent.Add(content, fileParam.Key,
                         fileParam.Value.Name);
                 }

diff --git a/...i-generator/src/main/resources/csharp-netcore/libraries/httpclient/FileParameter.mustache b/...i-generator/src/main/resources/csharp-netcore/libraries/httpclient/FileParameter.mustache
@@ -15,6 +15,11 @@ namespace {{packageName}}.Client
         /// </summary>
         public string Name { get; set; } = "no_name_provided";
 
+        /// <summary>
+        /// The content type of the file
+        /// </summary>
+        public string ContentType { get; set; } = "application/octet-stream";
+
         /// <summary>
         /// The content of the file
         /// </summary>
@@ -44,6 +49,19 @@ namespace {{packageName}}.Client
             Content = content;
         }
 
+        /// <summary>
+        /// Construct a FileParameter from name and content
+        /// </summary>
+        /// <param name="filename">The filename</param>
+        /// <param name="contentType">The content type of the file</param>
+        /// <param name="content">The file content</param>
+        public FileParameter(string filename, string contentType, Stream content)
+        {
+            Name = filename;
+            ContentType = contentType;
+            Content = content;
+        }
+
         /// <summary>
         /// Implicit conversion of stream to file parameter. Useful for backwards compatibility.
         /// </summary>

diff --git a/...petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/...petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -278,7 +278,7 @@ HttpContent PrepareMultipartFormDataContent(RequestOptions options)
                 foreach (var fileParam in options.FileParameters)
                 {
                     var content = new StreamContent(fileParam.Value.Content);
-                    content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+                    content.Headers.ContentType = new MediaTypeHeaderValue(fileParam.Value.ContentType);
                     multipartContent.Add(content, fileParam.Key,
                         fileParam.Value.Name);
                 }

diff --git a/...tore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs b/...tore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs
@@ -23,6 +23,11 @@ public class FileParameter
         /// </summary>
         public string Name { get; set; } = "no_name_provided";
 
+        /// <summary>
+        /// The content type of the file
+        /// </summary>
+        public string ContentType { get; set; } = "application/octet-stream";
+
         /// <summary>
         /// The content of the file
         /// </summary>
@@ -52,6 +57,19 @@ public FileParameter(string filename, Stream content)
             Content = content;
         }
 
+        /// <summary>
+        /// Construct a FileParameter from name and content
+        /// </summary>
+        /// <param name="filename">The filename</param>
+        /// <param name="contentType">The content type of the file</param>
+        /// <param name="content">The file content</param>
+        public FileParameter(string filename, string contentType, Stream content)
+        {
+            Name = filename;
+            ContentType = contentType;
+            Content = content;
+        }
+
         /// <summary>
         /// Implicit conversion of stream to file parameter. Useful for backwards compatibility.
         /// </summary>