diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-06-13 15:06:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 15:06:30 +0200 |
| commit | aaa9cc604f5cd3a2869259a9b0c404d0330195fd (patch) | |
| tree | 977ea26ff55763e95a128909dc8df74c3355def2 | |
| parent | 04daf0ff498655840b55d7ac6e571035aae6417c (diff) | |
| parent | 226abde3f72ccfc768766ce2ff295cb0972b6426 (diff) | |
Merge pull request #6176 from nielsvanvelzen/userid-required
Require userId in getItems and getTrailers endpoints
| -rw-r--r-- | Jellyfin.Api/Controllers/ItemsController.cs | 6 | ||||
| -rw-r--r-- | Jellyfin.Api/Controllers/TrailersController.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs index 74cf3b162..35c27dd0e 100644 --- a/Jellyfin.Api/Controllers/ItemsController.cs +++ b/Jellyfin.Api/Controllers/ItemsController.cs @@ -143,7 +143,7 @@ namespace Jellyfin.Api.Controllers [HttpGet("Items")] [ProducesResponseType(StatusCodes.Status200OK)] public ActionResult<QueryResult<BaseItemDto>> GetItems( - [FromQuery] Guid? userId, + [FromQuery] Guid userId, [FromQuery] string? maxOfficialRating, [FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeVideo, @@ -224,8 +224,8 @@ namespace Jellyfin.Api.Controllers [FromQuery] bool enableTotalRecordCount = true, [FromQuery] bool? enableImages = true) { - var user = userId.HasValue && !userId.Equals(Guid.Empty) - ? _userManager.GetUserById(userId.Value) + var user = !userId.Equals(Guid.Empty) + ? _userManager.GetUserById(userId) : null; var dtoOptions = new DtoOptions { Fields = fields } .AddClientFields(Request) diff --git a/Jellyfin.Api/Controllers/TrailersController.cs b/Jellyfin.Api/Controllers/TrailersController.cs index dd3836551..5cb7468b2 100644 --- a/Jellyfin.Api/Controllers/TrailersController.cs +++ b/Jellyfin.Api/Controllers/TrailersController.cs @@ -114,7 +114,7 @@ namespace Jellyfin.Api.Controllers [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public ActionResult<QueryResult<BaseItemDto>> GetTrailers( - [FromQuery] Guid? userId, + [FromQuery] Guid userId, [FromQuery] string? maxOfficialRating, [FromQuery] bool? hasThemeSong, [FromQuery] bool? hasThemeVideo, |