瀏覽代碼

Always attempt to get User if a user id is provided (#11471)

Cody Robibero 1 年之前
父節點
當前提交
1accfd79da
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Jellyfin.Api/Controllers/ItemsController.cs

+ 3 - 3
Jellyfin.Api/Controllers/ItemsController.cs

@@ -246,9 +246,9 @@ public class ItemsController : BaseJellyfinApiController
         var isApiKey = User.GetIsApiKey();
         var isApiKey = User.GetIsApiKey();
         // if api key is used (auth.IsApiKey == true), then `user` will be null throughout this method
         // if api key is used (auth.IsApiKey == true), then `user` will be null throughout this method
         userId = RequestHelpers.GetUserId(User, userId);
         userId = RequestHelpers.GetUserId(User, userId);
-        var user = !isApiKey && !userId.IsNullOrEmpty()
-            ? _userManager.GetUserById(userId.Value) ?? throw new ResourceNotFoundException()
-            : null;
+        var user = userId.IsNullOrEmpty()
+            ? null
+            : _userManager.GetUserById(userId.Value) ?? throw new ResourceNotFoundException();
 
 
         // beyond this point, we're either using an api key or we have a valid user
         // beyond this point, we're either using an api key or we have a valid user
         if (!isApiKey && user is null)
         if (!isApiKey && user is null)