Explorar o código

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>
crobibero hai 1 ano
pai
achega
4430706915
Modificáronse 1 ficheiros con 6 adicións e 1 borrados
  1. 6 1
      Jellyfin.Api/Helpers/RequestHelpers.cs

+ 6 - 1
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)
     internal static async Task<SessionInfo> GetSession(ISessionManager sessionManager, IUserManager userManager, HttpContext httpContext, Guid? userId = null)
     {
     {
         userId ??= httpContext.User.GetUserId();
         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(
         var session = await sessionManager.LogSessionActivity(
             httpContext.User.GetClient(),
             httpContext.User.GetClient(),
             httpContext.User.GetVersion(),
             httpContext.User.GetVersion(),