lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 02:44:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Suha Can
2011-01-18 10:37:49 -08:00
parent 99e4ed8857 f999b9d859
commit cae67e8989
4 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
View File

@@ -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() {

8
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs
View File

@@ -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)]

1
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs
View File

@@ -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; }