Add Setting/Feature definition contributors to app modules; remove stub value providers

Hongwei-MB · Hongwei-MB · commit 67bfb5e7362a · 2026-04-21T13:58:13.000+08:00
- Identity: 5 settings (password policy, lockout) + 1 feature (user registration)
- TenantManagement: 1 feature (max tenants)
- AuditLogging: 1 setting (retention days) + 1 feature (enable audit logging)
- Wire all contributors via DI in ServiceCollectionExtensions
- Add Settings project reference to Identity.Application and AuditLogging.Application
- Remove 6 stub value providers (Global/Tenant/User for both Settings and Features)
- Remove TryAddEnumerable registrations from framework DI extensions
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingFeatureDefinitionContributor.cs b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingFeatureDefinitionContributor.cs
@@ -0,0 +1,13 @@
+using ChengYuan.Features;
+
+namespace ChengYuan.AuditLogging;
+
+internal sealed class AuditLoggingFeatureDefinitionContributor : IFeatureDefinitionContributor
+{
+    public void Define(IFeatureDefinitionContext context)
+    {
+        var group = context.AddGroup(AuditLoggingFeatures.GroupName, "Audit Logging");
+
+        group.AddFeature<bool>(AuditLoggingFeatures.EnableAuditLogging, true, "Enable audit logging");
+    }
+}
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingServiceCollectionExtensions.cs b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingServiceCollectionExtensions.cs
@@ -1,5 +1,7 @@
 using ChengYuan.Auditing;
 using ChengYuan.Authorization;
+using ChengYuan.Features;
+using ChengYuan.Settings;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -11,6 +13,8 @@ public static IServiceCollection AddAuditLogging(this IServiceCollection service
     {
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IAuditLogSink, AuditLogStoreSink>());
         services.AddTransient<IPermissionDefinitionContributor, AuditLoggingPermissionDefinitionContributor>();
+        services.AddTransient<ISettingDefinitionContributor, AuditLoggingSettingDefinitionContributor>();
+        services.AddTransient<IFeatureDefinitionContributor, AuditLoggingFeatureDefinitionContributor>();
         return services;
     }
 
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingSettingDefinitionContributor.cs b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/AuditLoggingSettingDefinitionContributor.cs
@@ -0,0 +1,13 @@
+using ChengYuan.Settings;
+
+namespace ChengYuan.AuditLogging;
+
+internal sealed class AuditLoggingSettingDefinitionContributor : ISettingDefinitionContributor
+{
+    public void Define(ISettingDefinitionContext context)
+    {
+        var group = context.AddGroup(AuditLoggingSettings.GroupName, "Audit Logging");
+
+        group.AddSetting<int>(AuditLoggingSettings.RetentionDays, 90, "Audit log retention (days)");
+    }
+}
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/ChengYuan.AuditLogging.Application.csproj b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/ChengYuan.AuditLogging.Application.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Framework\Core\ChengYuan.Core.csproj" />
     <ProjectReference Include="..\..\..\Framework\Authorization\ChengYuan.Authorization\ChengYuan.Authorization.csproj" />
