ServiceStack
diff --git a/Collapse file
‎ServiceStack/src/ServiceStack/AutoQueryDataFeature.cs‎
Copy file name to clipboardExpand all lines: ServiceStack/src/ServiceStack/AutoQueryDataFeature.cs
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎ServiceStack/src/ServiceStack/AutoQueryDataFeature.cs‎
Copy file name to clipboardExpand all lines: ServiceStack/src/ServiceStack/AutoQueryDataFeature.cs
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎ServiceStack/src/ServiceStack/ServerClaimUtils.cs‎
Copy file name to clipboardExpand all lines: ServiceStack/src/ServiceStack/ServerClaimUtils.cs
+6-3Lines changed: 6 additions & 3 deletions b/Collapse file
‎ServiceStack/src/ServiceStack/ServerClaimUtils.cs‎
Copy file name to clipboardExpand all lines: ServiceStack/src/ServiceStack/ServerClaimUtils.cs
+6-3Lines changed: 6 additions & 3 deletions
@@ -1580,9 +1580,9 @@ public static void Or<T>(this IDataQuery q, Expression<Func<T, object>> fieldExp
         var pi = fieldExpr.ToPropertyInfo();
         q.AddCondition(QueryTerm.Or, pi, condition, value);
     }
-        
+
     public static T WithAudit<T>(this T row, IRequest req, DateTime? date = null) where T : AuditBase =>
-        row.WithAudit(req.GetSession().UserAuthId, date);   
+        row.WithAudit(req.GetRequiredUserId(), date);
 
     public static T WithAudit<T>(this T row, string by, DateTime? date = null) where T : AuditBase
     {
 
@@ -14,9 +14,12 @@ public static class ServerClaimUtils
         if (apiKeyUserId != null)
             return apiKeyUserId;
         var user = req.GetClaimsPrincipal();
-        return user.IsAuthenticated()
-            ? user.GetUserId()
-            : null;
+        if (user.IsAuthenticated())
+            return user.GetUserId();
+        var session = req.GetSession();
+        if (session?.IsAuthenticated == true)
+            return session.UserAuthId;
+        return  null;
     }
 
     /// <summary>
Original file line number	Diff line number	Diff line change
`@@ -1580,9 +1580,9 @@ public static void Or<T>(this IDataQuery q, Expression<Func<T, object>> fieldExp`
`1580`	`1580`	`var pi = fieldExpr.ToPropertyInfo();`
`1581`	`1581`	`q.AddCondition(QueryTerm.Or, pi, condition, value);`
`1582`	`1582`	`}`
`1583`		`-`
	`1583`	`+`
`1584`	`1584`	`public static T WithAudit<T>(this T row, IRequest req, DateTime? date = null) where T : AuditBase =>`
`1585`		`- row.WithAudit(req.GetSession().UserAuthId, date);`
	`1585`	`+ row.WithAudit(req.GetRequiredUserId(), date);`
`1586`	`1586`
`1587`	`1587`	`public static T WithAudit<T>(this T row, string by, DateTime? date = null) where T : AuditBase`
`1588`	`1588`	`{`