From 56cb3e247fb552decc1161bf94c798b10c164962 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Wed, 30 Jul 2025 17:00:03 +0200
Subject: [PATCH] fix(GlobalExceptionHandlerMiddleware): add await

---
 .../DigitalData.Core.Exceptions.Middleware.csproj           | 4 ++++
 .../GlobalExceptionHandlerMiddleware.cs                     | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
index 9d46974..9feae0a 100644
--- a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
+++ b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
@@ -38,6 +38,10 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DigitalData.Core.Exceptions\DigitalData.Core.Exceptions.csproj" />
diff --git a/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs b/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs
index 4f73279..c592d65 100644
--- a/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs
+++ b/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs
@@ -42,11 +42,11 @@ public class GlobalExceptionHandlerMiddleware
         }
         catch (Exception ex)
         {
-            if(ex.GetType() == typeof(Exception))
-                _options?.DefaultHandler?.HandleExceptionAsync.Invoke(context, ex, _logger);
+            if(ex.GetType() == typeof(Exception) && _options?.DefaultHandler is not null)
+                await _options.DefaultHandler.HandleExceptionAsync(context, ex, _logger);
 
             if (_options?.Handlers.TryGetValue(ex.GetType(), out var handler) ?? false)
-                handler?.HandleExceptionAsync.Invoke(context, ex, _logger);
+                await handler.HandleExceptionAsync(context, ex, _logger);
         }
     }
 }