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

Fixes async filters and cleans up some code

Browse Source
This commit is contained in:
Shannon
2020-11-26 17:02:07 +11:00
parent 8e15e265fd
commit 75e6eb0bd9
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
View File

@@ -33,13 +33,10 @@ namespace Umbraco.Web.BackOffice.Filters
private sealed class ContentSaveValidationFilter : IAsyncActionFilter
{
private readonly IContentService _contentService;
private readonly IEntityService _entityService;
private readonly IPropertyValidationService _propertyValidationService;
private readonly ContentPermissions _contentPermissions;
private readonly IAuthorizationService _authorizationService;
private readonly ILoggerFactory _loggerFactory;
private readonly ILocalizedTextService _textService;
private readonly IUserService _userService;
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
@@ -48,20 +45,14 @@ namespace Umbraco.Web.BackOffice.Filters
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
ILocalizedTextService textService,
IContentService contentService,
IUserService userService,
IEntityService entityService,
IPropertyValidationService propertyValidationService,
ContentPermissions contentPermissions,
IAuthorizationService authorizationService)
{
_loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
_backofficeSecurityAccessor = backofficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
_textService = textService ?? throw new ArgumentNullException(nameof(textService));
_contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
_userService = userService ?? throw new ArgumentNullException(nameof(userService));
_entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
_propertyValidationService = propertyValidationService ?? throw new ArgumentNullException(nameof(propertyValidationService));
_contentPermissions = contentPermissions;
_authorizationService = authorizationService;
}
@@ -70,7 +61,12 @@ namespace Umbraco.Web.BackOffice.Filters
// on executing...
await OnActionExecutingAsync(context);
await next(); //need to pass the execution to next
if (context.Result == null)
{
//need to pass the execution to next if a result was not set
await next();
}
// on executed...
}

6
src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
View File

@@ -52,7 +52,11 @@ namespace Umbraco.Web.BackOffice.Filters
// on executing...
await OnActionExecutingAsync(context);
await next(); //need to pass the execution to next
if (context.Result == null)
{
//need to pass the execution to next if a result was not set
await next();
}
// on executed...
}

14
src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
View File

@@ -53,13 +53,13 @@ namespace Umbraco.Web.BackOffice.Filters
var cookieToken = _cookieManager.GetCookieValue(Constants.Web.CsrfValidationCookieName);
var httpContext = context.HttpContext;
var validateResult = await ValidateHeaders(httpContext, cookieToken);
if (validateResult.Item1 == false)
{
httpContext.SetReasonPhrase(validateResult.Item2);
context.Result = new StatusCodeResult((int)HttpStatusCode.ExpectationFailed);
return;
}
var validateResult = await ValidateHeaders(httpContext, cookieToken);
if (validateResult.Item1 == false)
{
httpContext.SetReasonPhrase(validateResult.Item2);
context.Result = new StatusCodeResult((int)HttpStatusCode.ExpectationFailed);
return;
}
await next();
}