Refactor BaseUnitTest to improve dependency injection setup

FeatureMasterX.XUnitTest/BaseUnitTest.cs

@@ -23,7 +23,11 @@
         public Task DisposeAsync() =>
             Task.CompletedTask;
 
+        /// <summary>
+        /// Initialize the test class.
+        /// </summary>
+        /// <returns></returns>
         public async Task InitializeAsync()
         {
             _instance = CreateServiceCollection();
 

FeatureMasterX/FeatureMasterX.csproj

@@ -14,10 +14,12 @@
 		<PackageProjectUrl>https://github.com/SkJonko/FeatureMasterX</PackageProjectUrl>
 		<Title>FeatureMasterX</Title>
 		<Description>A powerful and easy-to-use extension for Microsoft's FeatureManagement library</Description>
-		<Version>9.0.1</Version>
+		<Version>9.0.2</Version>
 		<Authors>SKJonko</Authors>
 		<Copyright>Copyright © 2025</Copyright>
 		<PackageReleaseNotes>
+			9.0.2
+			- Feature: Add Scoped Dependency Injection of FeatureMasterX
 			9.0.1
 			- Feature: Multitargets
 			9.0.0

FeatureMasterX/FeatureMasterXExtensions.cs

@@ -1,18 +1,35 @@
 using FeatureMasterX.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.FeatureManagement;
+using System.Diagnostics.CodeAnalysis;
 
 namespace FeatureMasterX
 {
+    /// <summary>
+    /// Extensions for FeatureMasterX.
+    /// </summary>
     public static class FeatureMasterXExtensions
     {
         #region PUBLIC
 
+        /// <summary>
+        /// The name of the feature filter that checks if the user is in a list of allowed users.
+        /// </summary>
         public const string ListCheck = "ListCheck";
+
+        /// <summary>
+        /// The name of the configuration key that contains the list of allowed users.
+        /// </summary>
         public const string AllowedUsers = "AllowedUsers";
 
         #endregion
 
+        /// <summary>
+        /// Adds the FeatureMasterX services to the specified <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        [ExcludeFromCodeCoverage]
         public static IServiceCollection AddFeatureMasterX(this IServiceCollection services)
         {
             services.AddSingleton<IFeatureDefinitionProvider, ListCheckFeatureFilterProvider>()
@@ -21,5 +38,20 @@ public static IServiceCollection AddFeatureMasterX(this IServiceCollection servi
 
             return services;
         }
+
+        /// <summary>
+        /// Adds the Scoped FeatureMasterX services to the specified <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        [ExcludeFromCodeCoverage]
+        public static IServiceCollection AddScopedFeatureMasterX(this IServiceCollection services)
+        {
+            services.AddSingleton<IFeatureDefinitionProvider, ListCheckFeatureFilterProvider>()
+                    .AddScopedFeatureManagement()
+                    .AddFeatureFilter<ListCheckFeatureFilter>();
+
+            return services;
+        }
     }
 }

FeatureMasterX/Filters/ListCheckFeatureFilter.cs

@@ -14,19 +14,19 @@
         /// Evaluate the feature filter
         /// </summary>
         /// <param name="context"></param>
-        /// <param name="userEmail"></param>
+        /// <param name="appsettingsData">The data that stored under the EnabledFor of appsettings.</param>
         /// <returns></returns>
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, string userEmail)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, string appsettingsData)
         {
             var allowedUsers = JsonSerializer.Deserialize<List<string>>(context?.Parameters?.GetSection(FeatureMasterXExtensions.AllowedUsers)?.Get<string>());
 
             if (allowedUsers?.Contains("ALL") ?? false)
                 return Task.FromResult(true);
 
-            if (string.IsNullOrEmpty(userEmail))
+            if (string.IsNullOrEmpty(appsettingsData))
                 return Task.FromResult(false);
 
-            if (allowedUsers?.Contains(userEmail) ?? false)
+            if (allowedUsers?.Contains(appsettingsData) ?? false)
                 return Task.FromResult(true);
 
             return Task.FromResult(false);

FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs

@@ -4,6 +4,9 @@
 
 namespace FeatureMasterX.Filters
 {
+    /// <summary>
+    /// Provides a feature filter that checks if the user is in a list of allowed users.
+    /// </summary>
     public class ListCheckFeatureFilterProvider : IFeatureDefinitionProvider
     {
         #region Private Values
@@ -23,6 +26,7 @@ public ListCheckFeatureFilterProvider(IConfiguration configuration)
             _configuration = configuration;
         }
 
+        /// <inheritdoc/>
         public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
         {
             var section = _configuration.GetSection($"FeatureManagement:{FeatureMasterXExtensions.ListCheck}:{featureName}:EnabledFor");
@@ -32,7 +36,7 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
             return Task.FromResult(new FeatureDefinition
             {
                 Name = featureName,
-                EnabledFor = allowedUsers.Select(user => new FeatureFilterConfiguration
+                EnabledFor = [.. allowedUsers.Select(user => new FeatureFilterConfiguration
                 {
                     Name = FeatureMasterXExtensions.ListCheck,
                     Parameters = new ConfigurationBuilder()
@@ -41,11 +45,14 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
                             { FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
                         })
                         .Build()
-                }).ToList()
+                })]
             });
         }
 
+        /// <inheritdoc/>
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
         public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
         {
             var featureManagementSection = _configuration.GetSection("FeatureManagement");
 
@@ -58,7 +65,7 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
                 yield return new FeatureDefinition
                 {
                     Name = feature.Key,
-                    EnabledFor = allowedUsers.Select(user => new FeatureFilterConfiguration
+                    EnabledFor = [.. allowedUsers.Select(user => new FeatureFilterConfiguration
                     {
                         Name = FeatureMasterXExtensions.ListCheck,
                         Parameters = new ConfigurationBuilder()
@@ -67,7 +74,7 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
                                 { FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
                             })
                         .Build()
-                    }).ToList()
+                    })]
                 };
             }
         }