+    <ProjectReference Include="..\..\..\Framework\Settings\ChengYuan.Settings\ChengYuan.Settings.csproj" />
     <ProjectReference Include="..\ChengYuan.AuditLogging.Contracts\ChengYuan.AuditLogging.Contracts.csproj" />
     <ProjectReference Include="..\..\..\Framework\Auditing\ChengYuan.Auditing\ChengYuan.Auditing.csproj" />
   </ItemGroup>
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/packages.lock.json b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Application/packages.lock.json
@@ -60,6 +60,14 @@
           "ChengYuan.ExecutionContext": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "CentralTransitive",
         "requested": "[10.0.5, )",
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Contracts/AuditLoggingFeatures.cs b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Contracts/AuditLoggingFeatures.cs
@@ -0,0 +1,8 @@
+namespace ChengYuan.AuditLogging;
+
+public static class AuditLoggingFeatures
+{
+    public const string GroupName = "AuditLogging";
+
+    public const string EnableAuditLogging = GroupName + ".EnableAuditLogging";
+}
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Contracts/AuditLoggingSettings.cs b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Contracts/AuditLoggingSettings.cs
@@ -0,0 +1,8 @@
+namespace ChengYuan.AuditLogging;
+
+public static class AuditLoggingSettings
+{
+    public const string GroupName = "AuditLogging";
+
+    public const string RetentionDays = GroupName + ".RetentionDays";
+}
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Persistence/packages.lock.json b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Persistence/packages.lock.json
@@ -269,7 +269,8 @@
           "ChengYuan.AuditLogging.Contracts": "[0.2.10-local, )",
           "ChengYuan.Auditing": "[0.2.10-local, )",
           "ChengYuan.Authorization": "[0.2.10-local, )",
