Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cody Robibero 2024-05-01 06:42:01 -06:00 committed by GitHub
parent 1b4f5451a5
commit 1accfd79da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jellyfin.Api/Controllers/ItemsController.cs
View File

@ -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() var user = userId.IsNullOrEmpty()
? _userManager.GetUserById(userId.Value) ?? throw new ResourceNotFoundException() ? null
: 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)