yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V10: fix build warnings in Web.BackOffice (#12479)

Browse Source 
* 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
2022-06-20 08:37:17 +02:00
committed by GitHub
parent 7688c61621
commit e762fa91bc
234 changed files with 28037 additions and 27527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs
View File

@@ -1,9 +1,8 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
@@ -13,103 +12,106 @@ using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Web.BackOffice.Controllers
namespace Umbraco.Cms.Web.BackOffice.Controllers;
[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
public class UpdateCheckController : UmbracoAuthorizedJsonController
{
[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
public class UpdateCheckController : UmbracoAuthorizedJsonController
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
private readonly ICookieManager _cookieManager;
private readonly GlobalSettings _globalSettings;
private readonly IUmbracoVersion _umbracoVersion;
private readonly IUpgradeService _upgradeService;
public UpdateCheckController(
IUpgradeService upgradeService,
IUmbracoVersion umbracoVersion,
ICookieManager cookieManager,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
IOptionsSnapshot<GlobalSettings> globalSettings)
{
private readonly IUpgradeService _upgradeService;
private readonly IUmbracoVersion _umbracoVersion;
private readonly ICookieManager _cookieManager;
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
private readonly GlobalSettings _globalSettings;
_upgradeService = upgradeService ?? throw new ArgumentNullException(nameof(upgradeService));
_umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
_cookieManager = cookieManager ?? throw new ArgumentNullException(nameof(cookieManager));
_backofficeSecurityAccessor = backofficeSecurityAccessor ??
throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
_globalSettings = globalSettings.Value ?? throw new ArgumentNullException(nameof(globalSettings));
}
public UpdateCheckController(
IUpgradeService upgradeService,
IUmbracoVersion umbracoVersion,
ICookieManager cookieManager,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
IOptionsSnapshot<GlobalSettings> globalSettings)
[UpdateCheckResponseFilter]
public async Task<UpgradeCheckResponse?> GetCheck()
{
var updChkCookie = _cookieManager.GetCookieValue("UMB_UPDCHK");
var updateCheckCookie = updChkCookie ?? string.Empty;
if (_globalSettings.VersionCheckPeriod > 0 && string.IsNullOrEmpty(updateCheckCookie) &&
(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false))
{
_upgradeService = upgradeService ?? throw new ArgumentNullException(nameof(upgradeService));
_umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
_cookieManager = cookieManager ?? throw new ArgumentNullException(nameof(cookieManager));
_backofficeSecurityAccessor = backofficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
_globalSettings = globalSettings.Value ?? throw new ArgumentNullException(nameof(globalSettings));
try
{
var version = new SemVersion(_umbracoVersion.Version.Major, _umbracoVersion.Version.Minor,
_umbracoVersion.Version.Build, _umbracoVersion.Comment);
UpgradeResult result = await _upgradeService.CheckUpgrade(version);
return new UpgradeCheckResponse(result.UpgradeType, result.Comment, result.UpgradeUrl, _umbracoVersion);
}
catch
{
//We don't want to crash due to this
return null;
}
}
[UpdateCheckResponseFilter]
public async Task<UpgradeCheckResponse?> GetCheck()
{
var updChkCookie = _cookieManager.GetCookieValue("UMB_UPDCHK");
var updateCheckCookie = updChkCookie ?? string.Empty;
if (_globalSettings.VersionCheckPeriod > 0 && string.IsNullOrEmpty(updateCheckCookie) && (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false))
{
try
{
var version = new SemVersion(_umbracoVersion.Version.Major, _umbracoVersion.Version.Minor,
_umbracoVersion.Version.Build, _umbracoVersion.Comment);
var result = await _upgradeService.CheckUpgrade(version);
return null;
}
return new UpgradeCheckResponse(result.UpgradeType, result.Comment, result.UpgradeUrl, _umbracoVersion);
}
catch
{
//We don't want to crash due to this
return null;
}
}
return null;
/// <summary>
/// Adds the cookie response if it was successful
/// </summary>
/// <remarks>
/// A filter is required because we are returning an object from the get method and not an HttpResponseMessage
/// </remarks>
internal class UpdateCheckResponseFilterAttribute : TypeFilterAttribute
{
public UpdateCheckResponseFilterAttribute() : base(typeof(UpdateCheckResponseFilter))
{
}
/// <summary>
/// Adds the cookie response if it was successful
/// </summary>
/// <remarks>
/// A filter is required because we are returning an object from the get method and not an HttpResponseMessage
/// </remarks>
///
internal class UpdateCheckResponseFilterAttribute : TypeFilterAttribute
private class UpdateCheckResponseFilter : IActionFilter
{
public UpdateCheckResponseFilterAttribute() : base(typeof(UpdateCheckResponseFilter))
{
}
private readonly GlobalSettings _globalSettings;
private class UpdateCheckResponseFilter : IActionFilter
{
private readonly GlobalSettings _globalSettings;
public UpdateCheckResponseFilter(IOptionsSnapshot<GlobalSettings> globalSettings) =>
_globalSettings = globalSettings.Value;
public UpdateCheckResponseFilter(IOptionsSnapshot<GlobalSettings> globalSettings)
public void OnActionExecuted(ActionExecutedContext context)
{
if (context.HttpContext.Response == null)
{
_globalSettings = globalSettings.Value;
return;
}
public void OnActionExecuted(ActionExecutedContext context)
if (context.Result is ObjectResult objectContent)
{
if (context.HttpContext.Response == null) return;
if (context.Result is ObjectResult objectContent)
if (objectContent.Value == null)
{
if (objectContent.Value == null) return;
return;
}
context.HttpContext.Response.Cookies.Append("UMB_UPDCHK", "1", new CookieOptions()
context.HttpContext.Response.Cookies.Append("UMB_UPDCHK", "1",
new CookieOptions
{
Path = "/",
Expires = DateTimeOffset.Now.AddDays(_globalSettings.VersionCheckPeriod),
HttpOnly = true,
Secure = _globalSettings.UseHttps
});
}
}
public void OnActionExecuting(ActionExecutingContext context)
{
}
}
}
public void OnActionExecuting(ActionExecutingContext context)
{
}
}
}
}