Merge pull request #11024 from nielsvanvelzen/api-userid-optional

Always make userId query parameter optional

1 files changed, 4 insertions, 3 deletions

diff --git a/Jellyfin.Api/Controllers/PlaylistsController.cs b/Jellyfin.Api/Controllers/PlaylistsController.cs
index 921cc6031..0e7c3f155 100644
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -174,7 +174,7 @@ public class PlaylistsController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     public ActionResult<QueryResult<BaseItemDto>> GetPlaylistItems(
         [FromRoute, Required] Guid playlistId,
-        [FromQuery, Required] Guid userId,
+        [FromQuery] Guid? userId,
         [FromQuery] int? startIndex,
         [FromQuery] int? limit,
         [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
@@ -183,15 +183,16 @@ public class PlaylistsController : BaseJellyfinApiController
         [FromQuery] int? imageTypeLimit,
         [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes)
     {
+        userId = RequestHelpers.GetUserId(User, userId);
         var playlist = (Playlist)_libraryManager.GetItemById(playlistId);
         if (playlist is null)
         {
             return NotFound();
         }
 
-        var user = userId.IsEmpty()
+        var user = userId.IsNullOrEmpty()
             ? null
-            : _userManager.GetUserById(userId);
+            : _userManager.GetUserById(userId.Value);
 
         var items = playlist.GetManageableItems().ToArray();
         var count = items.Length;