Merge pull request #85 from Etherna/improve/ESSO-112-increase-max-use…

…rname-length Increased username length
Etherna · Nov 10, 2021 · 4c41298 · 4c41298
2 parents 1e8d0ef + 7071a70
commit 4c41298
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/EthernaSSO.Domain/Helpers/UsernameHelper.cs b/src/EthernaSSO.Domain/Helpers/UsernameHelper.cs
@@ -22,7 +22,8 @@ public static class UsernameHelper
     {
         // Consts.
         public const string AllowedUsernameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._";
-        public const string UsernameRegex = "^[a-zA-Z0-9_]{5,20}$";
+        public const string UsernameRegex = "^[a-zA-Z0-9_]{5,25}$";
+        public const string UsernameValidationErrorMessage = "Allowed characters are a-z, A-Z, 0-9, _. Permitted length is between 5 and 25.";
 
         // Methods.
         public static bool IsValidUsername(string username) =>

diff --git a/src/EthernaSSO/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/src/EthernaSSO/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
@@ -50,7 +50,7 @@ public class InputModel : IValidatableObject
             public string? InvitationCode { get; set; }
 
             [Required]
-            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = "Allowed characters are a-z, A-Z, 0-9, _. Permitted length is between 5 and 20.")]
+            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = UsernameHelper.UsernameValidationErrorMessage)]
             [Display(Name = "Username")]
             public string Username { get; set; } = default!;
 

diff --git a/src/EthernaSSO/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/EthernaSSO/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -42,7 +42,7 @@ public class InputModel : IValidatableObject
         {
             // Properties.
             [Required]
-            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = "Allowed characters are a-z, A-Z, 0-9, _. Permitted length is between 5 and 20.")]
+            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = UsernameHelper.UsernameValidationErrorMessage)]
             [Display(Name = "Username")]
             public string Username { get; set; } = default!;
 

diff --git a/src/EthernaSSO/Areas/Identity/Pages/Account/Web3Login.cshtml.cs b/src/EthernaSSO/Areas/Identity/Pages/Account/Web3Login.cshtml.cs
@@ -44,7 +44,7 @@ public class InputModel : IValidatableObject
             public string? InvitationCode { get; set; }
 
             [Required]
-            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = "Allowed characters are a-z, A-Z, 0-9, _. Permitted length is between 5 and 20.")]
+            [RegularExpression(UsernameHelper.UsernameRegex, ErrorMessage = UsernameHelper.UsernameValidationErrorMessage)]
             [Display(Name = "Username")]
             public string Username { get; set; } = default!;