-          "ChengYuan.Core": "[0.2.10-local, )"
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.Settings": "[0.2.10-local, )"
         }
       },
       "chengyuan.auditlogging.contracts": {
@@ -342,6 +343,14 @@
           "ChengYuan.ExecutionContext": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "Microsoft.EntityFrameworkCore": {
         "type": "CentralTransitive",
         "requested": "[10.0.5, )",
diff --git a/src/Applications/AuditLogging/ChengYuan.AuditLogging.Web/packages.lock.json b/src/Applications/AuditLogging/ChengYuan.AuditLogging.Web/packages.lock.json
@@ -243,7 +243,8 @@
           "ChengYuan.AuditLogging.Contracts": "[0.2.10-local, )",
           "ChengYuan.Auditing": "[0.2.10-local, )",
           "ChengYuan.Authorization": "[0.2.10-local, )",
-          "ChengYuan.Core": "[0.2.10-local, )"
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.Settings": "[0.2.10-local, )"
         }
       },
       "chengyuan.auditlogging.contracts": {
@@ -322,6 +323,14 @@
           "ChengYuan.Core": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "Microsoft.EntityFrameworkCore": {
         "type": "CentralTransitive",
         "requested": "[10.0.5, )",
diff --git a/src/Applications/Identity/ChengYuan.Identity.Application/ChengYuan.Identity.Application.csproj b/src/Applications/Identity/ChengYuan.Identity.Application/ChengYuan.Identity.Application.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Framework\Core\ChengYuan.Core.csproj" />
     <ProjectReference Include="..\..\..\Framework\Authorization\ChengYuan.Authorization\ChengYuan.Authorization.csproj" />
+    <ProjectReference Include="..\..\..\Framework\Settings\ChengYuan.Settings\ChengYuan.Settings.csproj" />
     <ProjectReference Include="..\ChengYuan.Identity.Contracts\ChengYuan.Identity.Contracts.csproj" />
     <ProjectReference Include="..\ChengYuan.Identity.Domain\ChengYuan.Identity.Domain.csproj" />
   </ItemGroup>
diff --git a/src/Applications/Identity/ChengYuan.Identity.Application/IdentityFeatureDefinitionContributor.cs b/src/Applications/Identity/ChengYuan.Identity.Application/IdentityFeatureDefinitionContributor.cs
@@ -0,0 +1,13 @@
+using ChengYuan.Features;
+
+namespace ChengYuan.Identity;
+
+internal sealed class IdentityFeatureDefinitionContributor : IFeatureDefinitionContributor
+{
+    public void Define(IFeatureDefinitionContext context)
+    {
+        var group = context.AddGroup(IdentityFeatures.GroupName, "Identity");
+
+        group.AddFeature<bool>(IdentityFeatures.EnableUserRegistration, true, "Enable user registration");
+    }
+}
diff --git a/src/Applications/Identity/ChengYuan.Identity.Application/IdentityServiceCollectionExtensions.cs b/src/Applications/Identity/ChengYuan.Identity.Application/IdentityServiceCollectionExtensions.cs
@@ -1,5 +1,7 @@
 using ChengYuan.Authorization;
 using ChengYuan.Core.DependencyInjection;
+using ChengYuan.Features;
+using ChengYuan.Settings;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ChengYuan.Identity;
@@ -12,6 +14,8 @@ public static IServiceCollection AddIdentityApplication(this IServiceCollection
 
         services.AddConventionalServices(typeof(IdentityServiceCollectionExtensions).Assembly);
         services.AddTransient<IPermissionDefinitionContributor, IdentityPermissionDefinitionContributor>();
+        services.AddTransient<ISettingDefinitionContributor, IdentitySettingDefinitionContributor>();
+        services.AddTransient<IFeatureDefinitionContributor, IdentityFeatureDefinitionContributor>();
 
         return services;
     }
diff --git a/src/Applications/Identity/ChengYuan.Identity.Application/IdentitySettingDefinitionContributor.cs b/src/Applications/Identity/ChengYuan.Identity.Application/IdentitySettingDefinitionContributor.cs
@@ -0,0 +1,17 @@
+using ChengYuan.Settings;
+
+namespace ChengYuan.Identity;
+
+internal sealed class IdentitySettingDefinitionContributor : ISettingDefinitionContributor
+{
+    public void Define(ISettingDefinitionContext context)
+    {
+        var group = context.AddGroup(IdentitySettings.GroupName, "Identity");
+
+        group.AddSetting<int>(IdentitySettings.PasswordMinLength, 6, "Password minimum length");
+        group.AddSetting<bool>(IdentitySettings.PasswordRequireDigit, true, "Password requires digit");
+        group.AddSetting<bool>(IdentitySettings.PasswordRequireUppercase, true, "Password requires uppercase");
+        group.AddSetting<int>(IdentitySettings.LockoutMaxAttempts, 5, "Lockout max failed attempts");
+        group.AddSetting<int>(IdentitySettings.LockoutDurationMinutes, 15, "Lockout duration (minutes)");
+    }
+}
diff --git a/src/Applications/Identity/ChengYuan.Identity.Application/packages.lock.json b/src/Applications/Identity/ChengYuan.Identity.Application/packages.lock.json
@@ -62,6 +62,14 @@
           "ChengYuan.ExecutionContext": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "CentralTransitive",
         "requested": "[10.0.5, )",
diff --git a/src/Applications/Identity/ChengYuan.Identity.Contracts/IdentityFeatures.cs b/src/Applications/Identity/ChengYuan.Identity.Contracts/IdentityFeatures.cs
@@ -0,0 +1,8 @@
+namespace ChengYuan.Identity;
+
+public static class IdentityFeatures
+{
+    public const string GroupName = "Identity";
+
+    public const string EnableUserRegistration = GroupName + ".EnableUserRegistration";
+}
diff --git a/src/Applications/Identity/ChengYuan.Identity.Contracts/IdentitySettings.cs b/src/Applications/Identity/ChengYuan.Identity.Contracts/IdentitySettings.cs
@@ -0,0 +1,12 @@
+namespace ChengYuan.Identity;
+
+public static class IdentitySettings
+{
+    public const string GroupName = "Identity";
+
+    public const string PasswordMinLength = GroupName + ".Password.MinLength";
+    public const string PasswordRequireDigit = GroupName + ".Password.RequireDigit";
+    public const string PasswordRequireUppercase = GroupName + ".Password.RequireUppercase";
+    public const string LockoutMaxAttempts = GroupName + ".Lockout.MaxAttempts";
+    public const string LockoutDurationMinutes = GroupName + ".Lockout.DurationMinutes";
+}
diff --git a/src/Applications/Identity/ChengYuan.Identity.Persistence/packages.lock.json b/src/Applications/Identity/ChengYuan.Identity.Persistence/packages.lock.json
@@ -325,7 +325,8 @@
           "ChengYuan.Authorization": "[0.2.10-local, )",
           "ChengYuan.Core": "[0.2.10-local, )",
           "ChengYuan.Identity.Contracts": "[0.2.10-local, )",
-          "ChengYuan.Identity.Domain": "[0.2.10-local, )"
+          "ChengYuan.Identity.Domain": "[0.2.10-local, )",
+          "ChengYuan.Settings": "[0.2.10-local, )"
         }
       },
       "chengyuan.identity.contracts": {
@@ -345,6 +346,14 @@
           "ChengYuan.ExecutionContext": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "BCrypt.Net-Next": {
         "type": "CentralTransitive",
         "requested": "[4.0.3, )",
diff --git a/src/Applications/Identity/ChengYuan.Identity.Web/packages.lock.json b/src/Applications/Identity/ChengYuan.Identity.Web/packages.lock.json
@@ -355,7 +355,8 @@
           "ChengYuan.Authorization": "[0.2.10-local, )",
           "ChengYuan.Core": "[0.2.10-local, )",
           "ChengYuan.Identity.Contracts": "[0.2.10-local, )",
-          "ChengYuan.Identity.Domain": "[0.2.10-local, )"
+          "ChengYuan.Identity.Domain": "[0.2.10-local, )",
+          "ChengYuan.Settings": "[0.2.10-local, )"
         }
       },
       "chengyuan.identity.contracts": {
@@ -391,6 +392,14 @@
           "ChengYuan.Core": "[0.2.10-local, )"
         }
       },
