Add IsViewOrPageResult() extension (#14228)

src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs

@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.DisplayManagement.Shapes;
@@ -27,7 +25,7 @@ public AdminMenuFilter(ILayoutAccessor layoutAccessor,
         public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
         {
             // Should only run on a full view rendering result
-            if (filterContext.Result is not ViewResult && filterContext.Result is not PageResult)
+            if (!filterContext.IsViewOrPageResult())
             {
                 await next();
                 return;

src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs

@@ -1,7 +1,6 @@
+using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
 using OrchardCore.Entities;
 using OrchardCore.Facebook.Settings;
@@ -26,12 +25,11 @@ public FBInitFilter(
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
             // Should only run on the front-end for a full view
-            if ((context.Result is ViewResult || context.Result is PageResult) &&
-                !AdminAttribute.IsApplied(context.HttpContext))
+            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
             {
                 var site = (await _siteService.GetSiteSettingsAsync());
                 var settings = site.As<FacebookSettings>();
-                if (!string.IsNullOrWhiteSpace(settings?.AppId))
+                if (!String.IsNullOrWhiteSpace(settings?.AppId))
                 {
                     if (settings.FBInit)
                     {

src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs

@@ -2,9 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
 using OrchardCore.Entities;
 using OrchardCore.Facebook.Settings;
@@ -32,8 +30,7 @@ public FacebookPixelFilter(
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
         // Should only run on the front-end for a full view.
-        if ((context.Result is ViewResult || context.Result is PageResult)
-            && !AdminAttribute.IsApplied(context.HttpContext))
+        if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
         {
             var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
 

src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs

@@ -2,9 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
 using OrchardCore.Entities;
 using OrchardCore.Google.Analytics.Settings;
@@ -31,8 +29,7 @@ public GoogleAnalyticsFilter(
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
             // Should only run on the front-end for a full view
-            if ((context.Result is ViewResult || context.Result is PageResult) &&
-                !AdminAttribute.IsApplied(context.HttpContext))
+            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
             {
                 var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
 

src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs

@@ -2,9 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
 using OrchardCore.Entities;
 using OrchardCore.Google.TagManager.Settings;
@@ -31,8 +29,7 @@ public GoogleTagManagerFilter(
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
             // Should only run on the front-end for a full view
-            if ((context.Result is ViewResult || context.Result is PageResult) &&
-                !AdminAttribute.IsApplied(context.HttpContext))
+            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
             {
                 var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
 

src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Caching.Memory;
 using OrchardCore.Admin;
 using OrchardCore.ContentManagement.Display;
@@ -62,8 +60,7 @@ public LayerFilter(
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
             // Should only run on the front-end for a full view
-            if ((context.Result is ViewResult || context.Result is PageResult) &&
-                !AdminAttribute.IsApplied(context.HttpContext))
+            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
             {
                 // Even if the Admin attribute is not applied we might be using the admin theme, for instance in Login views.
                 // In this case don't render Layers.

src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerFilter.cs

@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
@@ -31,7 +29,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
             var viewMiniProfilerOnFrontEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnFrontEnd);
             var viewMiniProfilerOnBackEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnBackEnd);
             if (
-                    (context.Result is ViewResult || context.Result is PageResult) &&
+                    context.IsViewOrPageResult() &&
                     (
                         (viewMiniProfilerOnFrontEnd && !AdminAttribute.IsApplied(context.HttpContext)) ||
                         (viewMiniProfilerOnBackEnd && AdminAttribute.IsApplied(context.HttpContext))

src/OrchardCore.Modules/OrchardCore.Notifications/Filters/NotificationResultFilter.cs

@@ -3,9 +3,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.DisplayManagement.ModelBinding;
@@ -42,7 +40,7 @@ public NotificationResultFilter(ILayoutAccessor layoutAccessor,
 
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
-        if (context.Result is not (ViewResult or PageResult)
+        if (!context.IsViewOrPageResult()
             || !await _authorizationService.AuthorizeAsync(context.HttpContext.User, NotificationPermissions.ManageNotifications))
         {
             await next();

src/OrchardCore.Modules/OrchardCore.ReCaptcha/ReCaptchaLoginFilter.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Entities;
@@ -33,7 +31,7 @@ public ReCaptchaLoginFilter(
 
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
-            if (!(context.Result is ViewResult || context.Result is PageResult)
+            if (!context.IsViewOrPageResult()
                 || !String.Equals("OrchardCore.Users", Convert.ToString(context.RouteData.Values["area"]), StringComparison.OrdinalIgnoreCase))
             {
                 await next();

src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/Extensions/ResultExecutingContextExtensions.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Microsoft.AspNetCore.Mvc.Filters;
+
+public static class ResultExecutingContextExtensions
+{
+    public static bool IsViewOrPageResult(this ResultExecutingContext context)
+        => context.Result is ViewResult or PageResult;
+}

src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyFilter.cs

@@ -131,7 +131,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, R
                 return;
             }
 
-            if (filterContext.Result is not ViewResult && filterContext.Result is not PageResult)
+            if (!filterContext.IsViewOrPageResult())
             {
                 await next();
                 return;