Support application/json mediaType for file upload endpoints

Author: C0nquistadore

src/Dibix.Sdk.CodeGeneration/Lookup/ActionTargetDefinitionResolver.cs

@@ -229,7 +229,7 @@ private static void CollectAdditionalParameters(ActionRequestBody requestBody, A
             if (requestBody == null)
                 return;
 
-            if (!requestBody.IsStream(out SourceLocation isStreamLocation))
+            if (!requestBody.IsFile(out SourceLocation isStreamLocation))
                 return;
 
             if (requestBody.MediaType == HttpMediaType.Binary && actionTargetDefinition.Parameters.All(x => x.ApiParameterName != SpecialHttpParameterName.MediaType))

src/Dibix.Sdk.CodeGeneration/Model/SchemaExtensions.cs

@@ -29,7 +29,7 @@ bool MatchesOutputFilter(SchemaDefinition schema)
             return schemas;
         }
 
-        public static bool IsStream(this ActionRequestBody requestBody, out SourceLocation location)
+        public static bool IsFile(this ActionRequestBody requestBody, out SourceLocation location)
         {
             if (requestBody.Contract != null && requestBody.Contract.IsStream(out location))
             {

src/Dibix.Sdk.CodeGeneration/Output/ApiClientImplementationWriter.cs

@@ -237,7 +237,7 @@ bool CollectParameter(ApiParameter parameter)
                 writer.Write($"requestMessage.{nameof(HttpRequestMessage.Content)} = new ");
 
                 ActionRequestBody requestBody = action.RequestBody;
-                if (requestBody.IsStream(out _))
+                if (requestBody.IsFile(out _))
                 {
                     writer.WriteRaw($"{nameof(StreamContent)}(body");
                 }
@@ -249,17 +249,15 @@ bool CollectParameter(ApiParameter parameter)
 
                 writer.WriteLineRaw(");");
 
-                if (requestBody.IsStream(out _) && requestBody.MediaType != HttpMediaType.Binary)
-                {
-                    WriteContentType(context, writer, $"\"{requestBody.MediaType}\"");
-                }
+                bool wroteContentType = false;
 
                 foreach (ApiParameter parameter in parameters.Where(x => x.ParameterLocation == ActionParameterLocation.Body))
                 {
                     switch (parameter.ParameterName)
                     {
                         case SpecialHttpParameterName.MediaType:
-                            WriteContentType(context, writer, $"{parameter.ParameterName} ?? \"{HttpMediaType.Binary}\"");
+                            WriteContentType(context, writer, $"{parameter.ParameterName} ?? \"{requestBody.MediaType}\"");
+                            wroteContentType = true;
                             break;
 
                         case SpecialHttpParameterName.FileName:
@@ -268,6 +266,11 @@ bool CollectParameter(ApiParameter parameter)
                             break;
                     }
                 }
+
+                if (!wroteContentType && requestBody.IsFile(out _))
+                {
+                    WriteContentType(context, writer, $"\"{requestBody.MediaType}\"");
+                }
             }
 
             writer.WriteLine($"{nameof(HttpResponseMessage)} responseMessage = await client.{nameof(HttpClient.SendAsync)}(requestMessage, cancellationToken).{nameof(Task.ConfigureAwait)}(false);");

src/Dibix.Sdk.CodeGeneration/Registration/ControllerDefinitionProvider.cs

@@ -285,14 +285,14 @@ private ActionRequestBody ReadBodyValue(SourceLocation bodyPropertyLocation, JOb
             SourceLocation? treatAsFile = value.Property("treatAsFile")?.GetSourceInfo();
             long? maxContentLength = (long?)value.Property("maxContentLength")?.Value;
 
-            if (mediaTypeValue != null && mediaType != HttpMediaType.Json)
-            {
-                SourceLocation mediaTypeLocation = mediaTypeValue.GetSourceInfo();
-                return new ActionRequestBody(ActionDefinitionUtility.CreateStreamTypeReference(mediaTypeLocation), bodyPropertyLocation, mediaType, maxContentLength);
-            }
-
             if (contractName == null)
             {
+                if (mediaTypeValue != null)
+                {
+                    SourceLocation mediaTypeLocation = mediaTypeValue.GetSourceInfo();
+                    return new ActionRequestBody(ActionDefinitionUtility.CreateStreamTypeReference(mediaTypeLocation), bodyPropertyLocation, mediaType, maxContentLength);
+                }
+
                 SourceLocation valueLocation = value.GetSourceInfo();
                 Logger.LogError("Body is missing 'contract' property", valueLocation.Source, valueLocation.Line, valueLocation.Column);
                 return null;

tests/Dibix.Sdk.Tests.Database/Endpoints/GenericEndpoint.json

@@ -133,7 +133,7 @@
       "method": "PUT",
       "target": "File.FileUpload",
       "body": {
-        "mediaType": "application/octet-stream",
+        "mediaType": "application/json",
         "maxContentLength": 104857600 // 100 MB
       },
       "params": {

tests/Dibix.Sdk.Tests/Resources/CodeGeneration/Client.cs

@@ -350,7 +350,7 @@ public async Task<HttpResponseMessage> FileUploadAsync(System.IO.Stream body, st
             HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("PUT"), "Tests/GenericEndpoint");
             requestMessage.Headers.Add("Authorization", $"Bearer {_httpAuthorizationProvider.GetValue("DibixBearer")}");
             requestMessage.Content = new StreamContent(body);
-            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue(mediaType ?? "application/octet-stream");
+            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue(mediaType ?? "application/json");
             requestMessage.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment") { FileName = fileName };
             HttpResponseMessage responseMessage = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
             return responseMessage;
@@ -420,8 +420,8 @@ public async Task<HttpResponseMessage> UploadJsonAsync(System.IO.Stream body, st
             HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("POST"), "Tests/GenericEndpoint/UploadJson");
             requestMessage.Headers.Add("Authorization", $"Bearer {_httpAuthorizationProvider.GetValue("DibixBearer")}");
             requestMessage.Content = new StreamContent(body);
-            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
             requestMessage.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment") { FileName = fileName };
+            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
             HttpResponseMessage responseMessage = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
             return responseMessage;
         }

tests/Dibix.Sdk.Tests/Resources/CodeGeneration/Endpoints_OpenApi.yml

@@ -30,7 +30,7 @@ paths:
       operationId: FileUpload
       requestBody:
         content:
-          application/octet-stream:
+          application/json:
             schema:
               type: string
               format: binary