chore: #60: tries to fix problem with login middleware dependencies (3)

Author: iamvladislove

Examples/Example.NetCore3.1.BaseAuthentication/Startup.cs

@@ -51,6 +51,17 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             //app
             //    .OnLoginExecuting(OnLoginExecuting)
+            //    .UseDefaultLoginMiddleware()
+            //    .OnLoginExecuted(OnLoginExecuted)
+            //    .UseJwtAuthentication();
+
+            //app
+            //    .OnLoginExecuting(OnLoginExecuting)
+            //    .OnLoginExecuted(OnLoginExecuted)
+            //    .UseDefaultLoginMiddleware()
+            //    .UseJwtAuthentication();
+
+            //app
             //    .OnLoginExecuted(OnLoginExecuted)
             //    .UseDefaultLoginMiddleware()
             //    .UseJwtAuthentication();

JwtAuthentication.Shared/CallbackActionType.cs

@@ -9,8 +9,8 @@ namespace TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login
 {
     public class DefaultLoginMiddlewareBuilder
     {
-        private static Func<BasicLoginModel, Task> _onLoginExecutingCallback = s => Task.CompletedTask;
-        private static Func<BasicLoginModel, Task> _onLoginExecutedCallback = s => Task.CompletedTask;
+        private static Func<BasicLoginModel, Task> _onLoginExecutingCallback = null;
+        private static Func<BasicLoginModel, Task> _onLoginExecutedCallback = null;
         private static BaseLoginEndpointOptions _loginEndpointOptions = new BaseLoginEndpointOptions();
 
         private static bool _loginMiddlewareIsRegistered = false;
@@ -62,9 +62,13 @@ public IApplicationBuilder OnLoginExecuting(Func<BasicLoginModel, Task> callback
         {
             _onLoginExecutingCallback = callback;
             _executingCallbackIsRegistered = true;
-            ReregisterMiddlewareCallbacks(CallbackActionType.Executing);
 
-            return _applicationBuilder;
+            if (!_loginMiddlewareIsRegistered)
+            {
+                return _applicationBuilder;
+            }
+
+            return _applicationBuilder.UseMiddleware<LoginMiddlewareWithExecutingCallback>(_loginEndpointOptions, _onLoginExecutingCallback);
         }
 
         /// <summary>
@@ -76,9 +80,13 @@ public IApplicationBuilder OnLoginExecuted(Func<BasicLoginModel, Task> callback)
         {
             _onLoginExecutedCallback = callback;
             _executedCallbackIsRegistered = true;
-            ReregisterMiddlewareCallbacks(CallbackActionType.Executed);
 
-            return _applicationBuilder;
+            if (!_loginMiddlewareIsRegistered)
+            {
+                return _applicationBuilder;
+            }
+
+            return _applicationBuilder.UseMiddleware<LoginMiddlewareWithExecutedCallback>(_loginEndpointOptions, _onLoginExecutedCallback);
         }
 
         /// <summary>
@@ -94,16 +102,6 @@ public IApplicationBuilder UseDefaultLoginMiddleware()
             return _applicationBuilder;
         }
 
-        private void ReregisterMiddlewareCallbacks(CallbackActionType callbackActionType)
-        {
-            if (!_loginMiddlewareIsRegistered)
-            {
-                return;
-            }
-
-            _applicationBuilder.UseMiddleware<LoginMiddleware>(_loginEndpointOptions, _onLoginExecutingCallback, _onLoginExecutedCallback, callbackActionType);
-        }
-
         private void RegisterMiddleware()
         {
             var objects = new List<object>() { _loginEndpointOptions };

JwtAuthentication.Shared/Middlewares/Login/DefaultLoginMiddlewareBuilder.cs

@@ -11,37 +11,24 @@ namespace TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login
 {
     internal class LoginMiddleware : RequestMiddlewareBase<ILoginService, LoginRequestModel, AuthResponseModel>
     {
-        private static BaseLoginEndpointOptions _loginEndpointOptions;
-        private static Func<BasicLoginModel, Task> _onLoginExecuting = null;
-        private static Func<BasicLoginModel, Task> _onLoginExecuted = null;
+        protected static BaseLoginEndpointOptions _loginEndpointOptions;
+        protected static Func<BasicLoginModel, Task> _onLoginExecuting = null;
+        protected static Func<BasicLoginModel, Task> _onLoginExecuted = null;
 
-        public LoginMiddleware(RequestDelegate next, BaseLoginEndpointOptions loginEndpointOptions, Func<BasicLoginModel, Task> onLoginExecuting = null, Func<BasicLoginModel, Task> onLoginExecuted = null, CallbackActionType? callbackActionType = null)
+        public LoginMiddleware(RequestDelegate next, BaseLoginEndpointOptions loginEndpointOptions, Func<BasicLoginModel, Task> onLoginExecuting = null, Func<BasicLoginModel, Task> onLoginExecuted = null)
             : base(next)
         {
             _loginEndpointOptions = loginEndpointOptions;
-
-            if (callbackActionType == null)
-            {
-                if (onLoginExecuting != null)
-                {
-                    _onLoginExecuting = onLoginExecuting;
-                }
-
-                if (onLoginExecuted != null)
-                {
-                    _onLoginExecuted = onLoginExecuted;
-                }
-            }
-
-            if (callbackActionType == CallbackActionType.Executing)
+            
+            if (onLoginExecuting != null)
             {
                 _onLoginExecuting = onLoginExecuting;
             }
 
-            if (callbackActionType == CallbackActionType.Executed)
+            if (onLoginExecuted != null)
             {
                 _onLoginExecuted = onLoginExecuted;
-            }          
+            }
         }
 
         public async Task InvokeAsync(HttpContext context, ILoginService loginService)

JwtAuthentication.Shared/Middlewares/Login/LoginMiddleware.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login.Models;
+using TourmalineCore.AspNetCore.JwtAuthentication.Shared.Options;
+
+namespace TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login
+{
+    internal class LoginMiddlewareWithExecutedCallback : LoginMiddleware
+    {
+        public LoginMiddlewareWithExecutedCallback(RequestDelegate next, BaseLoginEndpointOptions loginEndpointOptions, Func<BasicLoginModel, Task> onLoginExecuted)
+            : base(next, loginEndpointOptions, onLoginExecuted)
+        {
+            _onLoginExecuted = onLoginExecuted;
+        }        
+    }
+}

JwtAuthentication.Shared/Middlewares/Login/LoginMiddlewareWithExecutedCallback.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login.Models;
+using TourmalineCore.AspNetCore.JwtAuthentication.Shared.Options;
+
+namespace TourmalineCore.AspNetCore.JwtAuthentication.Shared.Middlewares.Login
+{
+    internal class LoginMiddlewareWithExecutingCallback : LoginMiddleware
+    {
+        public LoginMiddlewareWithExecutingCallback(RequestDelegate next, BaseLoginEndpointOptions loginEndpointOptions, Func<BasicLoginModel, Task> onLoginExecuting)
+            : base(next, loginEndpointOptions, onLoginExecuting, null)
+        {
+            _onLoginExecuting = onLoginExecuting;
+        }        
+    }
+}