Lexical: Source code input changes

[bookstack] / app / Access / Controllers / ResetPasswordController.php

diff --git a/app/Access/Controllers/ResetPasswordController.php b/app/Access/Controllers/ResetPasswordController.php
index eae4e5e25c28ebc28b6be49a657a6dd6060bbb4e..3af65d17fb607207180417b64df10bd92cbd52cc 100644 (file)
--- a/app/Access/Controllers/ResetPasswordController.php
+++ b/app/Access/Controllers/ResetPasswordController.php
@@ -15,14 +15,11 @@ use Illuminate\Validation\Rules\Password as PasswordRule;
 
 class ResetPasswordController extends Controller
 {
 
 class ResetPasswordController extends Controller
 {

-    protected LoginService $loginService;
-
-    public function __construct(LoginService $loginService)
-    {
+    public function __construct(
+        protected LoginService $loginService
+    ) {

         $this->middleware('guest');
         $this->middleware('guard:standard');
         $this->middleware('guest');
         $this->middleware('guard:standard');

-
-        $this->loginService = $loginService;

     }
 
     /**
     }
 
     /**


@@ -66,7 +63,7 @@ class ResetPasswordController extends Controller
         // redirect them back to where they came from with their error message.
         return $response === Password::PASSWORD_RESET
             ? $this->sendResetResponse()
         // redirect them back to where they came from with their error message.
         return $response === Password::PASSWORD_RESET
             ? $this->sendResetResponse()

-            : $this->sendResetFailedResponse($request, $response);
+            : $this->sendResetFailedResponse($request, $response, $request->get('token'));

     }
 
     /**
     }
 
     /**


@@ -83,7 +80,7 @@ class ResetPasswordController extends Controller
     /**
      * Get the response for a failed password reset.
      */
     /**
      * Get the response for a failed password reset.
      */

-    protected function sendResetFailedResponse(Request $request, string $response): RedirectResponse
+    protected function sendResetFailedResponse(Request $request, string $response, string $token): RedirectResponse

     {
         // We show invalid users as invalid tokens as to not leak what
         // users may exist in the system.
     {
         // We show invalid users as invalid tokens as to not leak what
         // users may exist in the system.


@@ -91,7 +88,7 @@ class ResetPasswordController extends Controller
             $response = Password::INVALID_TOKEN;
         }
 
             $response = Password::INVALID_TOKEN;
         }
 

-        return redirect()->back()
+        return redirect("/password/reset/{$token}")

             ->withInput($request->only('email'))
             ->withErrors(['email' => trans($response)]);
     }
             ->withInput($request->only('email'))
             ->withErrors(['email' => trans($response)]);
     }