refactor configuration logic

DavidEggenberger · Oct 26, 2024 · 7f45343 · 7f45343
1 parent dceac27
commit 7f45343
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 61 deletions.
diff --git a/...Modules/Subscriptions/Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs b/...Modules/Subscriptions/Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs
@@ -1,10 +1,10 @@
 using Modules.Subscriptions.Features.Infrastructure.StripePayments;
-using Shared.Features.Modules.Configuration;
+using Shared.Features.Configuration;
 using Shared.Kernel.BuildingBlocks.Auth;
 
 namespace Modules.Subscriptions.Features.Infrastructure.Configuration
 {
-    public class SubscriptionsConfiguration : IModuleConfiguration
+    public class SubscriptionsConfiguration : ConfigurationObject
     {
         public string StripeAPIKey { get; set; }
         public string StripeEndpointSecret { get; set; }

diff --git a/...ubscriptions/Features/Infrastructure/Configuration/SubscriptionsConfigurationValidator.cs b/...ubscriptions/Features/Infrastructure/Configuration/SubscriptionsConfigurationValidator.cs
@@ -1,10 +1,11 @@
 using Microsoft.Extensions.Options;
+using Shared.Features.Configuration;
 
 namespace Modules.Subscriptions.Features.Infrastructure.Configuration
 {
-    public class SubscriptionsConfigurationValidator : IValidateOptions<SubscriptionsConfiguration>
+    public class SubscriptionsConfigurationValidator : ConfigurationObjectValidator<SubscriptionsConfiguration>
     {
-        public ValidateOptionsResult Validate(string name, SubscriptionsConfiguration options)
+        public override ValidateOptionsResult Validate(string name, SubscriptionsConfiguration options)
         {
             if (string.IsNullOrEmpty(options.StripeProfessionalPlanPriceId))
             {

diff --git a/Source/Modules/Subscriptions/Web/Server/SubscriptionsModuleStartup.cs b/Source/Modules/Subscriptions/Web/Server/SubscriptionsModuleStartup.cs
@@ -4,9 +4,9 @@
 using Microsoft.Extensions.Hosting;
 using Modules.Subscriptions.Features.Infrastructure.Configuration;
 using Modules.Subscriptions.Features.Infrastructure.EFCore;
+using Shared.Features.Configuration;
 using Shared.Features.EFCore;
 using Shared.Features.Modules;
-using Shared.Features.Modules.Configuration;
 using Stripe;
 
 namespace Modules.Subscriptions.Server
@@ -16,7 +16,7 @@ public class SubscriptionsModuleStartup : IModuleStartup
         public void ConfigureServices(IServiceCollection services, IConfiguration config)
         {
             services.RegisterDbContext<SubscriptionsDbContext>();
-            services.RegisterModuleConfiguration<SubscriptionsConfiguration, SubscriptionsConfigurationValidator>(config);
+            services.RegisterConfiguration<SubscriptionsConfiguration, SubscriptionsConfigurationValidator>(config);
 
             StripeConfiguration.ApiKey = services.BuildServiceProvider().GetRequiredService<SubscriptionsConfiguration>().StripeAPIKey;
         }

diff --git a/...dules/TenantIdentity/Features/Infrastructure/Configuration/TenantIdentityConfiguration.cs b/...dules/TenantIdentity/Features/Infrastructure/Configuration/TenantIdentityConfiguration.cs
@@ -1,8 +1,8 @@
-using Shared.Features.Modules.Configuration;
+using Shared.Features.Configuration;
 
 namespace Modules.TenantIdentity.Features.Infrastructure.Configuration
 {
-    public class TenantIdentityConfiguration : IModuleConfiguration
+    public class TenantIdentityConfiguration : ConfigurationObject
     {
         public string GoogleClientId { get; set; }
         public string GoogleClientSecret { get; set; }

diff --git a/...antIdentity/Features/Infrastructure/Configuration/TenantIdentityConfigurationValidator.cs b/...antIdentity/Features/Infrastructure/Configuration/TenantIdentityConfigurationValidator.cs
@@ -1,10 +1,11 @@
 using Microsoft.Extensions.Options;
+using Shared.Features.Configuration;
 
 namespace Modules.TenantIdentity.Features.Infrastructure.Configuration
 {
-    public class TenantIdentityConfigurationValidator : IValidateOptions<TenantIdentityConfiguration>
+    public class TenantIdentityConfigurationValidator : ConfigurationObjectValidator<TenantIdentityConfiguration>
     {
-        public ValidateOptionsResult Validate(string name, TenantIdentityConfiguration tenantIdentityConfiguration)
+        public override ValidateOptionsResult Validate(string name, TenantIdentityConfiguration tenantIdentityConfiguration)
         {
             if (string.IsNullOrEmpty(tenantIdentityConfiguration.GoogleClientId))
             {

diff --git a/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs b/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs
@@ -17,7 +17,7 @@
 using Modules.TenantIdentity.Features.Infrastructure.Configuration;
 using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate;
 using Shared.Features.EFCore;
-using Shared.Features.Modules.Configuration;
+using Shared.Features.Configuration;
 
 namespace Modules.TenantIdentity.Server
 {
@@ -28,7 +28,7 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
             services.AddSingleton<OpenIdConnectPostConfigureOptions>();
             services.AddScoped<ContextUserClaimsPrincipalFactory<ApplicationUser>>();
 
-            services.RegisterModuleConfiguration<TenantIdentityConfiguration, TenantIdentityConfigurationValidator>(configuration);
+            services.RegisterConfiguration<TenantIdentityConfiguration, TenantIdentityConfigurationValidator>(configuration);
 
             services.Configure<SecurityStampValidatorOptions>(options =>
             {

diff --git a/Source/Shared/Features/Configuration/ConfigurationObject.cs b/Source/Shared/Features/Configuration/ConfigurationObject.cs
@@ -0,0 +1,6 @@
+namespace Shared.Features.Configuration
+{
+    public class ConfigurationObject
+    {
+    }
+}
diff --git a/Source/Shared/Features/Configuration/ConfigurationObjectValidator.cs b/Source/Shared/Features/Configuration/ConfigurationObjectValidator.cs
@@ -0,0 +1,9 @@
+using Microsoft.Extensions.Options;
+
+namespace Shared.Features.Configuration
+{
+    public abstract class ConfigurationObjectValidator<TConfiguration> : IValidateOptions<TConfiguration> where TConfiguration : ConfigurationObject
+    {
+        public abstract ValidateOptionsResult Validate(string name, TConfiguration options);
+    }
+}
diff --git a/Source/Shared/Features/Configuration/Registrator.cs b/Source/Shared/Features/Configuration/Registrator.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Shared.Features.Configuration
+{
+    public static class Registrator
+    {
+        public static IServiceCollection RegisterConfiguration<TConfiguration>(this IServiceCollection services, IConfiguration configuration) where TConfiguration : ConfigurationObject, new()
+        {
+            services.AddScoped(sp =>
+            {
+                TConfiguration tc = new TConfiguration();
+                configuration.GetSection(typeof(TConfiguration).Name).Bind(tc);
+                return tc;
+            });
+            services.Configure<TConfiguration>(configuration.GetSection(nameof(TConfiguration)));
+
+            return services;
+        }
+
+        public static IServiceCollection RegisterConfiguration<TConfiguration, TConfigurationValidator>(this IServiceCollection services, IConfiguration configuration) 
+            where TConfiguration : ConfigurationObject, new() 
+            where TConfigurationValidator : ConfigurationObjectValidator<TConfiguration>, new()
+        {
+            services.AddScoped(sp =>
+            {
+                TConfiguration tc = new TConfiguration();
+                configuration.GetSection(typeof(TConfiguration).Name).Bind(tc);
+                return tc;
+            });
+            services.Configure<TConfiguration>(configuration.GetSection(nameof(TConfiguration)));
+            services.AddSingleton<IValidateOptions<TConfiguration>, TConfigurationValidator>();
+
+            return services;
+        }
+    }
+}
diff --git a/Source/Shared/Features/EFCore/Configuration/EFCoreConfiguration.cs b/Source/Shared/Features/EFCore/Configuration/EFCoreConfiguration.cs
@@ -1,8 +1,8 @@
-using Shared.Features.Modules.Configuration;
+using Shared.Features.Configuration;
 
 namespace Shared.Features.EFCore.Configuration
 {
-    public class EFCoreConfiguration : IModuleConfiguration
+    public class EFCoreConfiguration : ConfigurationObject
     {
         public string SQLServerConnectionString_Dev { get; set; }
         public string SQLServerConnectionString_Prod { get; set; }

diff --git a/Source/Shared/Features/EFCore/Configuration/EFCoreConfigurationValidator.cs b/Source/Shared/Features/EFCore/Configuration/EFCoreConfigurationValidator.cs
@@ -1,10 +1,11 @@
 using Microsoft.Extensions.Options;
+using Shared.Features.Configuration;
 
 namespace Shared.Features.EFCore.Configuration
 {
-    internal class EFCoreConfigurationValidator : IValidateOptions<EFCoreConfiguration>
+    internal class EFCoreConfigurationValidator : ConfigurationObjectValidator<EFCoreConfiguration>
     {
-        public ValidateOptionsResult Validate(string name, EFCoreConfiguration efCoreConfiguration)
+        public override ValidateOptionsResult Validate(string name, EFCoreConfiguration efCoreConfiguration)
         {
             if (string.IsNullOrEmpty(efCoreConfiguration.SQLServerConnectionString_Dev))
             {

diff --git a/Source/Shared/Features/EFCore/Registrator.cs b/Source/Shared/Features/EFCore/Registrator.cs
@@ -1,17 +1,17 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Shared.Features.Configuration;
 using Shared.Features.EFCore.Configuration;
 using Shared.Features.EFCore.DbUp;
-using Shared.Features.Modules.Configuration;
 
 namespace Shared.Features.EFCore
 {
     public static class Registrator
     {
         public static IServiceCollection AddEFCore(this IServiceCollection services, IConfiguration configuration)
         {
-            services.RegisterModuleConfiguration<EFCoreConfiguration, EFCoreConfigurationValidator>(configuration);
+            services.RegisterConfiguration<EFCoreConfiguration, EFCoreConfigurationValidator>(configuration);
             services.AddScoped<TransactionScopeMiddleware>();
             services.AddDbUpMigration();
 

diff --git a/Source/Shared/Features/Modules/Configuration/IModuleConfiguration.cs b/Source/Shared/Features/Modules/Configuration/IModuleConfiguration.cs
diff --git a/Source/Shared/Features/Modules/Configuration/Registrator.cs b/Source/Shared/Features/Modules/Configuration/Registrator.cs