Make configuration simpler.

dgarciarubio · Nov 6, 2024 · f905293 · f905293
1 parent b700bf1
commit f905293
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 31 deletions.
diff --git a/AspNetCore.Examples.Auth.Api/AspNetCore.Examples.Auth.Api.csproj b/AspNetCore.Examples.Auth.Api/AspNetCore.Examples.Auth.Api.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0-rc.2.24474.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-rc.2.24474.3" />
     <PackageReference Include="Scalar.AspNetCore" Version="1.2.9" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
   </ItemGroup>
 
 </Project>
diff --git a/AspNetCore.Examples.Auth.Api/Extensions/AuthenticationExtensions.cs b/AspNetCore.Examples.Auth.Api/Extensions/AuthenticationExtensions.cs
@@ -6,17 +6,11 @@ public static class AuthenticationExtensions
 {
     public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
     {
-        var authConfig = configuration.GetSection("Authentication");
-        if (!authConfig.Exists())
-            return services;
+        var bearerConfig = configuration
+            .GetSection($"Authentication:{JwtBearerDefaults.AuthenticationScheme}");
 
-        var builder = services.AddAuthentication();
-
-        var bearerConfig = authConfig.GetSection(JwtBearerDefaults.AuthenticationScheme);
-        if (!bearerConfig.Exists())
-            return services;
-
-        return builder
+        return services
+            .AddAuthentication()
             .AddJwtBearer(bearerConfig.Bind)
             .Services;
     }

diff --git a/AspNetCore.Examples.Auth.Api/Extensions/OpenApiExtensions.cs b/AspNetCore.Examples.Auth.Api/Extensions/OpenApiExtensions.cs
@@ -25,18 +25,8 @@ public static IServiceCollection AddCustomOpenApi(this IServiceCollection servic
     public static WebApplication UseCustomOpenApi(this WebApplication app, IConfiguration configuration)
     {
         app.MapOpenApi();
-
-        var swaggerUIConfig = configuration.GetSection("OpenApi:SwaggerUI");
-        if (swaggerUIConfig.Exists())
-        {
-            app.UseSwaggerUI(swaggerUIConfig.Bind);
-        }
-
-        var scalarConfig = configuration.GetSection("OpenApi:Scalar");
-        if (scalarConfig.Exists())
-        {
-            app.MapScalarApiReference(scalarConfig.Bind);
-        }
+        app.UseSwaggerUI(configuration.GetSection("OpenApi:SwaggerUI").Bind);
+        app.MapScalarApiReference(configuration.GetSection("OpenApi:Scalar").Bind);
 
         return app;
     }

diff --git a/AspNetCore.Examples.Auth.Api/Program.cs b/AspNetCore.Examples.Auth.Api/Program.cs
@@ -11,7 +11,10 @@
 
 var app = builder.Build();
 
-app.UseCustomOpenApi(builder.Configuration);
+if (app.Environment.IsDevelopment())
+{
+    app.UseCustomOpenApi(builder.Configuration);
+}
 
 app.UseAuthentication();
 app.UseCustomAuthorization();

diff --git a/AspNetCore.Examples.Auth.Api/appsettings.Development.json b/AspNetCore.Examples.Auth.Api/appsettings.Development.json
@@ -0,0 +1,33 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "Authentication": {
+    "Bearer": {
+      "Authority": "https://demo.duendesoftware.com",
+      "Audience": "api"
+    }
+  },
+  "OpenApi": {
+    "SwaggerUI": {
+      "OAuthConfigObject": {
+        "ClientId": "interactive.public",
+        "ScopeSeparator": " ",
+        "UsePkceWithAuthorizationCodeGrant": true,
+        "Scopes": [ "api" ]
+      }
+    },
+    "Scalar": {
+      // Does not yet fully support OAuth 
+      "Authentication": {
+        "OAuth2": {
+          "ClientId": "interactive.public",
+          "Scopes": [ "api" ]
+        }
+      }
+    }
+  }
+}
diff --git a/AspNetCore.Examples.Auth.Api/appsettings.json b/AspNetCore.Examples.Auth.Api/appsettings.json
@@ -8,8 +8,8 @@
   "AllowedHosts": "*",
   "Authentication": {
     "Bearer": {
-      "Authority": "https://demo.duendesoftware.com",
-      "Audience": "api"
+      "Authority": "",
+      "Audience": ""
     }
   },
   "OpenApi": {
@@ -23,18 +23,18 @@
         ]
       },
       "OAuthConfigObject": {
-        "ClientId": "interactive.public",
-        "ScopeSeparator": " ",
+        "ClientId": "",
+        "ScopeSeparator": "",
         "UsePkceWithAuthorizationCodeGrant": true,
-        "Scopes": [ "api" ]
+        "Scopes": []
       }
     },
     "Scalar": {
       // Does not yet fully support OAuth 
       "Authentication": {
         "OAuth2": {
-          "ClientId": "interactive.public",
-          "Scopes": [ "api" ]
+          "ClientId": "",
+          "Scopes": [ "" ]
         }
       }
     }