@@ -90,7 +90,7 @@ public static void Register(string taskName, Action<string[]> appTask)
                     var appTask = appTaskWithArgs.LeftPart(':');
                     var args = appTaskWithArgs.IndexOf(':') >= 0
                         ? appTaskWithArgs.RightPart(':').Split(',')
-                        : Array.Empty<string>();
+                        : [];
 
                     if (!tasks.TryGetValue(appTask, out var taskFn))
                     {
 
@@ -43,7 +43,7 @@ public static Action<IServiceCollection,AuthFeature> For<TUser,TKey>(Action<Iden
         where TUser : IdentityUser<TKey>, new()
     {
         var ctx = new IdentityAuthContext<TUser, TKey>(
-            () => new IdentityAuthSession(new ClaimsPrincipal()),
+            () => new AuthUserSession(),
             new IdentityApplicationAuthProvider<TUser, TKey>(),
             new IdentityCredentialsAuthProvider<TUser, TKey>(),
             new IdentityJwtAuthProvider<TUser, TKey>(),
@@ -638,13 +638,5 @@ public async Task<IList<Claim>> GetClaimsAsync(Func<UserManager<TUser>, Task<ILi
     }
 }
 
-public interface IRequireClaimsPrincipal
-{
-    ClaimsPrincipal User { get; set; }
-}
 
-public class IdentityAuthSession(ClaimsPrincipal user) : AuthUserSession, IRequireClaimsPrincipal
-{
-    [IgnoreDataMember] public ClaimsPrincipal User { get; set; } = user;
-}
 
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Text;
@@ -70,7 +71,12 @@ public interface IAuthSession : IRuntimeSerializable
     HashSet<string> GetUserAttributes(IRequest request);
 }
 
-public interface IAuthSessionExtended : IAuthSession
+public interface IRequireClaimsPrincipal
+{
+    ClaimsPrincipal User { get; set; }
+}
+
+public interface IAuthSessionExtended : IAuthSession, IRequireClaimsPrincipal
 {
     string Company { get; set; }
     string PrimaryEmail { get; set; }
@@ -105,6 +111,7 @@ public interface IAuthSessionExtended : IAuthSession
     string RecoveryToken { get; set; }
     int? RefId { get; set; }
     string RefIdStr { get; set; }
+    ClaimsPrincipal User { get; set; }
 
     /// <summary>
     /// High-level overridable API that ServiceStack uses to check whether a user has all requiredRoles.
 
@@ -90,6 +90,7 @@ public AuthUserSession()
     [DataMember(Order = 59)] public virtual string RecoveryToken { get; set; }
     [DataMember(Order = 60)] public virtual int? RefId { get; set; }
     [DataMember(Order = 61)] public virtual string RefIdStr { get; set; }
+    [DataMember(Order = 62)] public ClaimsPrincipal User { get; set; } = new();
 
     public virtual bool IsAuthorized(string provider)
     {
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static void Register(string taskName, Action<string[]> appTask)`
`90`	`90`	`var appTask = appTaskWithArgs.LeftPart(':');`
`91`	`91`	`var args = appTaskWithArgs.IndexOf(':') >= 0`
`92`	`92`	`? appTaskWithArgs.RightPart(':').Split(',')`
`93`		`- : Array.Empty<string>();`
	`93`	`+ : [];`
`94`	`94`
`95`	`95`	`if (!tasks.TryGetValue(appTask, out var taskFn))`
`96`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static Action<IServiceCollection,AuthFeature> For<TUser,TKey>(Action<Iden`
`43`	`43`	`where TUser : IdentityUser<TKey>, new()`
`44`	`44`	`{`
`45`	`45`	`var ctx = new IdentityAuthContext<TUser, TKey>(`
`46`		`- () => new IdentityAuthSession(new ClaimsPrincipal()),`
	`46`	`+ () => new AuthUserSession(),`
`47`	`47`	`new IdentityApplicationAuthProvider<TUser, TKey>(),`
`48`	`48`	`new IdentityCredentialsAuthProvider<TUser, TKey>(),`
`49`	`49`	`new IdentityJwtAuthProvider<TUser, TKey>(),`
`@@ -638,13 +638,5 @@ public async Task<IList<Claim>> GetClaimsAsync(Func<UserManager<TUser>, Task<ILi`
`638`	`638`	`}`
`639`	`639`	`}`
`640`	`640`
`641`		`-public interface IRequireClaimsPrincipal`
`642`		`-{`
`643`		`- ClaimsPrincipal User { get; set; }`
`644`		`-}`
`645`	`641`
`646`		`-public class IdentityAuthSession(ClaimsPrincipal user) : AuthUserSession, IRequireClaimsPrincipal`
`647`		`-{`
`648`		`- [IgnoreDataMember] public ClaimsPrincipal User { get; set; } = user;`
`649`		`-}`
`650`	`642`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ public AuthUserSession()`
`90`	`90`	`[DataMember(Order = 59)] public virtual string RecoveryToken { get; set; }`
`91`	`91`	`[DataMember(Order = 60)] public virtual int? RefId { get; set; }`
`92`	`92`	`[DataMember(Order = 61)] public virtual string RefIdStr { get; set; }`
	`93`	`+ [DataMember(Order = 62)] public ClaimsPrincipal User { get; set; } = new();`
`93`	`94`
`94`	`95`	`public virtual bool IsAuthorized(string provider)`
`95`	`96`	`{`