Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Login - move validator logic from CustomerManageService to Validator, add new notification CustomerLoginFailed
support5c85e7ba1912
diff --git a/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.csnew file mode 100644index 000000000..aaa4873a7--- /dev/null+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoginFailedEvent.cs@@ -0,0 +1,24 @@+using Grand.Domain.Customers;+using MediatR;++namespace Grand.Business.Core.Events.Customers+{+ /// <summary>+ /// Customer login failed event+ /// </summary>+ public class CustomerLoginFailedEvent : INotification+ {+ public CustomerLoginFailedEvent(Customer customer)+ {+ Customer = customer;+ }++ /// <summary>+ /// Customer+ /// </summary>+ public Customer Customer {+ get; private set;+ }+ }++}diff --git a/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.csnew file mode 100644index 000000000..a0a4dc158--- /dev/null+++ b/src/Business/Grand.Business.Customers/Events/Handlers/CustomerLoginFailedEventHandler.cs@@ -0,0 +1,36 @@+using Grand.Business.Core.Events.Customers;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Domain.Customers;+using MediatR;++namespace Grand.Business.Customers.Events.Handlers;++public class CustomerLoginFailedEventHandler: INotificationHandler<CustomerLoginFailedEvent>+{+ private readonly ICustomerService _customerService;+ private readonly CustomerSettings _customerSettings;++ public CustomerLoginFailedEventHandler(ICustomerService customerService, CustomerSettings customerSettings)+ {+ _customerService = customerService;+ _customerSettings = customerSettings;+ }++ public async Task Handle(CustomerLoginFailedEvent notification, CancellationToken cancellationToken)+ {+ if (notification.Customer != null)+ {+ //wrong password+ notification.Customer.FailedLoginAttempts++;+ if (_customerSettings.FailedPasswordAllowedAttempts > 0 &&+ notification.Customer.FailedLoginAttempts >= _customerSettings.FailedPasswordAllowedAttempts)+ {+ //lock out+ notification.Customer.CannotLoginUntilDateUtc = DateTime.UtcNow.AddMinutes(_customerSettings.FailedPasswordLockoutMinutes);+ //reset the counter+ notification.Customer.FailedLoginAttempts = 0;+ }+ await _customerService.UpdateCustomerLastLoginDate(notification.Customer);+ }+ }+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.csindex 05f1e4c1a..640803d06 100644--- a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs+++ b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs@@ -87,21 +87,7 @@ namespace Grand.Business.Customers.Servicespublic virtual async Task<CustomerLoginResults> LoginCustomer(string usernameOrEmail, string password){var customer = _customerSettings.UsernamesEnabled ? await _customerService.GetCustomerByUsername(usernameOrEmail) : await _customerService.GetCustomerByEmail(usernameOrEmail);-- if (customer == null)- return CustomerLoginResults.CustomerNotExist;- if (customer.Deleted)- return CustomerLoginResults.Deleted;- if (!customer.Active)- return CustomerLoginResults.NotActive;- if (!await _groupService.IsRegistered(customer))- return CustomerLoginResults.NotRegistered;-- if (customer.CannotLoginUntilDateUtc.HasValue && customer.CannotLoginUntilDateUtc.Value > DateTime.UtcNow)- return CustomerLoginResults.LockedOut;-- if (string.IsNullOrEmpty(password))- return CustomerLoginResults.WrongPassword;+var pwd = customer.PasswordFormatId switch {PasswordFormat.Clear => password,PasswordFormat.Encrypted => _encryptionService.EncryptText(password, customer.PasswordSalt),@@ -110,20 +96,7 @@ namespace Grand.Business.Customers.Services};var isValid = pwd == customer.Password;if (!isValid)- {- //wrong password- customer.FailedLoginAttempts++;- if (_customerSettings.FailedPasswordAllowedAttempts > 0 &&- customer.FailedLoginAttempts >= _customerSettings.FailedPasswordAllowedAttempts)- {- //lock out- customer.CannotLoginUntilDateUtc = DateTime.UtcNow.AddMinutes(_customerSettings.FailedPasswordLockoutMinutes);- //reset the counter- customer.FailedLoginAttempts = 0;- }- await _customerService.UpdateCustomerLastLoginDate(customer);return CustomerLoginResults.WrongPassword;- }//2fa requiredif (customer.GetUserFieldFromEntity<bool>(SystemCustomerFieldNames.TwoFactorEnabled) && _customerSettings.TwoFactorAuthenticationEnabled)diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.csnew file mode 100644index 000000000..82fae4f81--- /dev/null+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/CustomerLoginFailedNotificationHandlerTests.cs@@ -0,0 +1,56 @@+using Grand.Business.Core.Events.Customers;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Business.Customers.Events.Handlers;+using Grand.Domain.Customers;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Business.Customers.Tests.Handler+{+ [TestClass()]+ public class CustomerLoginFailedNotificationHandlerTests+ {+ private Mock<ICustomerService> _customerServiceMock;+ private CustomerSettings _customerSettings;+ private CustomerLoginFailedEventHandler _handler;++ [TestInitialize()]+ public void Init()+ {+ _customerServiceMock = new Mock<ICustomerService>();+ _customerSettings = new CustomerSettings(){ FailedPasswordAllowedAttempts = 10 };+ _handler = new CustomerLoginFailedEventHandler(_customerServiceMock.Object, _customerSettings);+ }++ [TestMethod()]+ public async Task HandleTest_FailedLoginAttempts_Inc()+ {+ //Arrange+ var customer = new Customer {+ FailedLoginAttempts = 1,+ CannotLoginUntilDateUtc = null,+ };+ //Act+ await _handler.Handle(new CustomerLoginFailedEvent(customer), CancellationToken.None);++ //Assert+ Assert.IsTrue(customer.FailedLoginAttempts == 2);+ _customerServiceMock.Verify(c => c.UpdateCustomerLastLoginDate(customer), Times.Once);+ }+ [TestMethod()]+ public async Task HandleTest_CannotLoginUntilDate_Set()+ {+ //Arrange+ var customer = new Customer {+ FailedLoginAttempts = 10,+ CannotLoginUntilDateUtc = null,+ };+ //Act+ await _handler.Handle(new CustomerLoginFailedEvent(customer), CancellationToken.None);++ //Assert+ Assert.IsTrue(customer.CannotLoginUntilDateUtc != null);+ _customerServiceMock.Verify(c => c.UpdateCustomerLastLoginDate(customer), Times.Once);+ }+ }+}diff --git a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs b/src/Web/Grand.Web.Admin/Controllers/LoginController.csindex a99123a69..f24dc6185 100644--- a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs@@ -62,64 +62,33 @@ namespace Grand.Web.Admin.Controllers}[HttpPost]- [ValidateCaptcha][AutoValidateAntiforgeryToken]- public virtual async Task<IActionResult> Index(LoginModel model, bool captchaValid)+ public virtual async Task<IActionResult> Index(LoginModel model){- //validate CAPTCHA- if (_captchaSettings.Enabled && _captchaSettings.ShowOnLoginPage && !captchaValid)- {- ModelState.AddModelError("", _captchaSettings.GetWrongCaptchaMessage(_translationService));- }-if (ModelState.IsValid){- if (_customerSettings.UsernamesEnabled && model.Username != null)- {- model.Username = model.Username.Trim();- }- var loginResult = await _customerManagerService.LoginCustomer(_customerSettings.UsernamesEnabled ? model.Username : model.Email, model.Password);+ var loginResult =+ await _customerManagerService.LoginCustomer(+ _customerSettings.UsernamesEnabled ? model.Username : model.Email, model.Password);switch (loginResult){case CustomerLoginResults.Successful:- {- var customer = _customerSettings.UsernamesEnabled ? await _customerService.GetCustomerByUsername(model.Username) : await _customerService.GetCustomerByEmail(model.Email);- //sign in- return await SignInAction(customer, model.RememberMe);- }+ {+ var customer = _customerSettings.UsernamesEnabled+ ? await _customerService.GetCustomerByUsername(model.Username)+ : await _customerService.GetCustomerByEmail(model.Email);+ //sign in+ return await SignInAction(customer, model.RememberMe);+ }case CustomerLoginResults.RequiresTwoFactor:- {- var userName = _customerSettings.UsernamesEnabled ? model.Username : model.Email;-- HttpContext.Session.SetString("AdminRequiresTwoFactor", userName);-- return RedirectToAction("TwoFactorAuthorization");- }-- case CustomerLoginResults.CustomerNotExist:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));- break;- case CustomerLoginResults.Deleted:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.Deleted"));- break;- case CustomerLoginResults.NotActive:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotActive"));- break;- case CustomerLoginResults.NotRegistered:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));- break;- case CustomerLoginResults.LockedOut:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));- break;- case CustomerLoginResults.WrongPassword:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials"));- break;- default:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials"));- break;+ {+ var userName = _customerSettings.UsernamesEnabled ? model.Username : model.Email;+ HttpContext.Session.SetString("RequiresTwoFactor", userName);+ return RedirectToRoute("TwoFactorAuthorization");+ }}}-+//If we got this far, something failed, redisplay formmodel.UsernamesEnabled = _customerSettings.UsernamesEnabled;model.DisplayCaptcha = _captchaSettings.Enabled && _captchaSettings.ShowOnLoginPage;@@ -166,8 +135,7 @@ namespace Grand.Web.Admin.Controllers[HttpPost]public async Task<IActionResult> TwoFactorAuthorization(string token,- [FromServices] ITwoFactorAuthenticationService twoFactorAuthenticationService- )+ [FromServices] ITwoFactorAuthenticationService twoFactorAuthenticationService){if (!_customerSettings.TwoFactorAuthenticationEnabled)return RedirectToRoute("AdminLogin");@@ -197,7 +165,7 @@ namespace Grand.Web.Admin.Controllers}ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));}-+ await _mediator.Publish(new CustomerLoginFailedEvent(customer));return View();}}diff --git a/src/Web/Grand.Web.Admin/Models/Common/CaptchaModel.cs b/src/Web/Grand.Web.Admin/Models/Common/CaptchaModel.csnew file mode 100644index 000000000..658ff6e76--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Common/CaptchaModel.cs@@ -0,0 +1,11 @@+using Grand.Infrastructure.Models;++namespace Grand.Web.Admin.Models.Common;++public record CaptchaModel : ICaptchaValidModel+{+ public string ReCaptchaChallengeField { get; set; }+ public string ReCaptchaResponseField { get; set; }+ public string ReCaptchaResponseValue { get; set; }+ public string ReCaptchaResponse { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Common/LoginModel.cs b/src/Web/Grand.Web.Admin/Models/Common/LoginModel.csindex a79d480e6..19dc0e485 100644--- a/src/Web/Grand.Web.Admin/Models/Common/LoginModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Common/LoginModel.cs@@ -23,6 +23,6 @@ namespace Grand.Web.Admin.Models.Commonpublic bool RememberMe { get; set; }public bool DisplayCaptcha { get; set; }-+ public ICaptchaValidModel Captcha { get; set; } = new CaptchaModel();}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.csindex 48380e503..8d5904c6a 100644--- a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs@@ -1,8 +1,18 @@using FluentValidation;+using Grand.Business.Core.Events.Customers;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain.Customers;using Grand.Infrastructure.Validators;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Infrastructure.Models;using Grand.Web.Admin.Models.Common;+using Grand.Web.Common.Security.Captcha;+using Grand.Web.Common.Validators;+using MediatR;+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.DependencyInjection;namespace Grand.Web.Admin.Validators.Common{@@ -10,15 +20,85 @@ namespace Grand.Web.Admin.Validators.Common{public LoginValidator(IEnumerable<IValidatorConsumer<LoginModel>> validators,- ITranslationService translationService, CustomerSettings customerSettings)+ IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,+ ICustomerService customerService, IGroupService groupService, IEncryptionService encryptionService,+ ITranslationService translationService, CustomerSettings customerSettings, CaptchaSettings captchaSettings,+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator): base(validators){if (!customerSettings.UsernamesEnabled){- //login by email- RuleFor(x => x.Email).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));+ RuleFor(x => x.Email).NotEmpty()+ .WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));+RuleFor(x => x.Email).EmailAddress().WithMessage(translationService.GetResource("Common.WrongEmail"));}+ else+ {+ RuleFor(x => x.Username).NotEmpty()+ .WithMessage(translationService.GetResource("Account.Login.Fields.UserName.Required"));+ }++ RuleFor(x => x.Password).NotEmpty()+ .WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));++ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ var customer = customerSettings.UsernamesEnabled+ ? await customerService.GetCustomerByUsername(x.Username)+ : await customerService.GetCustomerByEmail(x.Email);++ switch (customer)+ {+ case null:+ context.AddFailure(+ translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));+ break;+ case { Deleted: true }:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.Deleted"));+ break;+ case { Active: false }:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.NotActive"));+ break;+ case { } when !await groupService.IsRegistered(customer):+ context.AddFailure(+ translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));+ break;+ case { CannotLoginUntilDateUtc: { } } when customer.CannotLoginUntilDateUtc.Value > DateTime.UtcNow:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));+ break;+ case { }:+ {+ var pwd = customer.PasswordFormatId switch {+ PasswordFormat.Clear => x.Password,+ PasswordFormat.Encrypted =>+ encryptionService.EncryptText(x.Password, customer.PasswordSalt),+ PasswordFormat.Hashed => encryptionService.CreatePasswordHash(x.Password,+ customer.PasswordSalt,+ customerSettings.HashedPasswordFormat),+ _ => throw new Exception("PasswordFormat not supported")+ };+ var isValid = pwd == customer.Password;+ if (!isValid)+ {+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials"));+ await contextAccessor.HttpContext!.RequestServices.GetRequiredService<IMediator>()+ .Publish(new CustomerLoginFailedEvent(customer), _);+ }++ break;+ }+ }+ });++ if (captchaSettings.Enabled && captchaSettings.ShowOnLoginPage)+ {+ RuleFor(x => x.Captcha).NotNull()+ .WithMessage(translationService.GetResource("Account.Captcha.Required"));+ ;+ RuleFor(x => x.Captcha)+ .SetValidator(new CaptchaValidator(validatorsCaptcha, contextAccessor, googleReCaptchaValidator));+ }}}}\ No newline at end of filediff --git a/src/Web/Grand.Web/Validators/Common/CaptchaValidator.cs b/src/Web/Grand.Web.Common/Validators/CaptchaValidator.cssimilarity index 98%rename from src/Web/Grand.Web/Validators/Common/CaptchaValidator.csrename to src/Web/Grand.Web.Common/Validators/CaptchaValidator.csindex 68afeacd5..b4ced6f7f 100644--- a/src/Web/Grand.Web/Validators/Common/CaptchaValidator.cs+++ b/src/Web/Grand.Web.Common/Validators/CaptchaValidator.cs@@ -5,7 +5,7 @@ using Grand.Web.Common.Security.Captcha;using Microsoft.AspNetCore.Http;using Microsoft.Extensions.Primitives;-namespace Grand.Web.Validators.Common;+namespace Grand.Web.Common.Validators;public class CaptchaValidator : BaseGrandValidator<ICaptchaValidModel>{diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.csindex 45e4f6369..400e28a86 100644--- a/src/Web/Grand.Web/Controllers/AccountController.cs+++ b/src/Web/Grand.Web/Controllers/AccountController.cs@@ -102,46 +102,28 @@ namespace Grand.Web.Controllers{if (ModelState.IsValid){- var loginResult = await _customerManagerService.LoginCustomer(_customerSettings.UsernamesEnabled ? model.Username : model.Email, model.Password);+ var loginResult =+ await _customerManagerService.LoginCustomer(+ _customerSettings.UsernamesEnabled ? model.Username : model.Email, model.Password);switch (loginResult){case CustomerLoginResults.Successful:- {- var customer = _customerSettings.UsernamesEnabled ? await _customerService.GetCustomerByUsername(model.Username) : await _customerService.GetCustomerByEmail(model.Email);- //sign in- return await SignInAction(customer, model.RememberMe, returnUrl);- }+ {+ var customer = _customerSettings.UsernamesEnabled+ ? await _customerService.GetCustomerByUsername(model.Username)+ : await _customerService.GetCustomerByEmail(model.Email);+ //sign in+ return await SignInAction(customer, model.RememberMe, returnUrl);+ }case CustomerLoginResults.RequiresTwoFactor:- {- var userName = _customerSettings.UsernamesEnabled ? model.Username : model.Email;- HttpContext.Session.SetString("RequiresTwoFactor", userName);- return RedirectToRoute("TwoFactorAuthorization");- }-- case CustomerLoginResults.CustomerNotExist:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));- break;- case CustomerLoginResults.Deleted:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.Deleted"));- break;- case CustomerLoginResults.NotActive:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotActive"));- break;- case CustomerLoginResults.NotRegistered:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));- break;- case CustomerLoginResults.LockedOut:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));- break;- case CustomerLoginResults.WrongPassword:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials"));- break;- default:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials"));- break;+ {+ var userName = _customerSettings.UsernamesEnabled ? model.Username : model.Email;+ HttpContext.Session.SetString("RequiresTwoFactor", userName);+ return RedirectToRoute("TwoFactorAuthorization");+ }}}-+//If we got this far, something failed, redisplay formmodel.UsernamesEnabled = _customerSettings.UsernamesEnabled;model.DisplayCaptcha = _captchaSettings.Enabled && _captchaSettings.ShowOnLoginPage;@@ -158,7 +140,9 @@ namespace Grand.Web.Controllersif (string.IsNullOrEmpty(username))return RedirectToRoute("HomePage");- var customer = _customerSettings.UsernamesEnabled ? await _customerService.GetCustomerByUsername(username) : await _customerService.GetCustomerByEmail(username);+ var customer = _customerSettings.UsernamesEnabled+ ? await _customerService.GetCustomerByUsername(username)+ : await _customerService.GetCustomerByEmail(username);if (customer == null)return RedirectToRoute("HomePage");@@ -188,18 +172,22 @@ namespace Grand.Web.Controllersif (string.IsNullOrEmpty(username))return RedirectToRoute("HomePage");- var customer = _customerSettings.UsernamesEnabled ? await _customerService.GetCustomerByUsername(username) : await _customerService.GetCustomerByEmail(username);+ var customer = _customerSettings.UsernamesEnabled+ ? await _customerService.GetCustomerByUsername(username)+ : await _customerService.GetCustomerByEmail(username);if (customer == null)return RedirectToRoute("Login");if (string.IsNullOrEmpty(token)){- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));}else{var secretKey = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.TwoFactorSecretKey);- if (await twoFactorAuthenticationService.AuthenticateTwoFactor(secretKey, token, customer, _customerSettings.TwoFactorAuthenticationType))+ if (await twoFactorAuthenticationService.AuthenticateTwoFactor(secretKey, token, customer,+ _customerSettings.TwoFactorAuthenticationType)){//remove sessionHttpContext.Session.Remove("RequiresTwoFactor");@@ -207,13 +195,18 @@ namespace Grand.Web.Controllers//sign inreturn await SignInAction(customer);}- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));++ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));}+ await _mediator.Publish(new CustomerLoginFailedEvent(customer));+return View();}- protected async Task<IActionResult> SignInAction(Customer customer, bool createPersistentCookie = false, string returnUrl = null)+ protected async Task<IActionResult> SignInAction(Customer customer, bool createPersistentCookie = false,+ string returnUrl = null){//raise eventawait _mediator.Publish(new CustomerLoggedInEvent(customer));@@ -231,7 +224,8 @@ namespace Grand.Web.Controllers[ClosedStore(true)]//available even when navigation is not allowed[PublicStore(true)]- public virtual async Task<IActionResult> Logout([FromServices] StoreInformationSettings storeInformationSettings)+ public virtual async Task<IActionResult> Logout(+ [FromServices] StoreInformationSettings storeInformationSettings){if (_workContext.OriginalCustomerIfImpersonated != null){@@ -240,8 +234,8 @@ namespace Grand.Web.ControllersSystemCustomerFieldNames.ImpersonatedCustomerId, null);//redirect back to customer details page (admin area)- return RedirectToAction("Edit", "Customer", new { id = _workContext.CurrentCustomer.Id, area = "Admin" });-+ return RedirectToAction("Edit", "Customer",+ new { id = _workContext.CurrentCustomer.Id, area = "Admin" });}//raise event@@ -255,6 +249,7 @@ namespace Grand.Web.Controllers{TempData["Grand.IgnoreCookieInformation"] = true;}+return RedirectToRoute("HomePage");}@@ -285,11 +280,14 @@ namespace Grand.Web.Controllers}if (!ModelState.IsValid) return View(model);-+var customer = await _customerService.GetCustomerByEmail(model.Email);if (customer is { Active: true, Deleted: false }){- await _mediator.Send(new PasswordRecoverySendCommand { Customer = customer, Store = _workContext.CurrentStore, Language = _workContext.WorkingLanguage, Model = model });+ await _mediator.Send(new PasswordRecoverySendCommand {+ Customer = customer, Store = _workContext.CurrentStore, Language = _workContext.WorkingLanguage,+ Model = model+ });model.Result = _translationService.GetResource("Account.PasswordRecovery.EmailHasBeenSent");model.Send = true;@@ -318,7 +316,8 @@ namespace Grand.Web.Controllers[AutoValidateAntiforgeryToken]//available even when navigation is not allowed[PublicStore(true)]- public virtual async Task<IActionResult> PasswordRecoveryConfirm(string token, string email, PasswordRecoveryConfirmModel model)+ public virtual async Task<IActionResult> PasswordRecoveryConfirm(string token, string email,+ PasswordRecoveryConfirmModel model){var customer = await _customerService.GetCustomerByEmail(email);if (customer == null)@@ -340,7 +339,7 @@ namespace Grand.Web.Controllers}if (!ModelState.IsValid) return View(model);-+var response = await _customerManagerService.ChangePassword(new ChangePasswordRequest(email,false, _customerSettings.DefaultPasswordFormat, model.NewPassword));if (response.Success)@@ -392,7 +391,7 @@ namespace Grand.Web.Controllers//available even when navigation is not allowed[PublicStore(true)]public virtual async Task<IActionResult> Register(RegisterModel model, string returnUrl, bool captchaValid,- [FromServices] ICustomerAttributeParser customerAttributeParser)+ [FromServices] ICustomerAttributeParser customerAttributeParser){//check whether registration is allowedif (_customerSettings.UserRegistrationType == UserRegistrationType.Disabled)@@ -405,7 +404,8 @@ namespace Grand.Web.Controllers}//custom customer attributes- var customerAttributes = await _mediator.Send(new GetParseCustomAttributes { SelectedAttributes = model.SelectedAttributes });+ var customerAttributes = await _mediator.Send(new GetParseCustomAttributes+ { SelectedAttributes = model.SelectedAttributes });var customerAttributeWarnings = await customerAttributeParser.GetAttributeWarnings(customerAttributes);foreach (var error in customerAttributeWarnings){@@ -449,34 +449,42 @@ namespace Grand.Web.Controllersswitch (_customerSettings.UserRegistrationType){case UserRegistrationType.EmailValidation:- {- //email validation message- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.AccountActivationToken, Guid.NewGuid().ToString());- await _messageProviderService.SendCustomerEmailValidationMessage(_workContext.CurrentCustomer, _workContext.CurrentStore, _workContext.WorkingLanguage.Id);-- //result- return RedirectToRoute("RegisterResult", new { resultId = (int)UserRegistrationType.EmailValidation });- }+ {+ //email validation message+ await _userFieldService.SaveField(_workContext.CurrentCustomer,+ SystemCustomerFieldNames.AccountActivationToken, Guid.NewGuid().ToString());+ await _messageProviderService.SendCustomerEmailValidationMessage(+ _workContext.CurrentCustomer, _workContext.CurrentStore,+ _workContext.WorkingLanguage.Id);++ //result+ return RedirectToRoute("RegisterResult",+ new { resultId = (int)UserRegistrationType.EmailValidation });+ }case UserRegistrationType.AdminApproval:- {- return RedirectToRoute("RegisterResult", new { resultId = (int)UserRegistrationType.AdminApproval });- }+ {+ return RedirectToRoute("RegisterResult",+ new { resultId = (int)UserRegistrationType.AdminApproval });+ }case UserRegistrationType.Standard:+ {+ //send customer welcome message+ await _messageProviderService.SendCustomerWelcomeMessage(_workContext.CurrentCustomer,+ _workContext.CurrentStore, _workContext.WorkingLanguage.Id);++ var redirectUrl = Url.RouteUrl("RegisterResult",+ new { resultId = (int)UserRegistrationType.Standard }, HttpContext.Request.Scheme);+ if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl)){- //send customer welcome message- await _messageProviderService.SendCustomerWelcomeMessage(_workContext.CurrentCustomer, _workContext.CurrentStore, _workContext.WorkingLanguage.Id);-- var redirectUrl = Url.RouteUrl("RegisterResult", new { resultId = (int)UserRegistrationType.Standard }, HttpContext.Request.Scheme);- if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))- {- redirectUrl = CommonExtensions.ModifyQueryString(redirectUrl, "returnurl", returnUrl);- }- return Redirect(redirectUrl);+ redirectUrl = CommonExtensions.ModifyQueryString(redirectUrl, "returnurl", returnUrl);}++ return Redirect(redirectUrl);+ }default:- {- return RedirectToRoute("HomePage");- }+ {+ return RedirectToRoute("HomePage");+ }}}@@ -497,6 +505,7 @@ namespace Grand.Web.Controllersreturn View(model);}+//available even when navigation is not allowed[PublicStore(true)]public virtual IActionResult RegisterResult(int resultId)@@ -517,6 +526,7 @@ namespace Grand.Web.ControllersresultText = _translationService.GetResource("Account.Register.Result.EmailValidation");break;}+var model = new RegisterResultModel {Result = resultText};@@ -534,7 +544,7 @@ namespace Grand.Web.Controllersif (!_customerSettings.UsernamesEnabled || string.IsNullOrWhiteSpace(username))return Json(new { Available = usernameAvailable, Text = statusText });-+if (_workContext.CurrentCustomer is { Username: { } } &&_workContext.CurrentCustomer.Username.Equals(username, StringComparison.OrdinalIgnoreCase)){@@ -559,7 +569,8 @@ namespace Grand.Web.Controllersif (customer == null)return RedirectToRoute("HomePage");- var cToken = await customer.GetUserField<string>(_userFieldService, SystemCustomerFieldNames.AccountActivationToken);+ var cToken =+ await customer.GetUserField<string>(_userFieldService, SystemCustomerFieldNames.AccountActivationToken);if (string.IsNullOrEmpty(cToken))return RedirectToRoute("HomePage");@@ -573,7 +584,8 @@ namespace Grand.Web.Controllersawait _userFieldService.SaveField(customer, SystemCustomerFieldNames.AccountActivationToken, "");//send welcome message- await _messageProviderService.SendCustomerWelcomeMessage(customer, _workContext.CurrentStore, _workContext.WorkingLanguage.Id);+ await _messageProviderService.SendCustomerWelcomeMessage(customer, _workContext.CurrentStore,+ _workContext.WorkingLanguage.Id);var model = new AccountActivationModel {Result = _translationService.GetResource("Account.AccountActivation.Activated")@@ -608,7 +620,10 @@ namespace Grand.Web.Controllersreturn Challenge();//custom customer attributes- var customerAttributes = await _mediator.Send(new GetParseCustomAttributes { SelectedAttributes = model.SelectedAttributes, CustomerCustomAttribute = _workContext.CurrentCustomer.Attributes.ToList() });+ var customerAttributes = await _mediator.Send(new GetParseCustomAttributes {+ SelectedAttributes = model.SelectedAttributes,+ CustomerCustomAttribute = _workContext.CurrentCustomer.Attributes.ToList()+ });var customerAttributeWarnings = await customerAttributeParser.GetAttributeWarnings(customerAttributes);foreach (var error in customerAttributeWarnings)@@ -650,7 +665,8 @@ namespace Grand.Web.Controllers[HttpPost][AutoValidateAntiforgeryToken]- public virtual async Task<IActionResult> RemoveExternalAssociation(string id, [FromServices] IExternalAuthenticationService openAuthenticationService)+ public virtual async Task<IActionResult> RemoveExternalAssociation(string id,+ [FromServices] IExternalAuthenticationService openAuthenticationService){if (!await _groupService.IsRegistered(_workContext.CurrentCustomer))return Challenge();@@ -661,15 +677,14 @@ namespace Grand.Web.Controllersif (ear == null){- return Json(new- {+ return Json(new {redirect = Url.Action("Info")});}+await openAuthenticationService.DeleteExternalAuthentication(ear);- return Json(new- {+ return Json(new {redirect = Url.Action("Info")});}@@ -686,8 +701,8 @@ namespace Grand.Web.Controllersvar model = await _mediator.Send(new GetCustomerData(_workContext.CurrentCustomer));return File(model, "text/xls", "PersonalInfo.xlsx");-}+#endregion#region My account / Addresses@@ -723,11 +738,9 @@ namespace Grand.Web.Controllerscustomer.RemoveAddress(address);await _customerService.DeleteAddress(address, customer.Id);- return Json(new- {+ return Json(new {redirect = Url.RouteUrl("CustomerAddresses")});-}public virtual async Task<IActionResult> AddressAdd()@@ -735,7 +748,8 @@ namespace Grand.Web.Controllersif (!await _groupService.IsRegistered(_workContext.CurrentCustomer))return Challenge();- var countries = await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);+ var countries =+ await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);var model = new CustomerAddressEditModel {Address = await _mediator.Send(new GetAddressModel {Language = _workContext.WorkingLanguage,@@ -764,7 +778,8 @@ namespace Grand.Web.Controllersvar customer = _workContext.CurrentCustomer;//custom address attributes- var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes { SelectedAttributes = model.Address.SelectedAttributes });+ var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes+ { SelectedAttributes = model.Address.SelectedAttributes });var customAttributeWarnings = await addressAttributeParser.GetAttributeWarnings(customAttributes);foreach (var error in customAttributeWarnings){@@ -782,7 +797,9 @@ namespace Grand.Web.Controllersreturn RedirectToRoute("CustomerAddresses");}- var countries = await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);++ var countries =+ await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);//If we got this far, something failed, redisplay formmodel.Address = await _mediator.Send(new GetAddressModel {Language = _workContext.WorkingLanguage,@@ -809,7 +826,8 @@ namespace Grand.Web.Controllers//address is not foundreturn RedirectToRoute("CustomerAddresses");- var countries = await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);+ var countries =+ await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);var model = new CustomerAddressEditModel();model.Address = await _mediator.Send(new GetAddressModel {Language = _workContext.WorkingLanguage,@@ -841,7 +859,8 @@ namespace Grand.Web.Controllersreturn RedirectToRoute("CustomerAddresses");//custom address attributes- var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes { SelectedAttributes = model.Address.SelectedAttributes });+ var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes+ { SelectedAttributes = model.Address.SelectedAttributes });var customAttributeWarnings = await addressAttributeParser.GetAttributeWarnings(customAttributes);foreach (var error in customAttributeWarnings){@@ -851,7 +870,7 @@ namespace Grand.Web.Controllersif (ModelState is { IsValid: true, ErrorCount: 0 }){address = model.Address.ToEntity(address, _workContext.CurrentCustomer, addressSettings);- address.Attributes = customAttributes;+ address.Attributes = customAttributes;await _customerService.UpdateAddress(address, customer.Id);if (customer.BillingAddress?.Id == address.Id)@@ -861,7 +880,9 @@ namespace Grand.Web.Controllersreturn RedirectToRoute("CustomerAddresses");}- var countries = await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);++ var countries =+ await _countryService.GetAllCountries(_workContext.WorkingLanguage.Id, _workContext.CurrentStore.Id);//If we got this far, something failed, redisplay formmodel.Address = await _mediator.Send(new GetAddressModel {Language = _workContext.WorkingLanguage,@@ -889,13 +910,16 @@ namespace Grand.Web.Controllersif (_customerSettings.HideDownloadableProductsTab)return RedirectToRoute("CustomerInfo");- var model = await _mediator.Send(new GetDownloadableProducts { Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore, Language = _workContext.WorkingLanguage });+ var model = await _mediator.Send(new GetDownloadableProducts {+ Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore,+ Language = _workContext.WorkingLanguage+ });return View(model);}public virtual async Task<IActionResult> UserAgreement(Guid orderItemId){- var model = await _mediator.Send(new GetUserAgreement { OrderItemId = orderItemId });+ var model = await _mediator.Send(new GetUserAgreement { OrderItemId = orderItemId });return model == null ? RedirectToRoute("HomePage") : View(model);}@@ -910,9 +934,11 @@ namespace Grand.Web.Controllersvar model = new ChangePasswordModel();- var passwordIsExpired = await _mediator.Send(new GetPasswordIsExpiredQuery { Customer = _workContext.CurrentCustomer });+ var passwordIsExpired = await _mediator.Send(new GetPasswordIsExpiredQuery+ { Customer = _workContext.CurrentCustomer });if (passwordIsExpired)- ModelState.AddModelError(string.Empty, _translationService.GetResource("Account.ChangePassword.PasswordIsExpired"));+ ModelState.AddModelError(string.Empty,+ _translationService.GetResource("Account.ChangePassword.PasswordIsExpired"));return View(model);}@@ -927,7 +953,7 @@ namespace Grand.Web.Controllersvar customer = _workContext.CurrentCustomer;if (!ModelState.IsValid) return View(model);-+var changePasswordRequest = new ChangePasswordRequest(customer.Email,true, _customerSettings.DefaultPasswordFormat, model.NewPassword, model.OldPassword);var changePasswordResult = await _customerManagerService.ChangePassword(changePasswordRequest);@@ -976,15 +1002,21 @@ namespace Grand.Web.Controllersreturn RedirectToRoute("CustomerInfo");if (!ModelState.IsValid) return View(model);-- var loginResult = await _customerManagerService.LoginCustomer(_customerSettings.UsernamesEnabled ? _workContext.CurrentCustomer.Username : _workContext.CurrentCustomer.Email, model.Password);++ var loginResult = await _customerManagerService.LoginCustomer(+ _customerSettings.UsernamesEnabled+ ? _workContext.CurrentCustomer.Username+ : _workContext.CurrentCustomer.Email, model.Password);switch (loginResult){case CustomerLoginResults.Successful:{//delete account- await _mediator.Send(new DeleteAccountCommand { Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore, IpAddress = HttpContext.Connection?.RemoteIpAddress?.ToString() });+ await _mediator.Send(new DeleteAccountCommand {+ Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore,+ IpAddress = HttpContext.Connection?.RemoteIpAddress?.ToString()+ });//standard logoutawait _authenticationService.SignOut();@@ -995,19 +1027,24 @@ namespace Grand.Web.Controllersreturn RedirectToRoute("HomePage");}case CustomerLoginResults.CustomerNotExist:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));break;case CustomerLoginResults.Deleted:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.Deleted"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.Login.WrongCredentials.Deleted"));break;case CustomerLoginResults.NotActive:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotActive"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.Login.WrongCredentials.NotActive"));break;case CustomerLoginResults.NotRegistered:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));break;case CustomerLoginResults.LockedOut:- ModelState.AddModelError("", _translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));break;case CustomerLoginResults.WrongPassword:default:@@ -1031,7 +1068,8 @@ namespace Grand.Web.Controllersif (_customerSettings.HideAuctionsTab)return RedirectToRoute("CustomerInfo");- var model = await _mediator.Send(new GetAuctions { Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage });+ var model = await _mediator.Send(new GetAuctions+ { Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage });return View(model);}@@ -1086,7 +1124,8 @@ namespace Grand.Web.Controllersif (_customerSettings.HideReviewsTab)return RedirectToRoute("CustomerInfo");- var model = await _mediator.Send(new GetReviews { Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage });+ var model = await _mediator.Send(new GetReviews+ { Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage });return View(model);}@@ -1115,7 +1154,8 @@ namespace Grand.Web.Controllers}[HttpPost]- public async Task<IActionResult> EnableTwoFactorAuthenticator(CustomerInfoModel.TwoFactorAuthenticationModel model,+ public async Task<IActionResult> EnableTwoFactorAuthenticator(+ CustomerInfoModel.TwoFactorAuthenticationModel model,[FromServices] ITwoFactorAuthenticationService twoFactorAuthenticationService){if (!await _groupService.IsRegistered(_workContext.CurrentCustomer))@@ -1129,20 +1169,26 @@ namespace Grand.Web.Controllersif (string.IsNullOrEmpty(model.Code)){- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));}else{- if (await twoFactorAuthenticationService.AuthenticateTwoFactor(model.SecretKey, model.Code, _workContext.CurrentCustomer, _customerSettings.TwoFactorAuthenticationType))+ if (await twoFactorAuthenticationService.AuthenticateTwoFactor(model.SecretKey, model.Code,+ _workContext.CurrentCustomer, _customerSettings.TwoFactorAuthenticationType)){- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorEnabled, true);- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorSecretKey, model.SecretKey);+ await _userFieldService.SaveField(_workContext.CurrentCustomer,+ SystemCustomerFieldNames.TwoFactorEnabled, true);+ await _userFieldService.SaveField(_workContext.CurrentCustomer,+ SystemCustomerFieldNames.TwoFactorSecretKey, model.SecretKey);Success(_translationService.GetResource("Account.TwoFactorAuth.Enabled"));return RedirectToRoute("CustomerInfo");}- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));++ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));}return View(model);@@ -1174,7 +1220,8 @@ namespace Grand.Web.Controllers[HttpPost]- public async Task<IActionResult> DisableTwoFactorAuthenticator(CustomerInfoModel.TwoFactorAuthorizationModel model,+ public async Task<IActionResult> DisableTwoFactorAuthenticator(+ CustomerInfoModel.TwoFactorAuthorizationModel model,[FromServices] ITwoFactorAuthenticationService twoFactorAuthenticationService){if (!await _groupService.IsRegistered(_workContext.CurrentCustomer))@@ -1188,28 +1235,34 @@ namespace Grand.Web.Controllersif (string.IsNullOrEmpty(model.Code)){- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));+ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));}else{- var secretKey = _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.TwoFactorSecretKey);- if (await twoFactorAuthenticationService.AuthenticateTwoFactor(secretKey, model.Code, _workContext.CurrentCustomer, _customerSettings.TwoFactorAuthenticationType))+ var secretKey =+ _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames+ .TwoFactorSecretKey);+ if (await twoFactorAuthenticationService.AuthenticateTwoFactor(secretKey, model.Code,+ _workContext.CurrentCustomer, _customerSettings.TwoFactorAuthenticationType)){- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorEnabled, false);- await _userFieldService.SaveField<string>(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorSecretKey, null);+ await _userFieldService.SaveField(_workContext.CurrentCustomer,+ SystemCustomerFieldNames.TwoFactorEnabled, false);+ await _userFieldService.SaveField<string>(_workContext.CurrentCustomer,+ SystemCustomerFieldNames.TwoFactorSecretKey, null);Success(_translationService.GetResource("Account.TwoFactorAuth.Disabled"));return RedirectToRoute("CustomerInfo");}- ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));++ ModelState.AddModelError("",+ _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));}return View(model);}--#endregion#region My account / Courses@@ -1222,7 +1275,8 @@ namespace Grand.Web.Controllersif (_customerSettings.HideCoursesTab)return RedirectToRoute("CustomerInfo");- var model = await _mediator.Send(new GetCourses { Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore });+ var model = await _mediator.Send(new GetCourses+ { Customer = _workContext.CurrentCustomer, Store = _workContext.CurrentStore });return View(model);}@@ -1272,7 +1326,7 @@ namespace Grand.Web.Controllersreturn Challenge();if (!ModelState.IsValid) return View(model);-+var result = await _mediator.Send(new SubAccountAddCommand {Customer = _workContext.CurrentCustomer,Model = model,@@ -1300,7 +1354,8 @@ namespace Grand.Web.Controllersif (!await _groupService.IsOwner(_workContext.CurrentCustomer))return Challenge();- var model = await _mediator.Send(new GetSubAccount { CustomerId = id, CurrentCustomer = _workContext.CurrentCustomer });+ var model = await _mediator.Send(new GetSubAccount+ { CustomerId = id, CurrentCustomer = _workContext.CurrentCustomer });return View(model);}@@ -1316,7 +1371,7 @@ namespace Grand.Web.Controllersreturn Challenge();if (!ModelState.IsValid) return View(model);-+var result = await _mediator.Send(new SubAccountEditCommand {CurrentCustomer = _workContext.CurrentCustomer,Model = model,@@ -1361,8 +1416,7 @@ namespace Grand.Web.Controllersif (result.success){- return Json(new- {+ return Json(new {redirect = Url.RouteUrl("CustomerSubAccounts"),success = true});@@ -1370,18 +1424,15 @@ namespace Grand.Web.Controllers//errorsModelState.AddModelError("", result.error);- return Json(new- {+ return Json(new {redirect = Url.RouteUrl("CustomerSubAccounts"),success = false,error = string.Join("; ", ModelState.Values- .SelectMany(x => x.Errors)- .Select(x => x.ErrorMessage))+ .SelectMany(x => x.Errors)+ .Select(x => x.ErrorMessage))});}-#endregion-}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs b/src/Web/Grand.Web/Validators/Customer/LoginValidator.csindex a2e536a91..b168ec2e2 100644--- a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs+++ b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs@@ -1,12 +1,18 @@using FluentValidation;+using Grand.Business.Core.Events.Customers;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Customers;using Grand.Infrastructure.Models;using Grand.Infrastructure.Validators;using Grand.Web.Common.Security.Captcha;+using Grand.Web.Common.Validators;using Grand.Web.Models.Customer;-using Grand.Web.Validators.Common;+using MediatR;using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.DependencyInjection;namespace Grand.Web.Validators.Customer{@@ -15,6 +21,7 @@ namespace Grand.Web.Validators.Customerpublic LoginValidator(IEnumerable<IValidatorConsumer<LoginModel>> validators,IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,+ ICustomerService customerService, IGroupService groupService, IEncryptionService encryptionService,ITranslationService translationService, CustomerSettings customerSettings, CaptchaSettings captchaSettings,IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator): base(validators)@@ -23,18 +30,59 @@ namespace Grand.Web.Validators.Customer{RuleFor(x => x.Email).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));- RuleFor(x => x.Password).NotEmpty()- .WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));+RuleFor(x => x.Email).EmailAddress().WithMessage(translationService.GetResource("Common.WrongEmail"));}else{RuleFor(x => x.Username).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.UserName.Required"));- RuleFor(x => x.Password).NotEmpty()- .WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));}++ RuleFor(x => x.Password).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));++ RuleFor(x=>x).CustomAsync(async (x, context, _) =>+ {+ var customer = customerSettings.UsernamesEnabled ? await customerService.GetCustomerByUsername(x.Username) : await customerService.GetCustomerByEmail(x.Email);+ switch (customer)+ {+ case null:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.CustomerNotExist"));+ break;+ case { Deleted: true }:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.Deleted"));+ break;+ case { Active: false }:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.NotActive"));+ break;+ case { } when !await groupService.IsRegistered(customer):+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.NotRegistered"));+ break;+ case { CannotLoginUntilDateUtc: { } } when customer.CannotLoginUntilDateUtc.Value > DateTime.UtcNow:+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials.LockedOut"));+ break;+ case { }:+ {+ var pwd = customer.PasswordFormatId switch {+ PasswordFormat.Clear => x.Password,+ PasswordFormat.Encrypted => encryptionService.EncryptText(x.Password, customer.PasswordSalt),+ PasswordFormat.Hashed => encryptionService.CreatePasswordHash(x.Password, customer.PasswordSalt,+ customerSettings.HashedPasswordFormat),+ _ => throw new Exception("PasswordFormat not supported")+ };+ var isValid = pwd == customer.Password;+ if (!isValid)+ {+ context.AddFailure(translationService.GetResource("Account.Login.WrongCredentials"));+ await contextAccessor.HttpContext!.RequestServices.GetRequiredService<IMediator>()+ .Publish(new CustomerLoginFailedEvent(customer), _);+ }+ break;+ }+ }+ });+if (captchaSettings.Enabled && captchaSettings.ShowOnLoginPage){RuleFor(x => x.Captcha).NotNull().WithMessage(translationService.GetResource("Account.Captcha.Required"));;