Restore custom status code detection message feature

Serviceware · Apr 25, 2024 · 734b775 · 734b775
1 parent e70d31d
commit 734b775
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/Dibix.Http.Host/Runtime/HttpActionDelegator.cs b/src/Dibix.Http.Host/Runtime/HttpActionDelegator.cs
@@ -26,7 +26,7 @@ public async Task Delegate(HttpContext httpContext, IDictionary<string, object>
             IHttpResponseFormatter<HttpRequestDescriptor> responseFormatter = new HttpResponseFormatter(httpContext.Response);
             try
             {
-                _ = await HttpActionInvoker.Invoke(actionDefinition, new HttpRequestDescriptor(httpContext.Request), responseFormatter, arguments, _parameterDependencyResolver, parseSqlHttpStatusCodeExceptions: false, cancellationToken).ConfigureAwait(false);
+                _ = await HttpActionInvoker.Invoke(actionDefinition, new HttpRequestDescriptor(httpContext.Request), responseFormatter, arguments, _parameterDependencyResolver, cancellationToken).ConfigureAwait(false);
             }
             catch (HttpRequestExecutionException httpRequestExecutionException)
             {

diff --git a/src/Dibix.Http.Server/Runtime/HttpActionInvoker.cs b/src/Dibix.Http.Server/Runtime/HttpActionInvoker.cs
@@ -10,9 +10,9 @@ public static class HttpActionInvoker
         public static Task<object> Invoke(HttpActionDefinition action, HttpRequestMessage request, IDictionary<string, object> arguments, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken)
         {
             IHttpResponseFormatter<HttpRequestMessageDescriptor> responseFormatter = new HttpResponseMessageFormatter();
-            return Invoke(action, new HttpRequestMessageDescriptor(request), responseFormatter, arguments, parameterDependencyResolver, parseSqlHttpStatusCodeExceptions: true, cancellationToken);
+            return Invoke(action, new HttpRequestMessageDescriptor(request), responseFormatter, arguments, parameterDependencyResolver, cancellationToken);
         }
-        public static async Task<object> Invoke<TRequest>(HttpActionDefinition action, TRequest request, IHttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IParameterDependencyResolver parameterDependencyResolver, bool parseSqlHttpStatusCodeExceptions, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
+        public static async Task<object> Invoke<TRequest>(HttpActionDefinition action, TRequest request, IHttpResponseFormatter<TRequest> responseFormatter, IDictionary<string, object> arguments, IParameterDependencyResolver parameterDependencyResolver, CancellationToken cancellationToken) where TRequest : IHttpRequestDescriptor
         {
             try
             {
@@ -25,7 +25,7 @@ public static async Task<object> Invoke<TRequest>(HttpActionDefinition action, T
                 object formattedResult = await responseFormatter.Format(result, request, action, cancellationToken).ConfigureAwait(false);
                 return formattedResult;
             }
-            catch (DatabaseAccessException exception) when (parseSqlHttpStatusCodeExceptions)
+            catch (DatabaseAccessException exception)
             {
                 // Sample:
                 // THROW 404017, N'Feature not configured', 1

diff --git a/src/Dibix.Http.Server/Runtime/SqlHttpStatusCodeParser.cs b/src/Dibix.Http.Server/Runtime/SqlHttpStatusCodeParser.cs
@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Data.SqlClient;
+using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 
@@ -30,10 +32,11 @@ private  static bool TryParse(DatabaseAccessException originalException, SqlExce
                     error = userResponse;
 
                 isClientError = HttpErrorResponseUtility.IsClientError(error.StatusCode);
+                IDictionary<string, object> caseInsensitiveArguments = new Dictionary<string, object>(arguments, StringComparer.OrdinalIgnoreCase);
                 string formattedErrorMessage = Regex.Replace(error.ErrorMessage, "{(?<ParameterName>[^}]+)}", x =>
                 {
                     string parameterName = x.Groups["ParameterName"].Value;
-                    return arguments.TryGetValue(parameterName, out object value) ? value?.ToString() : x.Value;
+                    return caseInsensitiveArguments.TryGetValue(parameterName, out object value) ? value?.ToString() : x.Value;
                 });
                 httpException = new HttpRequestExecutionException((HttpStatusCode)error.StatusCode, error.ErrorCode, formattedErrorMessage, isClientError, originalException);
                 return true;

diff --git a/tests/Dibix.Http.Server.Tests/HttpActionInvokerTest.Base.cs b/tests/Dibix.Http.Server.Tests/HttpActionInvokerTest.Base.cs
@@ -53,7 +53,7 @@ private static async Task<object> Execute<TRequest>(HttpActionDefinition action,
             foreach (KeyValuePair<string, object> parameter in parameters)
                 arguments.Add(parameter);
 
-            object result = await HttpActionInvoker.Invoke(action, request, responseFormatter, arguments, parameterDependencyResolver.Object, parseSqlHttpStatusCodeExceptions: true, default).ConfigureAwait(false);
+            object result = await HttpActionInvoker.Invoke(action, request, responseFormatter, arguments, parameterDependencyResolver.Object, default).ConfigureAwait(false);
             return result;
         }