diff --git a/src/Prowlarr.Http/Authentication/UiAuthorizationPolicyProvider.cs b/src/Prowlarr.Http/Authentication/UiAuthorizationPolicyProvider.cs index b87c07e4a..76bbd38e6 100644 --- a/src/Prowlarr.Http/Authentication/UiAuthorizationPolicyProvider.cs +++ b/src/Prowlarr.Http/Authentication/UiAuthorizationPolicyProvider.cs @@ -2,8 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; -using NLog; -using NzbDrone.Core.Authentication; using NzbDrone.Core.Configuration; namespace Prowlarr.Http.Authentication @@ -12,17 +10,14 @@ public class UiAuthorizationPolicyProvider : IAuthorizationPolicyProvider { private const string PolicyName = "UI"; private readonly IConfigFileProvider _config; - private readonly Logger _logger; public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; } public UiAuthorizationPolicyProvider(IOptions options, - IConfigFileProvider config, - Logger logger) + IConfigFileProvider config) { FallbackPolicyProvider = new DefaultAuthorizationPolicyProvider(options); _config = config; - _logger = logger; } public Task GetDefaultPolicyAsync() => FallbackPolicyProvider.GetDefaultPolicyAsync(); @@ -33,19 +28,7 @@ public Task GetPolicyAsync(string policyName) { if (policyName.Equals(PolicyName, StringComparison.OrdinalIgnoreCase)) { - var authenticationMethod = _config.AuthenticationMethod; - -#pragma warning disable CS0618 // Type or member is obsolete - if (authenticationMethod == AuthenticationType.Basic) -#pragma warning restore CS0618 // Type or member is obsolete - { - _logger.Error("Basic authentication method was removed, use Forms authentication instead."); - - authenticationMethod = AuthenticationType.Forms; - } - - var policy = new AuthorizationPolicyBuilder() - .AddAuthenticationSchemes(authenticationMethod.ToString()) + var policy = new AuthorizationPolicyBuilder(_config.AuthenticationMethod.ToString()) .AddRequirements(new BypassableDenyAnonymousAuthorizationRequirement()); return Task.FromResult(policy.Build());