code clean up

damienbod · Oct 24, 2024 · 5733ee0 · 5733ee0
1 parent c259c66
commit 5733ee0
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 73 deletions.
diff --git a/identityserver/HostingExtensions.cs b/identityserver/HostingExtensions.cs
@@ -1,79 +1,79 @@
-using Duende.IdentityServer;
-using IdentityServer.Data;
-using IdentityServer.Models;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.JsonWebTokens;
-using Microsoft.IdentityModel.Logging;
-using Serilog;
-
-namespace IdentityServer;
-
-internal static class HostingExtensions
-{
-    public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
-    {
-        JsonWebTokenHandler.DefaultInboundClaimTypeMap.Clear();
-
-        builder.Services.AddRazorPages();
-
-        builder.Services.AddDbContext<ApplicationDbContext>(options =>
-            options.UseSqlite(builder.Configuration.GetConnectionString("DefaultConnection")));
-
-        builder.Services.AddIdentity<ApplicationUser, IdentityRole>()
-            .AddEntityFrameworkStores<ApplicationDbContext>()
-            .AddDefaultTokenProviders();
-
-        builder.Services
-            .AddIdentityServer(options =>
-            {
-                options.Events.RaiseErrorEvents = true;
-                options.Events.RaiseInformationEvents = true;
-                options.Events.RaiseFailureEvents = true;
-                options.Events.RaiseSuccessEvents = true;
-
-                // see https://docs.duendesoftware.com/identityserver/v6/fundamentals/resources/
-                options.EmitStaticAudienceClaim = true;
-            })
-            .AddInMemoryIdentityResources(Config.IdentityResources)
-            .AddInMemoryApiScopes(Config.ApiScopes)
-            .AddInMemoryClients(Config.Clients)
+using Duende.IdentityServer;
+using IdentityServer.Data;
+using IdentityServer.Models;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.JsonWebTokens;
+using Microsoft.IdentityModel.Logging;
+using Serilog;
+
+namespace IdentityServer;
+
+internal static class HostingExtensions
+{
+    public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
+    {
+        JsonWebTokenHandler.DefaultInboundClaimTypeMap.Clear();
+
+        builder.Services.AddRazorPages();
+
+        builder.Services.AddDbContext<ApplicationDbContext>(options =>
+            options.UseSqlite(builder.Configuration.GetConnectionString("DefaultConnection")));
+
+        builder.Services.AddIdentity<ApplicationUser, IdentityRole>()
+            .AddEntityFrameworkStores<ApplicationDbContext>()
+            .AddDefaultTokenProviders();
+
+        builder.Services
+            .AddIdentityServer(options =>
+            {
+                options.Events.RaiseErrorEvents = true;
+                options.Events.RaiseInformationEvents = true;
+                options.Events.RaiseFailureEvents = true;
+                options.Events.RaiseSuccessEvents = true;
+
+                // see https://docs.duendesoftware.com/identityserver/v6/fundamentals/resources/
+                options.EmitStaticAudienceClaim = true;
+            })
+            .AddInMemoryIdentityResources(Config.IdentityResources)
+            .AddInMemoryApiScopes(Config.ApiScopes)
+            .AddInMemoryClients(Config.Clients)
             .AddAspNetIdentity<ApplicationUser>();
 
-        builder.Services.AddAuthentication()
-            .AddGoogle(options =>
-            {
-                options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
-
-                // register your IdentityServer with Google at https://console.developers.google.com
-                // enable the Google+ API
-                // set the redirect URI to https://localhost:5001/signin-google
-                options.ClientId = "copy client ID from Google here";
-                options.ClientSecret = "copy client secret from Google here";
-            });
-
-        return builder.Build();
+        builder.Services.AddAuthentication()
+            .AddGoogle(options =>
+            {
+                options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
+
+                // register your IdentityServer with Google at https://console.developers.google.com
+                // enable the Google+ API
+                // set the redirect URI to https://localhost:5001/signin-google
+                options.ClientId = "copy client ID from Google here";
+                options.ClientSecret = "copy client secret from Google here";
+            });
+
+        return builder.Build();
     }
 
-    public static WebApplication ConfigurePipeline(this WebApplication app)
-    {
+    public static WebApplication ConfigurePipeline(this WebApplication app)
+    {
         IdentityModelEventSource.ShowPII = true;
 
         app.UseSerilogRequestLogging();
 
-        if (app.Environment.IsDevelopment())
-        {
-            app.UseDeveloperExceptionPage();
-        }
-
-        app.UseStaticFiles();
-        app.UseRouting();
-        app.UseIdentityServer();
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+
+        app.UseStaticFiles();
+        app.UseRouting();
+        app.UseIdentityServer();
         app.UseAuthorization();
 
-        app.MapRazorPages()
-            .RequireAuthorization();
-
-        return app;
-    }
+        app.MapRazorPages()
+            .RequireAuthorization();
+
+        return app;
+    }
 }
diff --git a/ui/HostingExtensions.cs b/ui/HostingExtensions.cs
@@ -10,12 +10,10 @@ namespace WebCodeFlowPkceClient;
 
 internal static class HostingExtensions
 {
-    private static IWebHostEnvironment? _env;
     public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
     {
         var services = builder.Services;
         var configuration = builder.Configuration;
-        _env = builder.Environment;
 
         services.AddAuthentication(options =>
         {
@@ -55,9 +53,9 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
             };
         });
 
-        var privatePem = File.ReadAllText(Path.Combine(_env.ContentRootPath,
+        var privatePem = File.ReadAllText(Path.Combine(builder.Environment.ContentRootPath,
             "ecdsa384-private.pem"));
-        var publicPem = File.ReadAllText(Path.Combine(_env.ContentRootPath,
+        var publicPem = File.ReadAllText(Path.Combine(builder.Environment.ContentRootPath,
             "ecdsa384-public.pem"));
         var ecdsaCertificate = X509Certificate2.CreateFromPem(publicPem, privatePem);
         var ecdsaCertificateKey = new ECDsaSecurityKey(ecdsaCertificate.GetECDsaPrivateKey());
@@ -104,7 +102,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
 
         app.UseSerilogRequestLogging();
 
-        if (_env!.IsDevelopment())
+        if (app.Environment.IsDevelopment())
         {
             app.UseDeveloperExceptionPage();
         }