Fix DI in ErrorsMiddlewarte (#18)

Co-authored-by: Artem Leshchev <[email protected]>
Luxoft · Jul 8, 2024 · 4730032 · 4730032
1 parent 3d498c1
commit 4730032
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/Bss.Platform.Api.Middlewares/ErrorsMiddleware.cs b/src/Bss.Platform.Api.Middlewares/ErrorsMiddleware.cs
@@ -4,14 +4,13 @@
 using Bss.Platform.Api.Middlewares.Interfaces;
 
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Bss.Platform.Api.Middlewares;
 
-public class ErrorsMiddleware(RequestDelegate next, ILogger<ErrorsMiddleware> logger, IServiceProvider serviceProvider)
+public class ErrorsMiddleware(RequestDelegate next)
 {
-    public async Task Invoke(HttpContext context)
+    public async Task InvokeAsync(HttpContext context, ILogger<ErrorsMiddleware> logger, IStatusCodeResolver? statusCodeResolver)
     {
         try
         {
@@ -21,16 +20,15 @@ public async Task Invoke(HttpContext context)
         {
             logger.LogError(e, "Request failed");
 
-            await this.HandleExceptionAsync(context, e);
+            await HandleExceptionAsync(context, e, statusCodeResolver);
         }
     }
 
-    private Task HandleExceptionAsync(HttpContext context, Exception exception)
+    private static async Task HandleExceptionAsync(HttpContext context, Exception exception, IStatusCodeResolver? statusCodeResolver)
     {
         context.Response.ContentType = MediaTypeNames.Text.Plain;
-        context.Response.StatusCode =
-            (int)(serviceProvider.GetService<IStatusCodeResolver>()?.Resolve(exception) ?? HttpStatusCode.InternalServerError);
+        context.Response.StatusCode = (int)(statusCodeResolver?.Resolve(exception) ?? HttpStatusCode.InternalServerError);
 
-        return context.Response.WriteAsync(exception.GetBaseException().Message);
+        await context.Response.WriteAsync(exception.GetBaseException().Message, context.RequestAborted);
     }
 }
diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -4,9 +4,9 @@
 [assembly: AssemblyCompany("Luxoft")]
 [assembly: AssemblyCopyright("Copyright © Luxoft 2024")]
 
-[assembly: AssemblyVersion("1.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
-[assembly: AssemblyInformationalVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.5.4.0")]
+[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyInformationalVersion("1.5.4.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]