Shuffle some openapi and authentication config around

Kishotta · May 27, 2024 · 3573322 · 3573322
1 parent ade94b6
commit 3573322
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/Evently/Api/Evently.Api/Program.cs b/src/Evently/Api/Evently.Api/Program.cs
@@ -34,8 +34,6 @@
     .AddRedis(cacheConnectionString)
     .AddUrlGroup(new Uri(keycloakHealthUrl), HttpMethod.Get, "Keycloak");
 
-builder.Services.AddOpenApi();
-
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment())

diff --git a/src/Evently/Common/Evently.Common.Infrastructure/Authentication/AuthenticationExtensions.cs b/src/Evently/Common/Evently.Common.Infrastructure/Authentication/AuthenticationExtensions.cs
@@ -6,8 +6,6 @@ internal static class AuthenticationExtensions
 {
     internal static IServiceCollection AddAuthenticationInternal(this IServiceCollection services)
     {
-        services.AddAuthorization();
-
         services.AddAuthentication().AddJwtBearer();
 
         services.AddHttpContextAccessor();

diff --git a/src/Evently/Common/Evently.Common.Infrastructure/Authorization/AuthorizationExtensions.cs b/src/Evently/Common/Evently.Common.Infrastructure/Authorization/AuthorizationExtensions.cs
@@ -8,6 +8,8 @@ internal static class AuthorizationExtensions
 {
     internal static IServiceCollection AddAuthorizationInternal(this IServiceCollection services)
     {
+        services.AddAuthorization();
+
         services.AddTransient<IClaimsTransformation, CustomClaimsTransformation>();
         services.AddTransient<IAuthorizationHandler, PermissionAuthorizationHandler>();
         services.AddTransient<IAuthorizationPolicyProvider, PermissionAuthorizationPolicyProvider>();

diff --git a/src/Evently/Common/Evently.Common.Infrastructure/InfrastructureConfiguration.cs b/src/Evently/Common/Evently.Common.Infrastructure/InfrastructureConfiguration.cs
@@ -26,8 +26,8 @@ public static IServiceCollection AddInfrastructure(
         string databaseConnectionString,
         string cacheConnectionString)
     {
-        services.AddAuthenticationInternal();
         services.AddAuthorizationInternal();
+        services.AddAuthenticationInternal();
 
         services.AddAuditing();