Resolves smartstore#1636 Validate the username when creating a customer in backend

mgesing · mgesing · commit 545b4560678d · 2019-05-27T10:08:52.000+02:00
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs
@@ -558,19 +558,21 @@ public ActionResult Create()
         public ActionResult Create(CustomerModel model, bool continueEditing, FormCollection form)
         {
             if (!_permissionService.Authorize(StandardPermissionProvider.ManageCustomers))
+            {
                 return AccessDeniedView();
+            }
 
-            if (model.Email.HasValue())
+            /// Validate unique user. <see cref="ICustomerRegistrationService.RegisterCustomer(CustomerRegistrationRequest)"/>
+            if (model.Email.HasValue() && _customerService.GetCustomerByEmail(model.Email) != null)
             {
-                var tempCust = _customerService.GetCustomerByEmail(model.Email);
-                if (tempCust != null)
-                    ModelState.AddModelError("", "Email is already registered");
+                ModelState.AddModelError("", T("Account.Register.Errors.EmailAlreadyExists"));
             }
-            if (model.Username.HasValue() && _customerSettings.CustomerLoginType != CustomerLoginType.Email)
+
+            if (model.Username.HasValue() && 
+                _customerSettings.CustomerLoginType != CustomerLoginType.Email &&
+                _customerService.GetCustomerByUsername(model.Username) != null)
             {
-                var tempCust = _customerService.GetCustomerByEmail(model.Username);
-                if (tempCust != null)
-                    ModelState.AddModelError("", "Username is already registered");
+                ModelState.AddModelError("", T("Account.Register.Errors.UsernameAlreadyExists"));
             }
 
             // Validate customer roles.
@@ -581,15 +583,19 @@ public ActionResult Create(CustomerModel model, bool continueEditing, FormCollec
 			{
 				foreach (var customerRole in allCustomerRoles)
 				{
-					if (model.SelectedCustomerRoleIds.Contains(customerRole.Id))
-						newCustomerRoles.Add(customerRole);
+                    if (model.SelectedCustomerRoleIds.Contains(customerRole.Id))
+                    {
+                        newCustomerRoles.Add(customerRole);
+                    }
 				}
 			}
 
             var customerRolesError = ValidateCustomerRoles(newCustomerRoles);
 
             if (customerRolesError.HasValue())
+            {
                 ModelState.AddModelError("", customerRolesError);
+            }
 
             var allowManagingCustomerRoles = _permissionService.Authorize(StandardPermissionProvider.ManageCustomerRoles);
             
@@ -660,7 +666,7 @@ public ActionResult Create(CustomerModel model, bool continueEditing, FormCollec
                     _genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.Fax, model.Fax);
 
                 // Password.
-                if (!String.IsNullOrWhiteSpace(model.Password))
+                if (model.Password.HasValue())
                 {
                     var changePassRequest = new ChangePasswordRequest(model.Email, false, _customerSettings.DefaultPasswordFormat, model.Password);
                     var changePassResult = _customerRegistrationService.ChangePassword(changePassRequest);

Original file line number	Diff line number	Diff line change
`@@ -558,19 +558,21 @@ public ActionResult Create()`
`558`	`558`	`public ActionResult Create(CustomerModel model, bool continueEditing, FormCollection form)`
`559`	`559`	`{`
`560`	`560`	`if (!_permissionService.Authorize(StandardPermissionProvider.ManageCustomers))`
	`561`	`+ {`
`561`	`562`	`return AccessDeniedView();`
	`563`	`+ }`
`562`	`564`
`563`		`- if (model.Email.HasValue())`
	`565`	`+ /// Validate unique user. <see cref="ICustomerRegistrationService.RegisterCustomer(CustomerRegistrationRequest)"/>`
	`566`	`+ if (model.Email.HasValue() && _customerService.GetCustomerByEmail(model.Email) != null)`
`564`	`567`	`{`
`565`		`- var tempCust = _customerService.GetCustomerByEmail(model.Email);`
`566`		`- if (tempCust != null)`
`567`		`- ModelState.AddModelError("", "Email is already registered");`
	`568`	`+ ModelState.AddModelError("", T("Account.Register.Errors.EmailAlreadyExists"));`
`568`	`569`	`}`
`569`		`- if (model.Username.HasValue() && _customerSettings.CustomerLoginType != CustomerLoginType.Email)`
	`570`	`+`
	`571`	`+ if (model.Username.HasValue() &&`
	`572`	`+ _customerSettings.CustomerLoginType != CustomerLoginType.Email &&`
	`573`	`+ _customerService.GetCustomerByUsername(model.Username) != null)`
`570`	`574`	`{`
`571`		`- var tempCust = _customerService.GetCustomerByEmail(model.Username);`
`572`		`- if (tempCust != null)`
`573`		`- ModelState.AddModelError("", "Username is already registered");`
	`575`	`+ ModelState.AddModelError("", T("Account.Register.Errors.UsernameAlreadyExists"));`
`574`	`576`	`}`
`575`	`577`
`576`	`578`	`// Validate customer roles.`
`@@ -581,15 +583,19 @@ public ActionResult Create(CustomerModel model, bool continueEditing, FormCollec`
`581`	`583`	`{`
`582`	`584`	`foreach (var customerRole in allCustomerRoles)`
`583`	`585`	`{`
`584`		`- if (model.SelectedCustomerRoleIds.Contains(customerRole.Id))`
`585`		`- newCustomerRoles.Add(customerRole);`
	`586`	`+ if (model.SelectedCustomerRoleIds.Contains(customerRole.Id))`
	`587`	`+ {`
	`588`	`+ newCustomerRoles.Add(customerRole);`
	`589`	`+ }`
`586`	`590`	`}`
`587`	`591`	`}`
`588`	`592`
`589`	`593`	`var customerRolesError = ValidateCustomerRoles(newCustomerRoles);`
`590`	`594`
`591`	`595`	`if (customerRolesError.HasValue())`
	`596`	`+ {`
`592`	`597`	`ModelState.AddModelError("", customerRolesError);`
	`598`	`+ }`
`593`	`599`
`594`	`600`	`var allowManagingCustomerRoles = _permissionService.Authorize(StandardPermissionProvider.ManageCustomerRoles);`
`595`	`601`
`@@ -660,7 +666,7 @@ public ActionResult Create(CustomerModel model, bool continueEditing, FormCollec`
`660`	`666`	`_genericAttributeService.SaveAttribute(customer, SystemCustomerAttributeNames.Fax, model.Fax);`
`661`	`667`
`662`	`668`	`// Password.`
`663`		`- if (!String.IsNullOrWhiteSpace(model.Password))`
	`669`	`+ if (model.Password.HasValue())`
`664`	`670`	`{`
`665`	`671`	`var changePassRequest = new ChangePasswordRequest(model.Email, false, _customerSettings.DefaultPasswordFormat, model.Password);`
`666`	`672`	`var changePassResult = _customerRegistrationService.ChangePassword(changePassRequest);`