Skip to content

Commit cae6dc7

Browse files
committed
fix: username validation rules
1 parent d664ded commit cae6dc7

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/Controllers/LoginController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function loginAction(): RedirectResponse
6464
protected function getValidationRules(): array
6565
{
6666
return setting('Validation.login') ?? [
67-
//'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]',
67+
//'username' => 'required|max_length[30]|regex_match[/\A[a-zA-Z0-9\.]+\z/]|min_length[3]',
6868
'email' => 'required|max_length[254]|valid_email',
6969
'password' => 'required',
7070
];

src/Controllers/RegisterController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected function getUserEntity(): User
131131
protected function getValidationRules(): array
132132
{
133133
return setting('Validation.registration') ?? [
134-
'username' => 'required|alpha_numeric_space|min_length[3]|is_unique[users.username]',
134+
'username' => 'required|max_length[30]|regex_match[/\A[a-zA-Z0-9\.]+\z/]|min_length[3]|is_unique[users.username]',
135135
'email' => 'required|valid_email|is_unique[auth_identities.secret]',
136136
'password' => 'required|strong_password',
137137
'password_confirm' => 'required|matches[password]',

src/Models/UserModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function addToDefaultGroup(User $user): void
118118
public function fake(Generator &$faker): User
119119
{
120120
return new User([
121-
'username' => str_replace('.', ' ', $faker->userName),
121+
'username' => $faker->userName,
122122
'active' => true,
123123
]);
124124
}

tests/Controllers/LoginTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testLoginActionUsernameSuccess(): void
120120
// Change the validation rules
121121
$config = new class () extends Validation {
122122
public $login = [
123-
'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]',
123+
'username' => 'required|max_length[30]|regex_match[/\A[a-zA-Z0-9\.]+\z/]|min_length[3]',
124124
'password' => 'required',
125125
];
126126
};

0 commit comments

Comments
 (0)