extract action

src/Actions/ConfirmPassword.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Laravel\Fortify\Actions;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Laravel\Fortify\Fortify;
+
+class ConfirmPassword
+{
+    /**
+     * Confirm that the given password is valid for the given user.
+     *
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard  $guard
+     * @param  mixed  $user
+     * @param  string  $password
+     * @return bool
+     */
+    public function __invoke(StatefulGuard $guard, $user, string $password)
+    {
+        $username = config('fortify.username');
+
+        return is_null(Fortify::$confirmPasswordsUsingCallback) ? $guard->validate([
+            $username => $user->{$username},
+            'password' => $password,
+        ]) : $this->confirmPasswordUsingCustomCallback($user, $password);
+    }
+
+    /**
+     * Confirm the user's password using a custom callback.
+     *
+     * @param  mixed  $user
+     * @param  string  $password
+     * @return bool
+     */
+    protected function confirmPasswordUsingCustomCallback($user, string $password)
+    {
+        return call_user_func(
+            Fortify::$confirmPasswordsUsingCallback,
+            $user,
+            $password
+        );
+    }
+}

src/Http/Controllers/ConfirmablePasswordController.php

@@ -5,10 +5,10 @@
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Laravel\Fortify\Actions\ConfirmPassword;
 use Laravel\Fortify\Contracts\ConfirmPasswordViewResponse;
 use Laravel\Fortify\Contracts\FailedPasswordConfirmationResponse;
 use Laravel\Fortify\Contracts\PasswordConfirmedResponse;
-use Laravel\Fortify\Fortify;
 
 class ConfirmablePasswordController extends Controller
 {
@@ -49,12 +49,9 @@ public function show(Request $request)
      */
     public function store(Request $request)
     {
-        $username = config('fortify.username');
-
-        $confirmed = is_null(Fortify::$confirmPasswordsUsingCallback) ?  $this->guard->validate([
-            $username => $request->user()->{$username},
-            'password' => $request->input('password')
-        ]) : $this->confirmPasswordUsingCustomCallback($request);
+        $confirmed = app(ConfirmPassword::class)(
+            $this->guard, $request->user(), $request->input('password')
+        );
 
         if ($confirmed) {
             $request->session()->put('auth.password_confirmed_at', time());
@@ -64,19 +61,4 @@ public function store(Request $request)
                     ? app(PasswordConfirmedResponse::class)
                     : app(FailedPasswordConfirmationResponse::class);
     }
-
-    /**
-     * Confirm the user's password using a custom callback.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return bool
-     */
-    protected function confirmPasswordUsingCustomCallback(Request $request)
-    {
-        return call_user_func(
-            Fortify::$confirmPasswordsUsingCallback,
-            $request->user(),
-            $request->input('password')
-        );
-    }
 }