Prevent empty username fields from being added to requests (#590)

laravel · Jan 24, 2025 · fe9ddfc · fe9ddfc
1 parent b3c7b42
commit fe9ddfc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/Actions/CanonicalizeUsername.php b/src/Actions/CanonicalizeUsername.php
@@ -16,9 +16,11 @@ class CanonicalizeUsername
      */
     public function handle($request, $next)
     {
-        $request->merge([
-            Fortify::username() => Str::lower($request->{Fortify::username()}),
-        ]);
+        if ($request->has(Fortify::username())) {
+            $request->merge([
+                Fortify::username() => Str::lower($request->{Fortify::username()}),
+            ]);
+        }
 
         return $next($request);
     }

diff --git a/src/Http/Controllers/PasswordResetLinkController.php b/src/Http/Controllers/PasswordResetLinkController.php
@@ -36,7 +36,7 @@ public function store(Request $request): Responsable
     {
         $request->validate([Fortify::email() => 'required|email']);
 
-        if (config('fortify.lowercase_usernames')) {
+        if (config('fortify.lowercase_usernames') && $request->has(Fortify::email())) {
             $request->merge([
                 Fortify::email() => Str::lower($request->{Fortify::email()}),
             ]);

diff --git a/src/Http/Controllers/ProfileInformationController.php b/src/Http/Controllers/ProfileInformationController.php
@@ -21,7 +21,7 @@ class ProfileInformationController extends Controller
     public function update(Request $request,
                            UpdatesUserProfileInformation $updater)
     {
-        if (config('fortify.lowercase_usernames')) {
+        if (config('fortify.lowercase_usernames') && $request->has(Fortify::username())) {
             $request->merge([
                 Fortify::username() => Str::lower($request->{Fortify::username()}),
             ]);

diff --git a/src/Http/Controllers/RegisteredUserController.php b/src/Http/Controllers/RegisteredUserController.php
@@ -53,7 +53,7 @@ public function create(Request $request): RegisterViewResponse
     public function store(Request $request,
                           CreatesNewUsers $creator): RegisterResponse
     {
-        if (config('fortify.lowercase_usernames')) {
+        if (config('fortify.lowercase_usernames') && $request->has(Fortify::username())) {
             $request->merge([
                 Fortify::username() => Str::lower($request->{Fortify::username()}),
             ]);