+      "chengyuan.settings": {
+        "type": "Project",
+        "dependencies": {
+          "ChengYuan.Core": "[0.2.10-local, )",
+          "ChengYuan.ExecutionContext": "[0.2.10-local, )",
+          "ChengYuan.MultiTenancy": "[0.2.10-local, )"
+        }
+      },
       "BCrypt.Net-Next": {
         "type": "CentralTransitive",
         "requested": "[4.0.3, )",
diff --git a/src/Applications/TenantManagement/ChengYuan.TenantManagement.Application/TenantManagementFeatureDefinitionContributor.cs b/src/Applications/TenantManagement/ChengYuan.TenantManagement.Application/TenantManagementFeatureDefinitionContributor.cs
@@ -0,0 +1,13 @@
+using ChengYuan.Features;
+
+namespace ChengYuan.TenantManagement;
+
+internal sealed class TenantManagementFeatureDefinitionContributor : IFeatureDefinitionContributor
+{
+    public void Define(IFeatureDefinitionContext context)
+    {
+        var group = context.AddGroup(TenantManagementFeatures.GroupName, "Tenant Management");
+
+        group.AddFeature<int>(TenantManagementFeatures.MaxTenants, 0, "Maximum number of tenants (0 = unlimited)");
+    }
+}
diff --git a/src/Applications/TenantManagement/ChengYuan.TenantManagement.Application/TenantManagementServiceCollectionExtensions.cs b/src/Applications/TenantManagement/ChengYuan.TenantManagement.Application/TenantManagementServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using ChengYuan.Authorization;
+using ChengYuan.Features;
 using ChengYuan.MultiTenancy;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -11,6 +12,7 @@ public static IServiceCollection AddTenantManagement(this IServiceCollection ser
     {
         services.TryAddScoped<ITenantManager, TenantManager>();
         services.AddTransient<IPermissionDefinitionContributor, TenantManagementPermissionDefinitionContributor>();
+        services.AddTransient<IFeatureDefinitionContributor, TenantManagementFeatureDefinitionContributor>();
         return services;
     }
 
diff --git a/src/Applications/TenantManagement/ChengYuan.TenantManagement.Contracts/TenantManagementFeatures.cs b/src/Applications/TenantManagement/ChengYuan.TenantManagement.Contracts/TenantManagementFeatures.cs
@@ -0,0 +1,8 @@
+namespace ChengYuan.TenantManagement;
+
+public static class TenantManagementFeatures
+{
+    public const string GroupName = "TenantManagement";
+
+    public const string MaxTenants = GroupName + ".MaxTenants";
+}
diff --git a/src/Framework/Features/ChengYuan.Features/FeaturesServiceCollectionExtensions.cs b/src/Framework/Features/ChengYuan.Features/FeaturesServiceCollectionExtensions.cs
@@ -10,9 +10,6 @@ public static IServiceCollection AddFeatures(this IServiceCollection services)
     {
         services.TryAddSingleton<IFeatureDefinitionManager, DefaultFeatureDefinitionManager>();
         services.TryAddSingleton<IFeatureChecker, DefaultFeatureChecker>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IFeatureValueProvider, UserFeatureValueProvider>());
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IFeatureValueProvider, TenantFeatureValueProvider>());
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IFeatureValueProvider, GlobalFeatureValueProvider>());
 
         return services;
     }
