StarMirror/BuildFeed
1
0
Fork 0
mirror of https://gitlab.com/buildfeed/BuildFeed.git synced 2024-03-22 21:10:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr/16' into Localisation

Browse Source 
Conflicts:
	BuildFeed/Models/ViewModel/ChangePassword.cs
	BuildFeed/Models/ViewModel/RegistrationUser.cs
This commit is contained in:
Thomas Hounsell 2015-07-27 09:41:47 +01:00
commit 5a6d99a069
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BuildFeed/Models/ViewModel/ChangePassword.cs
View File

@ -7,19 +7,19 @@ namespace BuildFeed.Models.ViewModel
public class ChangePassword public class ChangePassword
{ {
[Required] [Required]
[MinLength(12)] [MinLength(8)]
[Display(ResourceType = typeof(Support), Name = "EnterCurrentPassword")] [Display(ResourceType = typeof(Support), Name = "EnterCurrentPassword")]
public string OldPassword { get; set; } public string OldPassword { get; set; }
[Required] [Required]
[MinLength(12)] [MinLength(8)]
[Display(ResourceType = typeof(Support), Name = "EnterNewPassword")] [Display(ResourceType = typeof(Support), Name = "EnterNewPassword")]
public string NewPassword { get; set; } public string NewPassword { get; set; }
[Required] [Required]
[MinLength(12)] [MinLength(8)]
[Display(ResourceType = typeof(Support), Name = "ConfirmNewPassword")] [Display(ResourceType = typeof(Support), Name = "ConfirmNewPassword")]
[Compare("NewPassword")] [Compare("NewPassword")]
public string ConfirmNewPassword { get; set; } public string ConfirmNewPassword { get; set; }
} }
} }

6
BuildFeed/Models/ViewModel/RegistrationUser.cs
View File

@ -11,12 +11,12 @@ public class RegistrationUser
public string UserName { get; set; } public string UserName { get; set; }
[Required] [Required]
[MinLength(12)] [MinLength(8)]
[Display(ResourceType = typeof(Support), Name = "EnterPassword")] [Display(ResourceType = typeof(Support), Name = "EnterPassword")]
public string Password { get; set; } public string Password { get; set; }
[Required] [Required]
[MinLength(12)] [MinLength(8)]
[Display(ResourceType = typeof(Support), Name = "ConfirmPassword")] [Display(ResourceType = typeof(Support), Name = "ConfirmPassword")]
[Compare("Password")] [Compare("Password")]
public string ConfirmPassword { get; set; } public string ConfirmPassword { get; set; }
@ -26,4 +26,4 @@ public class RegistrationUser
[Display(ResourceType = typeof(Support), Name = "EmailAddress")] [Display(ResourceType = typeof(Support), Name = "EmailAddress")]
public string EmailAddress { get; set; } public string EmailAddress { get; set; }
} }
} }

6
RedisAuth/RedisMembershipProvider.cs
View File

@ -16,9 +16,9 @@ namespace RedisAuth
public class RedisMembershipProvider : MembershipProvider public class RedisMembershipProvider : MembershipProvider
{ {
private bool _enablePasswordReset = true; private bool _enablePasswordReset = true;
private int _maxInvalidPasswordAttempts = 5; private int _maxInvalidPasswordAttempts = 3;
private int _minRequiredNonAlphanumericCharacters = 1; private int _minRequiredNonAlphanumericCharacters = 1;
private int _minRequriedPasswordLength = 12; private int _minRequriedPasswordLength = 8;
private int _passwordAttemptWindow = 60; private int _passwordAttemptWindow = 60;
private bool _requiresUniqueEmail = true; private bool _requiresUniqueEmail = true;
@ -491,4 +491,4 @@ public class RedisMember : IHasId<Guid>
public DateTime LockoutWindowStart { get; set; } public DateTime LockoutWindowStart { get; set; }
public int LockoutWindowAttempts { get; set; } public int LockoutWindowAttempts { get; set; }
} }
} }