From 661d975056165cf079d7690f452b1eaaa7a27ff8 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 4 Mar 2022 10:27:43 +0800
Subject: [PATCH] Move `AlwaysLogSelectors` to the top.

---
 .../AspNetCore/SignalR/Auditing/AbpAuditHubFilter.cs   |  9 +++++----
 .../Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs   | 10 +++++-----
 .../Volo/Abp/Auditing/AuditingInterceptor.cs           | 10 +++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Auditing/AbpAuditHubFilter.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Auditing/AbpAuditHubFilter.cs
index c29afb171e..e76f415f18 100644
--- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Auditing/AbpAuditHubFilter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/Auditing/AbpAuditHubFilter.cs
@@ -79,10 +79,6 @@ public class AbpAuditHubFilter : IHubFilter
     private async Task<bool> ShouldWriteAuditLogAsync(AuditLogInfo auditLogInfo, IServiceProvider serviceProvider, bool hasError)
     {
         var options = serviceProvider.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
-        if (options.AlwaysLogOnException && hasError)
-        {
-            return true;
-        }
 
         foreach (var selector in options.AlwaysLogSelectors)
         {
@@ -92,6 +88,11 @@ public class AbpAuditHubFilter : IHubFilter
             }
         }
 
+        if (options.AlwaysLogOnException && hasError)
+        {
+            return true;
+        }
+
         if (!options.IsEnabledForAnonymousUsers && !serviceProvider.GetRequiredService<ICurrentUser>().IsAuthenticated)
         {
             return false;
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
index 9966542cc6..9cae64501a 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
@@ -100,11 +100,6 @@ public class AbpAuditingMiddleware : IMiddleware, ITransientDependency
 
     private async Task<bool> ShouldWriteAuditLogAsync(AuditLogInfo auditLogInfo, HttpContext httpContext, bool hasError)
     {
-        if (AuditingOptions.AlwaysLogOnException && hasError)
-        {
-            return true;
-        }
-
         foreach (var selector in AuditingOptions.AlwaysLogSelectors)
         {
             if (await selector(auditLogInfo))
@@ -113,6 +108,11 @@ public class AbpAuditingMiddleware : IMiddleware, ITransientDependency
             }
         }
 
+        if (AuditingOptions.AlwaysLogOnException && hasError)
+        {
+            return true;
+        }
+
         if (!AuditingOptions.IsEnabledForAnonymousUsers && !CurrentUser.IsAuthenticated)
         {
             return false;
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
index bba7fe11dd..63c38ef3c3 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
@@ -160,11 +160,6 @@ public class AuditingInterceptor : AbpInterceptor, ITransientDependency
         ICurrentUser currentUser,
         bool hasError)
     {
-        if (options.AlwaysLogOnException && hasError)
-        {
-            return true;
-        }
-
         foreach (var selector in options.AlwaysLogSelectors)
         {
             if (await selector(auditLogInfo))
@@ -173,6 +168,11 @@ public class AuditingInterceptor : AbpInterceptor, ITransientDependency
             }
         }
 
+        if (options.AlwaysLogOnException && hasError)
+        {
+            return true;
+        }
+
         if (!options.IsEnabledForAnonymousUsers && !currentUser.IsAuthenticated)
         {
             return false;