From 86b81948af8003b56be48b1ff3cb22b018f4d337 Mon Sep 17 00:00:00 2001
From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com>
Date: Wed, 2 Jul 2025 10:10:40 -0500
Subject: [PATCH] Sync UiAuthorizationPolicyProvider with upstream

* Revert "Fixed: Fallback to Forms for removed Basic auth method"

This reverts commit fe198352a3ca940208f69edd9a95952118aa9c7e.

* AuthPolicy Var fixes
---
 .../UiAuthorizationPolicyProvider.cs          | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

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;
 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 @@ namespace Prowlarr.Http.Authentication
     {
         private const string PolicyName = "UI";
         private readonly IConfigFileProvider _config;
-        private readonly Logger _logger;
 
         public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; }
 
         public UiAuthorizationPolicyProvider(IOptions<AuthorizationOptions> options,
-            IConfigFileProvider config,
-            Logger logger)
+            IConfigFileProvider config)
         {
             FallbackPolicyProvider = new DefaultAuthorizationPolicyProvider(options);
             _config = config;
-            _logger = logger;
         }
 
         public Task<AuthorizationPolicy> GetDefaultPolicyAsync() => FallbackPolicyProvider.GetDefaultPolicyAsync();
@@ -33,19 +28,7 @@ namespace Prowlarr.Http.Authentication
         {
             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());