Add method DI

laravel · Nov 14, 2024 · d8255c5 · d8255c5
1 parent 947e0e4
commit d8255c5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/src/Http/Controllers/AuthenticatedSessionController.php b/src/Http/Controllers/AuthenticatedSessionController.php
@@ -95,10 +95,15 @@ protected function loginPipeline(LoginRequest $request)
      * Destroy an authenticated session.
      *
      * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard|null  $guard
      * @return \Laravel\Fortify\Contracts\LogoutResponse
      */
-    public function destroy(Request $request): LogoutResponse
+    public function destroy(Request $request, StatefulGuard|null $guard = null): LogoutResponse
     {
+        if ($guard) {
+            $this->guard = $guard;
+        }
+
         $this->guard->logout();
 
         if ($request->hasSession()) {

diff --git a/src/Http/Controllers/ConfirmablePasswordController.php b/src/Http/Controllers/ConfirmablePasswordController.php
@@ -46,10 +46,15 @@ public function show(Request $request)
      * Confirm the user's password.
      *
      * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard|null  $guard
      * @return \Illuminate\Contracts\Support\Responsable
      */
-    public function store(Request $request)
+    public function store(Request $request, StatefulGuard|null $guard = null)
     {
+        if ($guard) {
+            $this->guard = $guard;
+        }
+
         $confirmed = app(ConfirmPassword::class)(
             $this->guard, $request->user(), $request->input('password')
         );

diff --git a/src/Http/Controllers/NewPasswordController.php b/src/Http/Controllers/NewPasswordController.php
@@ -50,10 +50,15 @@ public function create(Request $request): ResetPasswordViewResponse
      * Reset the user's password.
      *
      * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard|null  $guard
      * @return \Illuminate\Contracts\Support\Responsable
      */
-    public function store(Request $request): Responsable
+    public function store(Request $request, StatefulGuard|null $guard = null): Responsable
     {
+        if ($guard) {
+            $this->guard = $guard;
+        }
+
         $request->validate([
             'token' => 'required',
             Fortify::email() => 'required|email',

diff --git a/src/Http/Controllers/RegisteredUserController.php b/src/Http/Controllers/RegisteredUserController.php
@@ -48,11 +48,16 @@ public function create(Request $request): RegisterViewResponse
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Laravel\Fortify\Contracts\CreatesNewUsers  $creator
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard|null  $guard
      * @return \Laravel\Fortify\Contracts\RegisterResponse
      */
     public function store(Request $request,
-                          CreatesNewUsers $creator): RegisterResponse
+                          CreatesNewUsers $creator, StatefulGuard|null $guard = null): RegisterResponse
     {
+        if ($guard) {
+            $this->guard = $guard;
+        }
+
         if (config('fortify.lowercase_usernames')) {
             $request->merge([
                 Fortify::username() => Str::lower($request->{Fortify::username()}),

diff --git a/src/Http/Controllers/TwoFactorAuthenticatedSessionController.php b/src/Http/Controllers/TwoFactorAuthenticatedSessionController.php
@@ -52,10 +52,15 @@ public function create(TwoFactorLoginRequest $request): TwoFactorChallengeViewRe
      * Attempt to authenticate a new session using the two factor authentication code.
      *
      * @param  \Laravel\Fortify\Http\Requests\TwoFactorLoginRequest  $request
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard|null  $guard
      * @return mixed
      */
-    public function store(TwoFactorLoginRequest $request)
+    public function store(TwoFactorLoginRequest $request, StatefulGuard|null $guard = null)
     {
+        if ($guard) {
+            $this->guard = $guard;
+        }
+
         $user = $request->challengedUser();
 
         if ($code = $request->validRecoveryCode()) {