Merge pull request #2844 from gterdem/pr/2821-Audit_log_midware_update

Audit log can't know if an error ocurred if the exception filter handles it

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
@@ -34,6 +35,10 @@ namespace Volo.Abp.AspNetCore.Auditing
                 try
                 {
                     await next(context);
+                    if (_auditingManager.Current.Log.Exceptions.Any())
+                    {
+                        hasError = true;
+                    }
                 }
                 catch (Exception)
                 {

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs

@@ -26,5 +26,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
         {
             throw new UserFriendlyException("Exception occurred!");
         }
+        [Route("audit-fail-object")]
+        public object AuditFailForGetRequestsReturningObject()
+        {
+            throw new UserFriendlyException("Exception occurred!");
+        }
     }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs

@@ -34,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             _options.IsEnabledForGetRequests = true;
             _options.AlwaysLogOnException = false;
             await GetResponseAsync("api/audit-test/audit-success");
-            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
         }
 
         [Fact]
@@ -49,7 +49,17 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             }
             catch { }
 
-            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
+        }
+        [Fact]
+        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Returns_Object()
+        {
+            _options.IsEnabled = true;
+            _options.AlwaysLogOnException = true;
+
+            await GetResponseAsync("api/audit-test/audit-fail-object", System.Net.HttpStatusCode.Forbidden);
+
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
         }
     }
 }