Restore declarative status code response functionality

Author: C0nquistadore

src/Dibix.Http.Host/Program.cs

@@ -68,7 +68,7 @@ void ConfigureLogging(ILoggingBuilder logging)
                     .AddTransient<IPostConfigureOptions<JsonOptions>, JsonPostConfigureOptions>()
                     .AddSingleton<IControllerActivator, NotSupportedControllerActivator>();
 
-            services.AddExceptionHandler<DatabaseAccessExceptionHandler>();
+            services.AddExceptionHandler<HttpRequestExecutionExceptionHandler>();
             services.AddProblemDetailsWithMapping()
                     .Map<HttpRequestExecutionException>(x => x.IsClientError, (x, y) =>
                     {

…untime/DatabaseAccessExceptionHandler.cs …/HttpRequestExecutionExceptionHandler.cssrc/Dibix.Http.Host/Runtime/DatabaseAccessExceptionHandler.cs renamed to src/Dibix.Http.Host/Runtime/HttpRequestExecutionExceptionHandler.cs src/Dibix.Http.Host/Runtime/DatabaseAccessExceptionHandler.cs renamed to src/Dibix.Http.Host/Runtime/HttpRequestExecutionExceptionHandler.cs

@@ -8,13 +8,12 @@
 
 namespace Dibix.Http.Host
 {
-    // Map sql error codes to http status codes globally
-    // This is needed if a DatabaseAccessException is thrown outside HttpActionInvoker. For example, within the http host extension.
-    internal sealed class DatabaseAccessExceptionHandler : IExceptionHandler
+    // Map custom HTTP status codes to response
+    internal sealed class HttpRequestExecutionExceptionHandler : IExceptionHandler
     {
         private readonly IProblemDetailsService _problemDetailsService;
 
-        public DatabaseAccessExceptionHandler(IProblemDetailsService problemDetailsService)
+        public HttpRequestExecutionExceptionHandler(IProblemDetailsService problemDetailsService)
         {
             _problemDetailsService = problemDetailsService;
         }
@@ -25,27 +24,21 @@ public DatabaseAccessExceptionHandler(IProblemDetailsService problemDetailsServi
         // See: https://www.milanjovanovic.tech/blog/problem-details-for-aspnetcore-apis#handling-specific-exceptions-status-codes
         private async ValueTask<bool> TryHandleWithProblemDetails(HttpContext httpContext, Exception exception)
         {
-            bool result = TryHandle(httpContext, exception, out HttpRequestExecutionException? httpRequestExecutionException);
+            bool result = TryHandle(httpContext, exception);
             if (!result)
                 return false;
 
             ProblemDetailsContext problemDetailsContext = new ProblemDetailsContext
             {
                 HttpContext = httpContext,
-                Exception = httpRequestExecutionException
+                Exception = exception
             };
             return await _problemDetailsService.TryWriteAsync(problemDetailsContext).ConfigureAwait(false);
         }
 
-        private static bool TryHandle(HttpContext httpContext, Exception exception, out HttpRequestExecutionException? httpRequestExecutionException)
+        private static bool TryHandle(HttpContext httpContext, Exception exception)
         {
-            if (exception is not DatabaseAccessException databaseAccessException)
-            {
-                httpRequestExecutionException = null;
-                return false;
-            }
-
-            if (!SqlHttpStatusCodeParser.TryParse(databaseAccessException, out httpRequestExecutionException))
+            if (exception is not HttpRequestExecutionException httpRequestExecutionException)
                 return false;
 
             httpContext.Response.StatusCode = (int)httpRequestExecutionException.StatusCode;

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

@@ -12,23 +12,7 @@ public class HttpActionInvoker : HttpActionInvokerBase
         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();
-            try
-            {
-                return await Invoke(action, new HttpRequestMessageDescriptor(request), responseFormatter, arguments, controllerActivator, parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
-            }
-            catch (DatabaseAccessException exception)
-            {
-                // Sample:
-                // THROW 404017, N'Feature not configured', 1
-                // 404017 => 404 17 => HttpStatusCode.NotFound (ResultCode: 17) - ResultCode can be a more specific application/feature error code
-                // 
-                // HTTP/1.1 404 NotFound
-                // X-Result-Code: 17
-                if (SqlHttpStatusCodeParser.TryParse(exception, action, arguments, out HttpRequestExecutionException httpException))
-                    throw httpException;
-
-                throw;
-            }
+            return await Invoke(action, new HttpRequestMessageDescriptor(request), responseFormatter, arguments, controllerActivator, parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
         }
     }
 }

…Http.Server/Runtime/HttpActionInvoker.cs ….Server/Runtime/HttpActionInvokerBase.cssrc/Dibix.Http.Server/Runtime/HttpActionInvoker.cs renamed to src/Dibix.Http.Server/Runtime/HttpActionInvokerBase.cs src/Dibix.Http.Server/Runtime/HttpActionInvoker.cs renamed to src/Dibix.Http.Server/Runtime/HttpActionInvokerBase.cs

@@ -8,6 +8,27 @@ 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
+        {
+            try
+            {
+                return await InvokeCore(action, request, responseFormatter, arguments, controllerActivator, parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
+            }
+            catch (DatabaseAccessException exception)
+            {
+                // Sample:
+                // THROW 404017, N'Feature not configured', 1
+                // 404017 => 404 17 => HttpStatusCode.NotFound (ResultCode: 17) - ResultCode can be a more specific application/feature error code
+                // 
+                // HTTP/1.1 404 NotFound
+                // X-Result-Code: 17
+                if (SqlHttpStatusCodeParser.TryParse(exception, action, arguments, out HttpRequestExecutionException httpException))
+                    throw httpException;
+
+                throw;
+            }
+        }
+        
+        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
         {
             if (action.Authorization.Any())
             {

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

@@ -12,11 +12,11 @@ public static bool TryParse(DatabaseAccessException databaseAccessException, out
         {
             return TryParse(databaseAccessException, action: null, arguments: new Dictionary<string, object>(), out httpException);
         }
-        public static bool TryParse(DatabaseAccessException databaseAccessException, HttpActionDefinition action, IDictionary<string, object> arguments, out HttpRequestExecutionException httpException)
+        internal static bool TryParse(DatabaseAccessException databaseAccessException, HttpActionDefinition action, IDictionary<string, object> arguments, out HttpRequestExecutionException httpException)
         {
             return TryParse(databaseAccessException, databaseAccessException.InnerException as SqlException, action, arguments, out httpException);
         }
-        private  static bool TryParse(DatabaseAccessException originalException, SqlException rootException, HttpActionDefinition action, IDictionary<string, object> arguments, out HttpRequestExecutionException httpException)
+        private static bool TryParse(DatabaseAccessException originalException, SqlException rootException, HttpActionDefinition action, IDictionary<string, object> arguments, out HttpRequestExecutionException httpException)
         {
             if (rootException != null && HttpErrorResponseUtility.TryParseErrorResponse(rootException.Number, out int statusCode, out int errorCode, out bool isClientError))
             {

tests/Dibix.Http.Server.Tests/HttpActionInvokerTest.cs

@@ -102,7 +102,7 @@ public async Task Invoke_DDL_WithHttpClientError_ProducedByAuthorizationBehavior
                 await Execute(action, request.Object, responseFormatter.Object, new KeyValuePair<string, object>("context", httpAuthorizationBehaviorContext)).ConfigureAwait(false);
                 Assert.Fail($"{nameof(HttpRequestExecutionException)} was expected but not thrown");
             }
-            catch (DatabaseAccessException databaseAccessException) when (SqlHttpStatusCodeParser.TryParse(databaseAccessException, action, new Dictionary<string, object>(), out HttpRequestExecutionException requestException))
+            catch (HttpRequestExecutionException requestException)
             {
                 Assert.AreEqual("FirstAuthorizationTargetCalled", httpAuthorizationBehaviorContext.Result);
                 requestException.AppendToResponse(response.Object);