Updated username regex to not allow uppercase characters

JuniorDark · Jun 9, 2023 · 086b25b · 086b25b
1 parent d319a7d
commit 086b25b
Show file tree

Hide file tree

Showing 6 changed files with 4,781 additions and 4,703 deletions.
diff --git a/RHLauncher.RegForm/RegForm.Designer.cs b/RHLauncher.RegForm/RegForm.Designer.cs
diff --git a/RHLauncher.RegForm/RegForm.cs b/RHLauncher.RegForm/RegForm.cs
@@ -15,9 +15,6 @@ public partial class RegForm : Form
         private readonly System.Windows.Forms.Timer resendTimer = new();
         private int secondsLeft = 60;
 
-        [GeneratedRegex("^(?=.*[a-zA-Z])[a-zA-Z0-9]+$")]
-        private static partial Regex MyRegex();
-
         public RegForm()
         {
             InitializeComponent();
@@ -271,7 +268,9 @@ private void ReturnLabel_Click(object sender, EventArgs e)
         private bool NameTextBoxValid = false;
         private void NameTextBox_TextChanged(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(NameTextBox.Text) || NameTextBox.Text.Length < 6 || NameTextBox.Text.Length > 16 || !MyRegex().IsMatch(NameTextBox.Text))
+            Regex nameregex = new("^(?=.*[a-z])[a-z0-9]+$");
+
+            if (string.IsNullOrEmpty(NameTextBox.Text) || NameTextBox.Text.Length < 6 || NameTextBox.Text.Length > 16 || !nameregex.IsMatch(NameTextBox.Text) || HasUppercase(NameTextBox.Text))
             {
                 if (string.IsNullOrEmpty(NameTextBox.Text))
                 {
@@ -287,7 +286,14 @@ private void NameTextBox_TextChanged(object sender, EventArgs e)
                     NamePictureBox.Image = imageListTips.Images[0];
                     NameTextBoxValid = false;
                 }
-                else if (!MyRegex().IsMatch(NameTextBox.Text))
+                else if (HasUppercase(NameTextBox.Text))
+                {
+                    NameDescLabel.Text = LocalizedStrings.UsernameDescLabelUppercase;
+                    NameDescLabel.ForeColor = Color.Red;
+                    NamePictureBox.Image = imageListTips.Images[0];
+                    NameTextBoxValid = false;
+                }
+                else if (!nameregex.IsMatch(NameTextBox.Text))
                 {
                     NameDescLabel.Text = LocalizedStrings.UsernameDescLabelInvalid;
                     NameDescLabel.ForeColor = Color.Red;
@@ -304,6 +310,11 @@ private void NameTextBox_TextChanged(object sender, EventArgs e)
             CheckFormS2Validity();
         }
 
+        private static bool HasUppercase(string text)
+        {
+            return text.Any(char.IsUpper);
+        }
+
         private bool PasswordTextBoxValid = false;
         private void PasswordTextBox_TextChanged(object sender, EventArgs e)
         {