From 7f6ba7b769d7f233402c3c70a54a607669d48bf3 Mon Sep 17 00:00:00 2001 From: Jonathan Bourdon Date: Mon, 13 Jan 2025 23:17:53 -0500 Subject: [PATCH] Changed the module injection pattern --- .../Features/Contents/DependencyInjection.cs | 10 +++---- .../Features/Messages/DependencyInjection.cs | 10 +++---- src/Web/Features/Users/DependencyInjection.cs | 26 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Web/Features/Contents/DependencyInjection.cs b/src/Web/Features/Contents/DependencyInjection.cs index cbb16d3..c92c791 100644 --- a/src/Web/Features/Contents/DependencyInjection.cs +++ b/src/Web/Features/Contents/DependencyInjection.cs @@ -4,13 +4,13 @@ namespace Hutopy.Web.Features.Contents; public static class DependencyInjection { - public static IServiceCollection AddContentModule( - this IServiceCollection services, + public static WebApplicationBuilder AddContentModule( + this WebApplicationBuilder builder, Action? configureAction = null) { - services.AddDbContext(configureAction); - services.AddScoped(); + builder.Services.AddDbContext(configureAction); + builder.Services.AddScoped(); - return services; + return builder; } } diff --git a/src/Web/Features/Messages/DependencyInjection.cs b/src/Web/Features/Messages/DependencyInjection.cs index 67ff59b..f75c425 100644 --- a/src/Web/Features/Messages/DependencyInjection.cs +++ b/src/Web/Features/Messages/DependencyInjection.cs @@ -4,13 +4,13 @@ namespace Hutopy.Web.Features.Messages; public static class DependencyInjection { - public static IServiceCollection AddMessagingModule( - this IServiceCollection services, + public static WebApplicationBuilder AddMessagingModule( + this WebApplicationBuilder builder, Action? configureAction = null) { - services.AddDbContext(configureAction); - services.AddScoped(); + builder.Services.AddDbContext(configureAction); + builder.Services.AddScoped(); - return services; + return builder; } } diff --git a/src/Web/Features/Users/DependencyInjection.cs b/src/Web/Features/Users/DependencyInjection.cs index 0d1bd0c..0ac396f 100644 --- a/src/Web/Features/Users/DependencyInjection.cs +++ b/src/Web/Features/Users/DependencyInjection.cs @@ -7,22 +7,22 @@ namespace Hutopy.Web.Features.Users; public static class DependencyInjection { - public static IServiceCollection AddUsersModule( - this IServiceCollection services, + public static WebApplicationBuilder AddIdentityModule( + this WebApplicationBuilder builder, Action? configureAction = null) { - services.AddDbContext(configureAction); - services.AddScoped(); + builder.Services.AddDbContext(configureAction); + builder.Services.AddScoped(); - services.AddDbContext(configureAction); - services.AddScoped(); + builder.Services.AddDbContext(configureAction); + builder.Services.AddScoped(); - services.AddAuthentication() + builder.Services.AddAuthentication() .AddBearerToken(IdentityConstants.BearerScheme); - services.AddAuthorizationBuilder(); + builder.Services.AddAuthorizationBuilder(); - services + builder.Services .AddIdentityCore() .AddUserManager() .AddRoles() @@ -32,12 +32,12 @@ public static class DependencyInjection .AddDefaultTokenProviders(); // Singleton services - services.AddSingleton(TimeProvider.System); - services.AddSingleton(); + builder.Services.AddSingleton(TimeProvider.System); + builder.Services.AddSingleton(); // Scoped services - services.AddScoped(); + builder.Services.AddScoped(); - return services; + return builder; } }