Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix FirstTimeSetupHandler api key test

Browse Source
This commit is contained in:
Bill Thornton 2024-05-30 12:08:52 -04:00
parent 8fa7ff647a
commit 35962bcc42
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/Auth/FirstTimeSetupPolicy/FirstTimeSetupHandler.cs
View File

@ -1,5 +1,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Api.Constants; using Jellyfin.Api.Constants;
using Jellyfin.Api.Extensions;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -28,6 +29,10 @@ namespace Jellyfin.Api.Auth.FirstTimeSetupPolicy
{ {
context.Succeed(requirement); context.Succeed(requirement);
} }
else if (context.User.GetIsApiKey())
{
context.Succeed(requirement);
}
else if (requirement.RequireAdmin && !context.User.IsInRole(UserRoles.Administrator)) else if (requirement.RequireAdmin && !context.User.IsInRole(UserRoles.Administrator))
{ {
context.Fail(); context.Fail();

2
tests/Jellyfin.Api.Tests/Auth/FirstTimeSetupPolicy/FirstTimeSetupHandlerTests.cs
View File

@ -95,7 +95,7 @@ namespace Jellyfin.Api.Tests.Auth.FirstTimeSetupPolicy
public async Task ShouldAllowAdminApiKeyIfStartupWizardComplete() public async Task ShouldAllowAdminApiKeyIfStartupWizardComplete()
{ {
TestHelpers.SetupConfigurationManager(_configurationManagerMock, true); TestHelpers.SetupConfigurationManager(_configurationManagerMock, true);
var claims = new ClaimsPrincipal(new ClaimsIdentity([new Claim(ClaimTypes.Role, UserRoles.Administrator)])); var claims = new ClaimsPrincipal(new ClaimsIdentity([new Claim(InternalClaimTypes.IsApiKey, bool.TrueString)]));
var context = new AuthorizationHandlerContext(_requirements, claims, null); var context = new AuthorizationHandlerContext(_requirements, claims, null);
await _firstTimeSetupHandler.HandleAsync(context); await _firstTimeSetupHandler.HandleAsync(context);