Fixed: Forms login page uses urlbase for logo

(cherry picked from commit e0f30c3eaeab7d863b4b4104a9f0d501bd693f69)
(cherry picked from commit 73f81465e9e38ea545155b4ec98b23ddb9bc4816)
pull/2397/head
ta264 3 years ago committed by Qstick
parent 222b56e7bc
commit 0332356fa3

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using Lidarr.Http.Extensions; using Lidarr.Http.Extensions;
using Lidarr.Http.Frontend.Mappers; using Lidarr.Http.Frontend.Mappers;
@ -16,29 +15,21 @@ namespace Lidarr.Http.Frontend
[ApiController] [ApiController]
public class StaticResourceController : Controller public class StaticResourceController : Controller
{ {
private readonly string _urlBase;
private readonly string _loginPath;
private readonly IEnumerable<IMapHttpRequestsToDisk> _requestMappers; private readonly IEnumerable<IMapHttpRequestsToDisk> _requestMappers;
private readonly Logger _logger; private readonly Logger _logger;
public StaticResourceController(IConfigFileProvider configFileProvider, public StaticResourceController(IEnumerable<IMapHttpRequestsToDisk> requestMappers,
IAppFolderInfo appFolderInfo,
IEnumerable<IMapHttpRequestsToDisk> requestMappers,
Logger logger) Logger logger)
{ {
_urlBase = configFileProvider.UrlBase.Trim('/');
_requestMappers = requestMappers; _requestMappers = requestMappers;
_logger = logger; _logger = logger;
_loginPath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "login.html");
} }
[AllowAnonymous] [AllowAnonymous]
[HttpGet("login")] [HttpGet("login")]
public IActionResult LoginPage() public IActionResult LoginPage()
{ {
Response.Headers.DisableCache(); return MapResource("login");
return PhysicalFile(_loginPath, "text/html");
} }
[EnableCors("AllowGet")] [EnableCors("AllowGet")]

Loading…
Cancel
Save