From 255a8825868d7cd4d32d67326d15d57a4f4b095a Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 6 Jul 2026 08:59:46 +0800
Subject: [PATCH] Return anonymous principal instead of null in
 ThreadCurrentPrincipalAccessor

---
 .../Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs   | 2 +-
 .../Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
index ab42441f98..e5234a06d1 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/ThreadCurrentPrincipalAccessor.cs
@@ -8,6 +8,6 @@ public class ThreadCurrentPrincipalAccessor : CurrentPrincipalAccessorBase, ISin
 {
     protected override ClaimsPrincipal GetClaimsPrincipal()
     {
-        return (Thread.CurrentPrincipal as ClaimsPrincipal)!;
+        return Thread.CurrentPrincipal as ClaimsPrincipal ?? new ClaimsPrincipal(new ClaimsIdentity());
     }
 }
diff --git a/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs b/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
index bbc18089be..9ba384c69f 100644
--- a/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
+++ b/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
@@ -31,7 +31,8 @@ public class CurrentPrincipalAccessor_Tests : AbpIntegratedTest<AbpSecurityTestM
             }));
 
 
-        _currentPrincipalAccessor.Principal.ShouldBe(null);
+        _currentPrincipalAccessor.Principal.ShouldNotBeNull();
+        _currentPrincipalAccessor.Principal.Identity!.IsAuthenticated.ShouldBeFalse();
 
         using (_currentPrincipalAccessor.Change(claimsPrincipal))
         {
@@ -44,6 +45,7 @@ public class CurrentPrincipalAccessor_Tests : AbpIntegratedTest<AbpSecurityTestM
 
             _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal);
         }
-        _currentPrincipalAccessor.Principal.ShouldBeNull();
+        _currentPrincipalAccessor.Principal.ShouldNotBeNull();
+        _currentPrincipalAccessor.Principal.Identity!.IsAuthenticated.ShouldBeFalse();
     }
 }