Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more form validation

Browse Source
This commit is contained in:
Daniel Balk
2023-03-27 17:23:56 +02:00
parent 37c8e640a7
commit ee661f7fd4
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Moonlight/App/Database/Entities/User.cs
View File

@@ -11,33 +11,41 @@ public class User
[Required] [Required]
[MinLength(3, ErrorMessage = "Invalid first name")] [MinLength(3, ErrorMessage = "Invalid first name")]
[MaxLength(64, ErrorMessage = "Max lenght reached")]
public string FirstName { get; set; } = ""; public string FirstName { get; set; } = "";
[Required] [Required]
[MinLength(3, ErrorMessage = "Invalid last name")] [MinLength(3, ErrorMessage = "Invalid last name")]
[MaxLength(64, ErrorMessage = "Max lenght reached")]
public string LastName { get; set; } = ""; public string LastName { get; set; } = "";
[Required] [Required]
[RegularExpression(@"^((((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)[;]?)+$", [RegularExpression(@"^((((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)[;]?)+$",
ErrorMessage = "Must be a valid email")] ErrorMessage = "Must be a valid email")]
[MaxLength(128, ErrorMessage = "Max lenght reached")]
public string Email { get; set; } = ""; public string Email { get; set; } = "";
public string Password { get; set; } = ""; public string Password { get; set; } = "";
[Required] [Required]
[RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$", ErrorMessage = "Street and house number required")] [RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$",
ErrorMessage = "Street and house number required")]
[MaxLength(128, ErrorMessage = "Max lenght reached")]
public string Address { get; set; } = ""; public string Address { get; set; } = "";
[Required] [Required]
[MinLength(3, ErrorMessage = "Invalid city")] [MinLength(3, ErrorMessage = "Invalid city")]
[MaxLength(128, ErrorMessage = "Max lenght reached")]
public string City { get; set; } = ""; public string City { get; set; } = "";
[Required] [Required]
[MinLength(3, ErrorMessage = "Invalid state")] [MinLength(3, ErrorMessage = "Invalid state")]
[MaxLength(64, ErrorMessage = "Max lenght reached")]
public string State { get; set; } = ""; public string State { get; set; } = "";
[Required] [Required]
[MinLength(3, ErrorMessage = "Invalid country")] [MinLength(3, ErrorMessage = "Invalid country")]
[MaxLength(64, ErrorMessage = "Max lenght reached")]
public string Country { get; set; } = ""; public string Country { get; set; } = "";
// States // States

1
Moonlight/resources/lang/de_de.lang
View File

@@ -401,3 +401,4 @@ The City field is required.;The City field is required.
The State field is required.;The State field is required. The State field is required.;The State field is required.
The Country field is required.;The Country field is required. The Country field is required.;The Country field is required.
Street and house number requered;Street and house number requered Street and house number requered;Street and house number requered
Max lenght reached;Max lenght reached