Merge

--HG--
branch : 1.x

src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs

@@ -152,6 +152,41 @@ namespace Orchard.Tests.Modules.Users.Controllers {
             Assert.That(result, Is.TypeOf<ViewResult>());
         }
 
+        [Test]
+        public void UsersShouldNotBeAbleToRegisterIfInvalidEmail()
+        {
+
+            var registrationSettings = _container.Resolve<IWorkContextAccessor>().GetContext().CurrentSite.As<RegistrationSettingsPart>();
+            registrationSettings.UsersCanRegister = true;
+            registrationSettings.UsersAreModerated = false;
+            registrationSettings.UsersMustValidateEmail = false;
+
+            _session.Flush();
+
+            _controller.ModelState.Clear();
+            var result = _controller.Register("bar", "notanemailaddress", "66554321", "66554321");
+ 
+            Assert.That(((ViewResult)result).ViewData.ModelState.Count == 1,"Invalid email address.");
+        }
+
+        [Test]
+        public void UsersShouldBeAbleToRegisterIfValidEmail()
+        {
+
+            var registrationSettings = _container.Resolve<IWorkContextAccessor>().GetContext().CurrentSite.As<RegistrationSettingsPart>();
+            registrationSettings.UsersCanRegister = true;
+            registrationSettings.UsersAreModerated = false;
+            registrationSettings.UsersMustValidateEmail = false;
+
+            _session.Flush();
+
+            _controller.ModelState.Clear();
+            var result = _controller.Register("bar", "t@t.com", "password", "password");
+
+            Assert.That(result, Is.TypeOf<RedirectResult>());
+            Assert.That(((RedirectResult)result).Url, Is.EqualTo("~/"));
+        }
+
         [Test]
         public void RegisteredUserShouldBeRedirectedToHomePage() {
 

src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions; 
 using System.Diagnostics.CodeAnalysis;
 using Orchard.Localization;
 using System.Security.Principal;
@@ -317,6 +318,8 @@ namespace Orchard.Users.Controllers {
         private bool ValidateRegistration(string userName, string email, string password, string confirmPassword) {
             bool validate = true;
 
+            Regex isValidEmail = new Regex("^[a-z0-9_\\+-]+(\\.[a-z0-9_\\+-]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,4})$");
+
             if (String.IsNullOrEmpty(userName)) {
                 ModelState.AddModelError("username", T("You must specify a username."));
                 validate = false;
@@ -326,6 +329,11 @@ namespace Orchard.Users.Controllers {
                 validate = false;
             }
 
+            if (!isValidEmail.IsMatch(email)) {
+                ModelState.AddModelError("email", T("You must specify a valid email address."));
+                validate = false;
+            }
+
             if (!validate)
                 return false;
 

src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs

@@ -7,6 +7,7 @@ namespace Orchard.Users.ViewModels {
         public string UserName { get; set; }
 
         [Required, DataType(DataType.EmailAddress)]
+        [RegularExpression("^[a-z0-9_\\+-]+(\\.[a-z0-9_\\+-]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,4})$")]
         public string Email { get; set; }
 
         [Required, DataType(DataType.Password)]

src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs

@@ -11,6 +11,7 @@ namespace Orchard.Users.ViewModels {
         }
 
         [Required]
+        [RegularExpression("^[a-z0-9_\\+-]+(\\.[a-z0-9_\\+-]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,4})$")]
         public string Email {
             get { return User.As<UserPart>().Record.Email; }
             set { User.As<UserPart>().Record.Email = value; }