Merge branch 'master' into beta

sitkoru · Jan 18, 2023 · 07c724b · 07c724b
2 parents fa5c76d + b76652d
commit 07c724b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/Sitko.Core.App.Web/BaseStartup.cs b/src/Sitko.Core.App.Web/BaseStartup.cs
@@ -177,6 +177,7 @@ protected virtual void ConfigureAfterRoutingModulesHook(IApplicationBuilder app)
         }
 
         ConfigureAfterRoutingMiddleware(appBuilder);
+        application.AuthMiddlewareHook(applicationContext, appBuilder);
         application.AfterRoutingHook(applicationContext, appBuilder);
         ConfigureAfterRoutingModulesHook(appBuilder);
 

diff --git a/src/Sitko.Core.App.Web/IWebApplicationModule.cs b/src/Sitko.Core.App.Web/IWebApplicationModule.cs
@@ -24,4 +24,9 @@ public interface IWebApplicationModule : IApplicationModule
         IApplicationBuilder appBuilder)
     {
     }
+
+    void ConfigureAuthMiddleware(IApplicationContext applicationContext,
+        IApplicationBuilder appBuilder)
+    {
+    }
 }
diff --git a/src/Sitko.Core.App.Web/WebApplication.cs b/src/Sitko.Core.App.Web/WebApplication.cs
@@ -45,6 +45,15 @@ protected WebApplication(string[] args) : base(args)
         }
     }
 
+    public virtual void AuthMiddlewareHook(IApplicationContext applicationContext,
+        IApplicationBuilder appBuilder)
+    {
+        foreach (var webModule in GetWebModules(applicationContext))
+        {
+            webModule.ConfigureAuthMiddleware(applicationContext, appBuilder);
+        }
+    }
+
     public virtual void EndpointsHook(IApplicationContext applicationContext,
         IApplicationBuilder appBuilder, IEndpointRouteBuilder endpoints)
     {

diff --git a/src/Sitko.Core.Auth/AuthModule.cs b/src/Sitko.Core.Auth/AuthModule.cs
@@ -14,16 +14,24 @@ public interface IAuthModule : IApplicationModule
 {
 }
 
+internal static class AuthMiddlewareState
+{
+    public static bool IsConfigured { get; set; }
+}
+
 public abstract class AuthModule<TAuthOptions> : BaseApplicationModule<TAuthOptions>, IWebApplicationModule,
     IAuthModule
     where TAuthOptions : AuthOptions, new()
 {
-    public virtual void ConfigureAfterUseRouting(IApplicationContext applicationContext,
+    public virtual void ConfigureAuthMiddleware(IApplicationContext applicationContext,
         IApplicationBuilder appBuilder)
     {
-        appBuilder.UseAuthentication()
-            .UseAuthorization();
-        appBuilder.UseMiddleware<AuthorizationMiddleware<TAuthOptions>>();
+        if (!AuthMiddlewareState.IsConfigured)
+        {
+            AuthMiddlewareState.IsConfigured = true;
+            appBuilder.UseAuthentication().UseAuthorization();
+            appBuilder.UseMiddleware<AuthorizationMiddleware<TAuthOptions>>();
+        }
     }
 
     public override void ConfigureServices(IApplicationContext applicationContext, IServiceCollection services,