From ee84321d4b3a3b1a9152dc69ad7ae87e75121852 Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 21 Oct 2021 21:04:26 +0100 Subject: [PATCH] Fixed: Forms login page uses urlbase for logo (cherry picked from commit e0f30c3eaeab7d863b4b4104a9f0d501bd693f69) (cherry picked from commit 73f81465e9e38ea545155b4ec98b23ddb9bc4816) (cherry picked from commit 0332356fa34a893bc856d39e280f70681ffbc822) --- .../Frontend/StaticResourceController.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Radarr.Http/Frontend/StaticResourceController.cs b/src/Radarr.Http/Frontend/StaticResourceController.cs index bf1b16e00..c2758c15b 100644 --- a/src/Radarr.Http/Frontend/StaticResourceController.cs +++ b/src/Radarr.Http/Frontend/StaticResourceController.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.IO; using System.Linq; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Cors; @@ -16,29 +15,21 @@ namespace Radarr.Http.Frontend [ApiController] public class StaticResourceController : Controller { - private readonly string _urlBase; - private readonly string _loginPath; private readonly IEnumerable _requestMappers; private readonly Logger _logger; - public StaticResourceController(IConfigFileProvider configFileProvider, - IAppFolderInfo appFolderInfo, - IEnumerable requestMappers, + public StaticResourceController(IEnumerable requestMappers, Logger logger) { - _urlBase = configFileProvider.UrlBase.Trim('/'); _requestMappers = requestMappers; _logger = logger; - - _loginPath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "login.html"); } [AllowAnonymous] [HttpGet("login")] public IActionResult LoginPage() { - Response.Headers.DisableCache(); - return PhysicalFile(_loginPath, "text/html"); + return MapResource("login"); } [EnableCors("AllowGet")]