V10: fix build warnings in Web.BackOffice (#12479)
* Run code cleanup * Start manual run * Finish dotnet format + manual cleanup * Fix up after merge * Fix substrings changed to [..] Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
Nikolaj Geisle
@@ -1,5 +1,5 @@
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using System.Net;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Http.Extensions;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Routing;
|
||||
@@ -17,109 +17,113 @@ using Umbraco.Cms.Web.Common.Attributes;
|
||||
using Umbraco.Cms.Web.Common.Filters;
|
||||
using Umbraco.Extensions;
|
||||
|
||||
namespace Umbraco.Cms.Web.BackOffice.Install
|
||||
namespace Umbraco.Cms.Web.BackOffice.Install;
|
||||
|
||||
/// <summary>
|
||||
/// The Installation controller
|
||||
/// </summary>
|
||||
[InstallAuthorize]
|
||||
[Area(Constants.Web.Mvc.InstallArea)]
|
||||
public class InstallController : Controller
|
||||
{
|
||||
private static bool _reported;
|
||||
private static RuntimeLevel _reportedLevel;
|
||||
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
|
||||
private readonly GlobalSettings _globalSettings;
|
||||
private readonly IHostingEnvironment _hostingEnvironment;
|
||||
private readonly InstallHelper _installHelper;
|
||||
private readonly LinkGenerator _linkGenerator;
|
||||
private readonly ILogger<InstallController> _logger;
|
||||
private readonly IRuntimeState _runtime;
|
||||
private readonly IRuntimeMinifier _runtimeMinifier;
|
||||
private readonly IUmbracoVersion _umbracoVersion;
|
||||
|
||||
public InstallController(
|
||||
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
|
||||
InstallHelper installHelper,
|
||||
IRuntimeState runtime,
|
||||
IOptions<GlobalSettings> globalSettings,
|
||||
IRuntimeMinifier runtimeMinifier,
|
||||
IHostingEnvironment hostingEnvironment,
|
||||
IUmbracoVersion umbracoVersion,
|
||||
ILogger<InstallController> logger,
|
||||
LinkGenerator linkGenerator)
|
||||
{
|
||||
_backofficeSecurityAccessor = backofficeSecurityAccessor;
|
||||
_installHelper = installHelper;
|
||||
_runtime = runtime;
|
||||
_globalSettings = globalSettings.Value;
|
||||
_runtimeMinifier = runtimeMinifier;
|
||||
_hostingEnvironment = hostingEnvironment;
|
||||
_umbracoVersion = umbracoVersion;
|
||||
_logger = logger;
|
||||
_linkGenerator = linkGenerator;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[StatusCodeResult(HttpStatusCode.ServiceUnavailable)]
|
||||
[TypeFilter(typeof(StatusCodeResultAttribute), Arguments = new object[] { HttpStatusCode.ServiceUnavailable })]
|
||||
public async Task<ActionResult> Index()
|
||||
{
|
||||
var umbracoPath = Url.GetBackOfficeUrl();
|
||||
|
||||
if (_runtime.Level == RuntimeLevel.Run)
|
||||
{
|
||||
return Redirect(umbracoPath!);
|
||||
}
|
||||
|
||||
// TODO: Update for package migrations
|
||||
if (_runtime.Level == RuntimeLevel.Upgrade)
|
||||
{
|
||||
AuthenticateResult authResult = await this.AuthenticateBackOfficeAsync();
|
||||
|
||||
if (!authResult.Succeeded)
|
||||
{
|
||||
return Redirect(_globalSettings.UmbracoPath + "/AuthorizeUpgrade?redir=" + Request.GetEncodedUrl());
|
||||
}
|
||||
}
|
||||
|
||||
// gen the install base URL
|
||||
ViewData.SetInstallApiBaseUrl(_linkGenerator.GetInstallerApiUrl());
|
||||
|
||||
// get the base umbraco folder
|
||||
var baseFolder = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);
|
||||
ViewData.SetUmbracoBaseFolder(baseFolder);
|
||||
|
||||
ViewData.SetUmbracoVersion(_umbracoVersion.SemanticVersion);
|
||||
|
||||
await _installHelper.SetInstallStatusAsync(false, string.Empty);
|
||||
|
||||
return View(Path.Combine(Constants.SystemDirectories.Umbraco.TrimStart("~"), Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The Installation controller
|
||||
/// Used to perform the redirect to the installer when the runtime level is <see cref="RuntimeLevel.Install" /> or
|
||||
/// <see cref="RuntimeLevel.Upgrade" />
|
||||
/// </summary>
|
||||
[InstallAuthorize]
|
||||
[Area(Cms.Core.Constants.Web.Mvc.InstallArea)]
|
||||
public class InstallController : Controller
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[IgnoreFromNotFoundSelectorPolicy]
|
||||
public ActionResult Redirect()
|
||||
{
|
||||
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
|
||||
private readonly InstallHelper _installHelper;
|
||||
private readonly IRuntimeState _runtime;
|
||||
private readonly GlobalSettings _globalSettings;
|
||||
private readonly IHostingEnvironment _hostingEnvironment;
|
||||
private readonly IUmbracoVersion _umbracoVersion;
|
||||
private readonly ILogger<InstallController> _logger;
|
||||
private readonly LinkGenerator _linkGenerator;
|
||||
private readonly IRuntimeMinifier _runtimeMinifier;
|
||||
var uri = HttpContext.Request.GetEncodedUrl();
|
||||
|
||||
public InstallController(
|
||||
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
|
||||
InstallHelper installHelper,
|
||||
IRuntimeState runtime,
|
||||
IOptions<GlobalSettings> globalSettings,
|
||||
IRuntimeMinifier runtimeMinifier,
|
||||
IHostingEnvironment hostingEnvironment,
|
||||
IUmbracoVersion umbracoVersion,
|
||||
ILogger<InstallController> logger,
|
||||
LinkGenerator linkGenerator)
|
||||
// redirect to install
|
||||
ReportRuntime(_logger, _runtime.Level, "Umbraco must install or upgrade.");
|
||||
|
||||
var installUrl = $"{_linkGenerator.GetInstallerUrl()}?redir=true&url={uri}";
|
||||
return Redirect(installUrl);
|
||||
}
|
||||
|
||||
private static void ReportRuntime(ILogger<InstallController> logger, RuntimeLevel level, string message)
|
||||
{
|
||||
if (_reported && _reportedLevel == level)
|
||||
{
|
||||
_backofficeSecurityAccessor = backofficeSecurityAccessor;
|
||||
_installHelper = installHelper;
|
||||
_runtime = runtime;
|
||||
_globalSettings = globalSettings.Value;
|
||||
_runtimeMinifier = runtimeMinifier;
|
||||
_hostingEnvironment = hostingEnvironment;
|
||||
_umbracoVersion = umbracoVersion;
|
||||
_logger = logger;
|
||||
_linkGenerator = linkGenerator;
|
||||
return;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[StatusCodeResult(System.Net.HttpStatusCode.ServiceUnavailable)]
|
||||
[TypeFilter(typeof(StatusCodeResultAttribute), Arguments = new object []{System.Net.HttpStatusCode.ServiceUnavailable})]
|
||||
public async Task<ActionResult> Index()
|
||||
{
|
||||
var umbracoPath = Url.GetBackOfficeUrl();
|
||||
|
||||
if (_runtime.Level == RuntimeLevel.Run)
|
||||
return Redirect(umbracoPath!);
|
||||
|
||||
// TODO: Update for package migrations
|
||||
if (_runtime.Level == RuntimeLevel.Upgrade)
|
||||
{
|
||||
var authResult = await this.AuthenticateBackOfficeAsync();
|
||||
|
||||
if (!authResult.Succeeded)
|
||||
{
|
||||
return Redirect(_globalSettings.UmbracoPath + "/AuthorizeUpgrade?redir=" + Request.GetEncodedUrl());
|
||||
}
|
||||
}
|
||||
|
||||
// gen the install base URL
|
||||
ViewData.SetInstallApiBaseUrl(_linkGenerator.GetInstallerApiUrl());
|
||||
|
||||
// get the base umbraco folder
|
||||
var baseFolder = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);
|
||||
ViewData.SetUmbracoBaseFolder(baseFolder);
|
||||
|
||||
ViewData.SetUmbracoVersion(_umbracoVersion.SemanticVersion);
|
||||
|
||||
await _installHelper.SetInstallStatusAsync(false, "");
|
||||
|
||||
return View(Path.Combine(Constants.SystemDirectories.Umbraco.TrimStart("~") , Cms.Core.Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Used to perform the redirect to the installer when the runtime level is <see cref="RuntimeLevel.Install"/> or <see cref="RuntimeLevel.Upgrade"/>
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[IgnoreFromNotFoundSelectorPolicy]
|
||||
public ActionResult Redirect()
|
||||
{
|
||||
var uri = HttpContext.Request.GetEncodedUrl();
|
||||
|
||||
// redirect to install
|
||||
ReportRuntime(_logger, _runtime.Level, "Umbraco must install or upgrade.");
|
||||
|
||||
var installUrl = $"{_linkGenerator.GetInstallerUrl()}?redir=true&url={uri}";
|
||||
return Redirect(installUrl);
|
||||
}
|
||||
|
||||
private static bool _reported;
|
||||
private static RuntimeLevel _reportedLevel;
|
||||
|
||||
private static void ReportRuntime(ILogger<InstallController> logger, RuntimeLevel level, string message)
|
||||
{
|
||||
if (_reported && _reportedLevel == level) return;
|
||||
_reported = true;
|
||||
_reportedLevel = level;
|
||||
logger.LogWarning(message);
|
||||
}
|
||||
_reported = true;
|
||||
_reportedLevel = level;
|
||||
logger.LogWarning(message);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user