fix: refactor

Author: ksavosteev

src/VirtoCommerce.Platform.Security/Services/BaseUserSignInValidator.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Platform.Security.Model;
 
 namespace VirtoCommerce.Platform.Security.Services
@@ -9,10 +8,15 @@ public class BaseUserSignInValidator : IUserSignInValidator
     {
         public int Priority { get; set; }
 
-        public Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, IDictionary<string, object> context)
+        public Task<IList<TokenLoginResponse>> ValidateUserAsync(SignInValidatorContext context)
         {
             var result = new List<TokenLoginResponse>();
 
+            if (!context.IsSucceeded)
+            {
+                result.Add(SecurityErrorDescriber.LoginFailed());
+            }
+
             //if (!signInResult.Succeeded)
             //{
             //    var detailedErrors = GetDetailedErrors(context);
@@ -36,15 +40,5 @@ public Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, I
 
             return Task.FromResult<IList<TokenLoginResponse>>(result);
         }
-
-        private static bool GetDetailedErrors(IDictionary<string, object> context)
-        {
-            var detailedErrors = false;
-            if (context.TryGetValue("detailedErrors", out var detailedErrorsValue))
-            {
-                detailedErrors = (bool)detailedErrorsValue;
-            }
-            return detailedErrors;
-        }
     }
 }

src/VirtoCommerce.Platform.Security/Services/IUserSignInValidator.cs

@@ -1,14 +1,30 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Platform.Security.Model;
 
 namespace VirtoCommerce.Platform.Security.Services
 {
+    public class SignInValidatorContext
+    {
+        public ApplicationUser User { get; set; }
+
+        public string StoreId { get; set; }
+
+        public bool DetailedErrors { get; set; }
+
+        public bool IsSucceeded { get; set; }
+
+        public bool IsLockedOut { get; set; }
+
+        public IDictionary<string, object> AdditionalParameters { get; set; } = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+    }
+
     public interface IUserSignInValidator
     {
         public int Priority { get; set; }
 
-        Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, IDictionary<string, object> context);
+        Task<IList<TokenLoginResponse>> ValidateUserAsync(SignInValidatorContext context);
     }
 }

src/VirtoCommerce.Platform.Web/Controllers/Api/AuthorizationController.cs

@@ -105,20 +105,17 @@ public async Task<ActionResult> Exchange()
                     return BadRequest(SecurityErrorDescriber.LoginFailed());
                 }
 
-                var context = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                var context = new SignInValidatorContext
                 {
-                    { "detailedErrors", _passwordLoginOptions.DetailedErrors },
+                    User = user,
+                    DetailedErrors = _passwordLoginOptions.DetailedErrors,
+                    IsSucceeded = result.Succeeded,
+                    IsLockedOut = result.IsLockedOut,
                 };
 
-                var storeId = openIdConnectRequest.GetParameter("storeId");
-                if (storeId != null)
-                {
-                    context.Add("storeId", storeId.Value);
-                }
-
                 foreach (var loginValidation in _userSignInValidators.OrderByDescending(x => x.Priority).ThenBy(x => x.GetType().Name).ToList())
                 {
-                    var validationErrors = await loginValidation.ValidateUserAsync(user, context);
+                    var validationErrors = await loginValidation.ValidateUserAsync(context);
                     var error = validationErrors.FirstOrDefault();
                     if (error != null)
                     {