fix: test

Author: ksavosteev

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

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Platform.Security.Model;
 
@@ -11,30 +9,30 @@ public class BaseUserSignInValidator : IUserSignInValidator
     {
         public int Priority { get; set; }
 
-        public Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, SignInResult signInResult, IDictionary<string, object> context)
+        public Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, IDictionary<string, object> context)
         {
             var result = new List<TokenLoginResponse>();
 
-            if (!signInResult.Succeeded)
-            {
-                var detailedErrors = GetDetailedErrors(context);
-                if (!detailedErrors)
-                {
-                    result.Add(SecurityErrorDescriber.LoginFailed());
-                }
-                else if (signInResult.IsLockedOut)
-                {
-                    var permanentLockOut = user.LockoutEnd == DateTime.MaxValue.ToUniversalTime();
-                    result.Add(permanentLockOut ? SecurityErrorDescriber.UserIsLockedOut() : SecurityErrorDescriber.UserIsTemporaryLockedOut());
-                }
-            }
-            else
-            {
-                if (user.PasswordExpired)
-                {
-                    result.Add(SecurityErrorDescriber.PasswordExpired());
-                }
-            }
+            //if (!signInResult.Succeeded)
+            //{
+            //    var detailedErrors = GetDetailedErrors(context);
+            //    if (!detailedErrors)
+            //    {
+            //        result.Add(SecurityErrorDescriber.LoginFailed());
+            //    }
+            //    else if (signInResult.IsLockedOut)
+            //    {
+            //        var permanentLockOut = user.LockoutEnd == DateTime.MaxValue.ToUniversalTime();
+            //        result.Add(permanentLockOut ? SecurityErrorDescriber.UserIsLockedOut() : SecurityErrorDescriber.UserIsTemporaryLockedOut());
+            //    }
+            //}
+            //else
+            //{
+            //    if (user.PasswordExpired)
+            //    {
+            //        result.Add(SecurityErrorDescriber.PasswordExpired());
+            //    }
+            //}
 
             return Task.FromResult<IList<TokenLoginResponse>>(result);
         }

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Platform.Security.Model;
 
@@ -10,6 +9,6 @@ public interface IUserSignInValidator
     {
         public int Priority { get; set; }
 
-        Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, SignInResult signInResult, IDictionary<string, object> context);
+        Task<IList<TokenLoginResponse>> ValidateUserAsync(ApplicationUser user, IDictionary<string, object> context);
     }
 }

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

@@ -100,14 +100,25 @@ public async Task<ActionResult> Exchange()
                 // Validate the username/password parameters and ensure the account is not locked out.
                 var result = await _signInManager.CheckPasswordSignInAsync(user, openIdConnectRequest.Password, lockoutOnFailure: true);
 
+                if (!result.Succeeded)
+                {
+                    return BadRequest(SecurityErrorDescriber.LoginFailed());
+                }
+
                 var context = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
                 {
                     { "detailedErrors", _passwordLoginOptions.DetailedErrors },
                 };
 
+                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, result, context);
+                    var validationErrors = await loginValidation.ValidateUserAsync(user, context);
                     var error = validationErrors.FirstOrDefault();
                     if (error != null)
                     {