From 4430706915de54739f677b980fbc2f3a87ada5ab Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 25 May 2024 11:46:09 -0400
Subject: [PATCH] Backport pull request #11738 from jellyfin/release-10.9.z

Don't require user when getting current session

Original-merge: 4fcbeef5e6595bb675b27e8a2ba180dae8287eb3

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

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 Jellyfin.Api/Helpers/RequestHelpers.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index b607e91041..a3d7f471ec 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -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(),