Update Auth controllers in sync with laravel/breeze updates

See laravel/breeze#385 and laravel/breeze#386
foxcoverts · May 25, 2024 · 99aff0e · 99aff0e
1 parent 0fd7c0e
commit 99aff0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Enums\Accreditation;
 use App\Enums\Role;
 use App\Events\Registered;
 use App\Http\Controllers\Controller;
@@ -35,7 +34,7 @@ public function store(Request $request): RedirectResponse
     {
         $request->validate([
             'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:' . User::class],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class],
             'phone' => ['nullable', 'phone:INTERNATIONAL,GB'],
             'password' => ['required', 'confirmed', Rules\Password::defaults()],
             'emergency_name' => ['nullable', 'required_with:emergency_phone', 'string', 'max:100'],
@@ -47,7 +46,7 @@ public function store(Request $request): RedirectResponse
             'name' => $request->name,
             'email' => $request->email,
             'phone' => $request->phone,
-            'password' => Hash::make($request->password),
+            'password' => Hash::make($request->string('password')),
             'emergency_name' => $request->emergency_name,
             'emergency_phone' => $request->emergency_phone,
             'timezone' => $request->timezone,
@@ -66,7 +65,7 @@ public function edit(Request $request, User $user): View|RedirectResponse|Respon
         if ($user->password != '') {
             return redirect()->route('profile');
         }
-        if (!$request->hasValidSignature()) {
+        if (! $request->hasValidSignature()) {
             return response()->view('auth.setup-account-expired', [
                 'user' => $user,
             ], Response::HTTP_FORBIDDEN);
@@ -82,7 +81,7 @@ public function update(Request $request, User $user): RedirectResponse
         if ($user->password != '') {
             abort(Response::HTTP_FORBIDDEN, 'Invitation expired');
         }
-        if (!$request->hasValidSignature()) {
+        if (! $request->hasValidSignature()) {
             abort(Response::HTTP_FORBIDDEN, 'Invitation expired');
         }
 
@@ -100,7 +99,7 @@ public function update(Request $request, User $user): RedirectResponse
             'name' => $request->name,
             'email' => $request->email,
             'phone' => $request->phone,
-            'password' => Hash::make($request->password),
+            'password' => Hash::make($request->string('password')),
             'emergency_name' => $request->emergency_name,
             'emergency_phone' => $request->emergency_phone,
             'timezone' => $request->timezone,

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -44,14 +44,14 @@ public function store(Request $request): RedirectResponse
             function (User $user) use ($request) {
                 // If the user has not verified their email address yet, then we can
                 // now verify it, since they will only get here via an email link.
-                if (!$user->hasVerifiedEmail()) {
+                if (! $user->hasVerifiedEmail()) {
                     $user->forceFill([
                         'email_verified_at' => $user->freshTimestamp(),
                     ]);
                 }
 
                 $user->forceFill([
-                    'password' => Hash::make($request->password),
+                    'password' => Hash::make($request->string('password')),
                     'remember_token' => Str::random(60),
                 ])->save();
 
@@ -65,6 +65,6 @@ function (User $user) use ($request) {
         return $status == Password::PASSWORD_RESET
             ? redirect()->route('login')->with('status', __($status))
             : back()->withInput($request->only('email'))
-            ->withErrors(['email' => __($status)]);
+                ->withErrors(['email' => __($status)]);
     }
 }