removed the regex for the password as this was asked to be removed

MohawkMEDIC · Jul 9, 2018 · 881e07b · 881e07b
1 parent 9a94fdb
commit 881e07b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/OpenIZAdmin/Models/AccountModels/ChangePasswordModel.cs b/OpenIZAdmin/Models/AccountModels/ChangePasswordModel.cs
@@ -41,7 +41,6 @@ public ChangePasswordModel()
  [Display(Name = "ConfirmPassword", ResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "ConfirmPasswordRequired", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  [Compare("Password", ErrorMessageResourceName = "ConfirmPasswordMatch", ErrorMessageResourceType = typeof(Locale))]
  public string ConfirmPassword { get; set; }
 
@@ -52,7 +51,6 @@ public ChangePasswordModel()
  [Display(Name = "CurrentPassword", ResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "CurrentPasswordRequired", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  public string CurrentPassword { get; set; }
 
  /// <summary>
@@ -62,7 +60,6 @@ public ChangePasswordModel()
  [Display(Name = "Password", ResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "PasswordRequired", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  public string Password { get; set; }
 
  /// <summary>

diff --git a/OpenIZAdmin/Models/AccountModels/ResetPasswordModel.cs b/OpenIZAdmin/Models/AccountModels/ResetPasswordModel.cs
@@ -52,7 +52,6 @@ public ResetPasswordModel()
  [Display(Name = "ConfirmPassword", ResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "ConfirmPasswordRequired", ErrorMessageResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  [Compare("Password", ErrorMessageResourceName = "ConfirmPasswordMatch", ErrorMessageResourceType = typeof(Locale))]
  public string ConfirmPassword { get; set; }
 
@@ -64,7 +63,6 @@ public ResetPasswordModel()
  [Display(Name = "Password", ResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "PasswordRequired", ErrorMessageResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  public string Password { get; set; }
 
  /// <summary>

diff --git a/OpenIZAdmin/Models/UserModels/CreateUserModel.cs b/OpenIZAdmin/Models/UserModels/CreateUserModel.cs
@@ -21,15 +21,14 @@
 using OpenIZ.Core.Model.Constants;
 using OpenIZ.Core.Model.Entities;
 using OpenIZ.Core.Model.Security;
-using OpenIZAdmin.Extensions;
+using OpenIZAdmin.Core.Extensions;
 using OpenIZAdmin.Localization;
 using OpenIZAdmin.Models.Core;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web.Mvc;
-using OpenIZAdmin.Core.Extensions;
 
 namespace OpenIZAdmin.Models.UserModels
 {
@@ -75,7 +74,6 @@ public CreateUserModel()
  [Display(Name = "ConfirmPassword", ResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "ConfirmPasswordRequired", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  [System.ComponentModel.DataAnnotations.Compare("Password", ErrorMessageResourceName = "ConfirmPasswordMatch", ErrorMessageResourceType = typeof(Locale))]
  public string ConfirmPassword { get; set; }
 
@@ -98,7 +96,6 @@ public CreateUserModel()
  [Display(Name = "Password", ResourceType = typeof(Locale))]
  [Required(ErrorMessageResourceName = "PasswordRequired", ErrorMessageResourceType = typeof(Locale))]
  [StringLength(50, ErrorMessageResourceName = "PasswordLength50", ErrorMessageResourceType = typeof(Locale))]
- [RegularExpression(Constants.RegExPassword, ErrorMessageResourceName = "PasswordValidationErrorMessage", ErrorMessageResourceType = typeof(Locale))]
  public string Password { get; set; }
 
  /// <summary>