Add support for Content-Disposition type inline/attachment

Author: C0nquistadore

shared/Http/ContentDispositionType.cs

@@ -0,0 +1,9 @@
+namespace Dibix.Http
+{
+    public enum ContentDispositionType
+    {
+        None,
+        Inline,
+        Attachment
+    }
+}

shared/Http/HttpFileResponseDefinition.cs

@@ -3,10 +3,12 @@
     public sealed class HttpFileResponseDefinition
     {
         public bool Cache { get; }
+        public ContentDispositionType DispositionType { get; }
 
-        public HttpFileResponseDefinition(bool cache)
+        public HttpFileResponseDefinition(bool cache, ContentDispositionType dispositionType)
         {
             Cache = cache;
+            DispositionType = dispositionType;
         }
     }
 }

src/Dibix.Http.Host/ModelContextProtocol/McpServerPostConfigureOptions.cs

@@ -221,8 +221,9 @@ public AIFunctionWrapper(AIFunction innerFunction, EndpointDefinition endpoint)
             }
         }
 
-        private sealed class McpResponseDelegator : HttpActionInvokerBase, IHttpActionDelegator, IHttpResponseFormatter<HttpRequestDescriptor>
+        private sealed class McpResponseDelegator : HttpActionInvokerBase, IHttpActionDelegator
         {
+            private static readonly McpResponseFormatter McpResponseFormatter = new McpResponseFormatter();
             private readonly IControllerActivator _controllerActivator;
             private readonly IParameterDependencyResolver _parameterDependencyResolver;
             private readonly AIFunctionArguments _arguments;
@@ -240,11 +241,14 @@ public async Task Delegate(HttpContext httpContext, IDictionary<string, object>
             {
                 EndpointDefinition endpointDefinition = httpContext.GetEndpointDefinition();
                 HttpActionDefinition actionDefinition = endpointDefinition.ActionDefinition;
-                object result = await Invoke(actionDefinition, new HttpRequestDescriptor(httpContext.Request), this, arguments, _controllerActivator, _parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
+                object result = await Invoke(actionDefinition, new HttpRequestDescriptor(httpContext.Request), McpResponseFormatter, arguments, _controllerActivator, _parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
                 _arguments.Add(ResultKey, result);
             }
+        }
 
-            public Task<object> Format(object result, HttpRequestDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken)
+        private sealed class McpResponseFormatter : HttpResponseFormatter<HttpRequestDescriptor>
+        {
+            public override Task<object> Format(object result, HttpRequestDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken)
             {
                 return Task.FromResult(result);
             }

src/Dibix.Http.Host/Runtime/HttpActionDelegator.cs

@@ -22,7 +22,7 @@ public async Task Delegate(HttpContext httpContext, IDictionary<string, object>
         {
             EndpointDefinition endpointDefinition = httpContext.GetEndpointDefinition();
             HttpActionDefinition actionDefinition = endpointDefinition.ActionDefinition;
-            IHttpResponseFormatter<HttpRequestDescriptor> responseFormatter = new HttpResponseFormatter(httpContext.Response);
+            HttpResponseFormatter<HttpRequestDescriptor> responseFormatter = new HttpResponseFormatter(httpContext.Response);
             _ = await Invoke(actionDefinition, new HttpRequestDescriptor(httpContext.Request), responseFormatter, arguments, _controllerActivator, _parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
         }
     }

src/Dibix.Http.Host/Runtime/HttpResponseFormatter.cs

@@ -6,11 +6,10 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Headers;
 using Microsoft.Net.Http.Headers;
-using HttpResponse = Microsoft.AspNetCore.Http.HttpResponse;
 
 namespace Dibix.Http.Host
 {
-    internal sealed class HttpResponseFormatter : IHttpResponseFormatter<HttpRequestDescriptor>
+    internal sealed class HttpResponseFormatter : HttpResponseFormatter<HttpRequestDescriptor>
     {
         private readonly HttpResponse _response;
 
@@ -19,11 +18,11 @@ public HttpResponseFormatter(HttpResponse response)
             _response = response;
         }
 
-        public async Task<object?> Format(object? result, HttpRequestDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken)
+        public override async Task<object?> Format(object? result, HttpRequestDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken)
         {
             if (action.FileResponse != null)
             {
-                await WriteFileResponse(result, action, cancellationToken).ConfigureAwait(false);
+                await WriteFileResponse(result, action.FileResponse, cancellationToken).ConfigureAwait(false);
             }
             else
             {
@@ -33,7 +32,7 @@ public HttpResponseFormatter(HttpResponse response)
             return null;
         }
 
-        private async Task WriteFileResponse(object? result, HttpActionDefinition action, CancellationToken cancellationToken)
+        private async Task WriteFileResponse(object? result, HttpFileResponseDefinition fileResponse, CancellationToken cancellationToken)
         {
             FileEntity? file = (FileEntity?)result;
             if (file == null)
@@ -46,9 +45,9 @@ private async Task WriteFileResponse(object? result, HttpActionDefinition action
 
             ResponseHeaders responseHeaders = _response.GetTypedHeaders();
             responseHeaders.ContentType = new MediaTypeHeaderValue(mediaType);
-            responseHeaders.ContentDisposition = new ContentDispositionHeaderValue("inline") { FileName = file.FileName };
+            responseHeaders.ContentDisposition = new ContentDispositionHeaderValue(GetContentDispositionType(fileResponse.DispositionType)) { FileName = file.FileName };
 
-            if (action.FileResponse.Cache)
+            if (fileResponse.Cache)
             {
                 DateTime now = DateTime.Now;
                 TimeSpan year = now.AddYears(1) - now;

src/Dibix.Http.Server.AspNet/HttpActionInvoker.cs

@@ -11,7 +11,7 @@ public class HttpActionInvoker : HttpActionInvokerBase
         // Uses custom exception handling
         public static async Task<object> Invoke(HttpActionDefinition action, HttpRequestMessage request, IDictionary<string, object> arguments, IControllerActivator controllerActivator, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken)
         {
-            IHttpResponseFormatter<HttpRequestMessageDescriptor> responseFormatter = new HttpResponseMessageFormatter();
+            HttpResponseFormatter<HttpRequestMessageDescriptor> responseFormatter = new HttpResponseMessageFormatter();
             return await Invoke(action, new HttpRequestMessageDescriptor(request), responseFormatter, arguments, controllerActivator, parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
         }
     }

src/Dibix.Http.Server.AspNet/HttpResponseMessageFormatter.cs

@@ -7,21 +7,21 @@
 
 namespace Dibix.Http.Server.AspNet
 {
-    internal sealed class HttpResponseMessageFormatter : IHttpResponseFormatter<HttpRequestMessageDescriptor>
+    internal sealed class HttpResponseMessageFormatter : HttpResponseFormatter<HttpRequestMessageDescriptor>
     {
-        public Task<object> Format(object result, HttpRequestMessageDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken) => Task.FromResult(FormatSync(result, request, action));
+        public override Task<object> Format(object result, HttpRequestMessageDescriptor request, HttpActionDefinition action, CancellationToken cancellationToken) => Task.FromResult(FormatSync(result, request, action));
 
         private static object FormatSync(object result, HttpRequestMessageDescriptor request, HttpActionDefinition action)
         {
             if (action.FileResponse != null)
             {
-                return CreateFileResponse(result, request, action);
+                return CreateFileResponse(result, request, action.FileResponse);
             }
 
             return result;
         }
 
-        private static object CreateFileResponse(object result, HttpRequestMessageDescriptor request, HttpActionDefinition action)
+        private static object CreateFileResponse(object result, HttpRequestMessageDescriptor request, HttpFileResponseDefinition fileResponse)
         {
             FileEntity file = (FileEntity)result;
             if (file == null)
@@ -32,9 +32,9 @@ private static object CreateFileResponse(object result, HttpRequestMessageDescri
             HttpResponseMessage response = request.RequestMessage.CreateResponse();
             response.Content = new ByteArrayContent(file.Data);
             response.Content.Headers.ContentType = new MediaTypeHeaderValue(mediaType);
-            response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("inline") { FileName = file.FileName };
+            response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue(GetContentDispositionType(fileResponse.DispositionType)) { FileName = file.FileName };
 
-            if (action.FileResponse.Cache)
+            if (fileResponse.Cache)
             {
                 DateTime now = DateTime.Now;
                 TimeSpan year = now.AddYears(1) - now;

src/Dibix.Http.Server/Dibix.Http.Server.csproj

@@ -9,6 +9,7 @@
     <Compile Include="..\..\shared\Diagnostics\SourceLocation.cs" Link="Diagnostics\%(Filename)%(Extension)" />
     <Compile Include="..\..\shared\Extensions\EnumerableExtensions.cs" Link="Extensions\%(Filename)%(Extension)" />
     <Compile Include="..\..\shared\Extensions\ReflectionExtensions.cs" Link="Extensions\%(Filename)%(Extension)" />
+    <Compile Include="..\..\shared\Http\ContentDispositionType.cs" Link="Model\%(Filename)%(Extension)" />
     <Compile Include="..\..\shared\Http\HttpApiMethod.cs" Link="Model\%(Filename)%(Extension)" />
     <Compile Include="..\..\shared\Http\HttpErrorResponse.cs" Link="Runtime\%(Filename)%(Extension)" />
     <Compile Include="..\..\shared\Http\HttpErrorResponseUtility.cs" Link="Runtime\%(Filename)%(Extension)" />

src/Dibix.Http.Server/Runtime/HttpActionInvokerBase.cs

@@ -7,7 +7,7 @@ namespace Dibix.Http.Server
 {
     public abstract class HttpActionInvokerBase
     {
-        protected static async Task<object> Invoke<TRequest>(HttpActionDefinition action, TRequest request, IHttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IControllerActivator controllerActivator, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
+        protected static async Task<object> Invoke<TRequest>(HttpActionDefinition action, TRequest request, HttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IControllerActivator controllerActivator, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
         {
             try
             {
@@ -28,7 +28,7 @@ protected static async Task<object> Invoke<TRequest>(HttpActionDefinition action
             }
         }
 
-        private static async Task<object> InvokeCore<TRequest>(HttpActionDefinition action, TRequest request, IHttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IControllerActivator controllerActivator, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
+        private static async Task<object> InvokeCore<TRequest>(HttpActionDefinition action, TRequest request, HttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IControllerActivator controllerActivator, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
         {
             if (action.Authorization.Any())
             {

src/Dibix.Http.Server/Runtime/IHttpResponseFormatter.cs

@@ -1,10 +1,18 @@
-using System.Threading;
+using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Dibix.Http.Server
 {
-    public interface IHttpResponseFormatter<in TRequest> where TRequest : IHttpRequestDescriptor
+    public abstract class HttpResponseFormatter<TRequest> where TRequest : IHttpRequestDescriptor
     {
-        Task<object> Format(object result, TRequest request, HttpActionDefinition action, CancellationToken cancellationToken);
+        public abstract Task<object> Format(object result, TRequest request, HttpActionDefinition action, CancellationToken cancellationToken);
+
+        protected static string GetContentDispositionType(ContentDispositionType dispositionType) => dispositionType switch
+        {
+            ContentDispositionType.Inline => "inline",
+            ContentDispositionType.Attachment => "attachment",
+            _ => throw new ArgumentOutOfRangeException(nameof(dispositionType), dispositionType, null)
+        };
     }
 }