Revert "Revert "Add cancellation token parameter to async feature management interfaces. (#131)" (#139)"

This reverts commit e531863.

Author: amerjusupovic

examples/ConsoleApp/FeatureFilters/AccountIdFilter.cs

@@ -6,6 +6,7 @@
 using Microsoft.FeatureManagement;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Consoto.Banking.AccountService.FeatureManagement
@@ -17,7 +18,7 @@ namespace Consoto.Banking.AccountService.FeatureManagement
     [FilterAlias("AccountId")]
     class AccountIdFilter : IContextualFeatureFilter<IAccountContext>
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureEvaluationContext, IAccountContext accountContext)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureEvaluationContext, IAccountContext accountContext, CancellationToken _)
         {
             if (string.IsNullOrEmpty(accountContext?.AccountId))
             {

examples/ConsoleApp/Program.cs

@@ -8,6 +8,7 @@
 using Microsoft.FeatureManagement.FeatureFilters;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Consoto.Banking.AccountService
@@ -58,7 +59,7 @@ public static async Task Main(string[] args)
                         AccountId = account
                     };
 
-                    bool enabled = await featureManager.IsEnabledAsync(FeatureName, accountServiceContext);
+                    bool enabled = await featureManager.IsEnabledAsync(FeatureName, accountServiceContext, CancellationToken.None);
 
                     //
                     // Output results

examples/FeatureFlagDemo/BrowserFilter.cs

@@ -6,6 +6,7 @@
 using Microsoft.FeatureManagement;
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FeatureFlagDemo.FeatureManagement.FeatureFilters
@@ -23,7 +24,7 @@ public BrowserFilter(IHttpContextAccessor httpContextAccessor)
             _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
         }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
         {
             BrowserFilterSettings settings = context.Parameters.Get<BrowserFilterSettings>() ?? new BrowserFilterSettings();
 

examples/FeatureFlagDemo/Controllers/HomeController.cs

@@ -8,6 +8,7 @@
 using Microsoft.FeatureManagement;
 using Microsoft.FeatureManagement.Mvc;
 using System.Threading.Tasks;
+using System.Threading;
 
 namespace FeatureFlagDemo.Controllers
 {
@@ -26,11 +27,11 @@ public IActionResult Index()
             return View();
         }
 
-        public async Task<IActionResult> About()
+        public async Task<IActionResult> About(CancellationToken cancellationToken)
         {
             ViewData["Message"] = "Your application description page.";
 
-            if (await _featureManager.IsEnabledAsync(nameof(MyFeatureFlags.CustomViewData)))
+            if (await _featureManager.IsEnabledAsync(nameof(MyFeatureFlags.CustomViewData), cancellationToken))
             {
                 ViewData["Message"] = $"This is FANCY CONTENT you can see only if '{nameof(MyFeatureFlags.CustomViewData)}' is enabled.";
             };

examples/FeatureFlagDemo/HttpContextTargetingContextAccessor.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FeatureFlagDemo
@@ -23,7 +24,7 @@ public HttpContextTargetingContextAccessor(IHttpContextAccessor httpContextAcces
             _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
         }
 
-        public ValueTask<TargetingContext> GetContextAsync()
+        public ValueTask<TargetingContext> GetContextAsync(CancellationToken _)
         {
             HttpContext httpContext = _httpContextAccessor.HttpContext;
 

examples/FeatureFlagDemo/SuperUserFilter.cs

@@ -2,13 +2,14 @@
 // Licensed under the MIT license.
 //
 using Microsoft.FeatureManagement;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FeatureFlagDemo.FeatureManagement.FeatureFilters
 {
     public class SuperUserFilter : IFeatureFilter
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
         {
             return Task.FromResult(false);
         }

examples/TargetingConsoleApp/Program.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Consoto.Banking.HelpDesk
@@ -62,7 +63,7 @@ public static async Task Main(string[] args)
                         Groups = user.Groups
                     };
 
-                    bool enabled = await featureManager.IsEnabledAsync(FeatureName, targetingContext);
+                    bool enabled = await featureManager.IsEnabledAsync(FeatureName, targetingContext, CancellationToken.None);
 
                     //
                     // Output results

src/Microsoft.FeatureManagement.AspNetCore/FeatureGateAttribute.cs

@@ -107,8 +107,8 @@ public override async Task OnActionExecutionAsync(ActionExecutingContext context
             //
             // Enabled state is determined by either 'any' or 'all' features being enabled.
             bool enabled = RequirementType == RequirementType.All ?
-                             await Features.All(async feature => await fm.IsEnabledAsync(feature).ConfigureAwait(false)) :
-                             await Features.Any(async feature => await fm.IsEnabledAsync(feature).ConfigureAwait(false));
+                             await Features.All(async feature => await fm.IsEnabledAsync(feature, context.HttpContext.RequestAborted).ConfigureAwait(false)).ConfigureAwait(false) :
+                             await Features.Any(async feature => await fm.IsEnabledAsync(feature, context.HttpContext.RequestAborted).ConfigureAwait(false)).ConfigureAwait(false);
 
             if (enabled)
             {

src/Microsoft.FeatureManagement.AspNetCore/FeatureGatedAsyncActionFilter.cs

@@ -30,7 +30,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
         {
             IFeatureManager featureManager = context.HttpContext.RequestServices.GetRequiredService<IFeatureManagerSnapshot>();
 
-            if (await featureManager.IsEnabledAsync(FeatureName).ConfigureAwait(false))
+            if (await featureManager.IsEnabledAsync(FeatureName, context.HttpContext.RequestAborted).ConfigureAwait(false))
             {
                 IServiceProvider serviceProvider = context.HttpContext.RequestServices.GetRequiredService<IServiceProvider>();
 

src/Microsoft.FeatureManagement.AspNetCore/TagHelpers/FeatureTagHelper.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.FeatureManagement.Mvc.TagHelpers
@@ -55,8 +56,8 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
                 IEnumerable<string> names = Name.Split(',').Select(n => n.Trim());
 
                 enabled = Requirement == RequirementType.All ?
-                    await names.All(async n => await _featureManager.IsEnabledAsync(n).ConfigureAwait(false)) :
-                    await names.Any(async n => await _featureManager.IsEnabledAsync(n).ConfigureAwait(false));
+                    await names.All(async n => await _featureManager.IsEnabledAsync(n, CancellationToken.None).ConfigureAwait(false)).ConfigureAwait(false) :
+                    await names.Any(async n => await _featureManager.IsEnabledAsync(n, CancellationToken.None).ConfigureAwait(false)).ConfigureAwait(false);
             }
 
             if (Negate)