Backport pull request #11738 from jellyfin/release-10.9.z

Don't require user when getting current session

Original-merge: 4fcbeef5e6

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
crobibero 2024-05-25 11:46:09 -04:00 committed by Joshua M. Boniface
parent 487ebd3ca8
commit 4430706915

View file

@ -120,7 +120,12 @@ public static class RequestHelpers
internal static async Task<SessionInfo> GetSession(ISessionManager sessionManager, IUserManager userManager, HttpContext httpContext, Guid? userId = null)
{
userId ??= httpContext.User.GetUserId();
var user = userManager.GetUserById(userId.Value);
User? user = null;
if (!userId.IsNullOrEmpty())
{
user = userManager.GetUserById(userId.Value);
}
var session = await sessionManager.LogSessionActivity(
httpContext.User.GetClient(),
httpContext.User.GetVersion(),