diff --git a/src/Framework/Features/ChengYuan.Features/Providers/GlobalFeatureValueProvider.cs b/src/Framework/Features/ChengYuan.Features/Providers/GlobalFeatureValueProvider.cs
diff --git a/src/Framework/Features/ChengYuan.Features/Providers/TenantFeatureValueProvider.cs b/src/Framework/Features/ChengYuan.Features/Providers/TenantFeatureValueProvider.cs
diff --git a/src/Framework/Features/ChengYuan.Features/Providers/UserFeatureValueProvider.cs b/src/Framework/Features/ChengYuan.Features/Providers/UserFeatureValueProvider.cs
diff --git a/src/Framework/Settings/ChengYuan.Settings/Providers/GlobalSettingValueProvider.cs b/src/Framework/Settings/ChengYuan.Settings/Providers/GlobalSettingValueProvider.cs
diff --git a/src/Framework/Settings/ChengYuan.Settings/Providers/TenantSettingValueProvider.cs b/src/Framework/Settings/ChengYuan.Settings/Providers/TenantSettingValueProvider.cs
diff --git a/src/Framework/Settings/ChengYuan.Settings/Providers/UserSettingValueProvider.cs b/src/Framework/Settings/ChengYuan.Settings/Providers/UserSettingValueProvider.cs
diff --git a/src/Framework/Settings/ChengYuan.Settings/SettingsServiceCollectionExtensions.cs b/src/Framework/Settings/ChengYuan.Settings/SettingsServiceCollectionExtensions.cs
diff --git a/src/Hosts/CliHost/packages.lock.json b/src/Hosts/CliHost/packages.lock.json
diff --git a/src/Hosts/WebHost/packages.lock.json b/src/Hosts/WebHost/packages.lock.json
diff --git a/tests/ChengYuan.FrameworkKernel.Tests/packages.lock.json b/tests/ChengYuan.FrameworkKernel.Tests/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using ChengYuan.Auditing;`
`2`	`2`	`using ChengYuan.Authorization;`
	`3`	`+using ChengYuan.Features;`
	`4`	`+using ChengYuan.Settings;`
`3`	`5`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`6`	`using Microsoft.Extensions.DependencyInjection.Extensions;`
`5`	`7`
`@@ -11,6 +13,8 @@ public static IServiceCollection AddAuditLogging(this IServiceCollection service`
`11`	`13`	`{`
`12`	`14`	`services.TryAddEnumerable(ServiceDescriptor.Singleton<IAuditLogSink, AuditLogStoreSink>());`
`13`	`15`	`services.AddTransient<IPermissionDefinitionContributor, AuditLoggingPermissionDefinitionContributor>();`
	`16`	`+ services.AddTransient<ISettingDefinitionContributor, AuditLoggingSettingDefinitionContributor>();`
	`17`	`+ services.AddTransient<IFeatureDefinitionContributor, AuditLoggingFeatureDefinitionContributor>();`
`14`	`18`	`return services;`
`15`	`19`	`}`
`16`	`20`