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

Ensures that we don't add duplicate UmbracoVirtualPageFilterAttribute and that we use the ActionExecutingContext as the context during the FindContent operation

Browse Source
This commit is contained in:
Shannon
2021-02-16 18:02:05 +11:00
parent f40a6be9b6
commit 9ef8de36e5
6 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.Common/Extensions/ControllerActionEndpointConventionBuilderExtensions.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Web.Common.Extensions
/// </summary>
public static void ForUmbracoPage(
this ControllerActionEndpointConventionBuilder builder,
Func<HttpContext, IPublishedContent> findContent)
Func<ActionExecutingContext, IPublishedContent> findContent)
=> builder.Add(convention =>
{
// filter out matched endpoints that are suppressed
@@ -35,8 +35,18 @@ namespace Umbraco.Web.Common.Extensions
// to execute in order to find the IPublishedContent for the request.
var filter = new UmbracoVirtualPageFilterAttribute();
actionDescriptor.FilterDescriptors.Add(new FilterDescriptor(filter, 0));
convention.Metadata.Add(filter);
// Check if this already contains this filter since we don't want it applied twice.
// This could occur if the controller being routed is IVirtualPageController AND
// is being routed with ForUmbracoPage. In that case, ForUmbracoPage wins
// because the UmbracoVirtualPageFilterAttribute will check for the metadata first since
// that is more explicit and flexible in case the same controller is routed multiple times.
if (!actionDescriptor.FilterDescriptors.Any(x => x.Filter is UmbracoVirtualPageFilterAttribute))
{
actionDescriptor.FilterDescriptors.Add(new FilterDescriptor(filter, 0));
convention.Metadata.Add(filter);
}
convention.Metadata.Add(new CustomRouteContentFinderDelegate(findContent));
}
}