Merge pull request #3556 from GongMingCai/development

[bookstack] / app / Http / Controllers / Auth / ForgotPasswordController.php

diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index fadac641ecdb810b916560611029a1b517d3d6fe..5e73b232ca734f6a4a5126d1b059a067ee314569 100644 (file)
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use BookStack\Actions\ActivityType;

 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;


@@ -31,19 +32,20 @@ class ForgotPasswordController extends Controller
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');

-        parent::__construct();

     }
 
     }
 

-

     /**
      * Send a reset link to the given user.
      *
     /**
      * Send a reset link to the given user.
      *

-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *

      * @return \Illuminate\Http\RedirectResponse
      */
     public function sendResetLinkEmail(Request $request)
     {
      * @return \Illuminate\Http\RedirectResponse
      */
     public function sendResetLinkEmail(Request $request)
     {

-        $this->validate($request, ['email' => 'required|email']);
+        $this->validate($request, [
+            'email' => ['required', 'email'],
+        ]);

 
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
 
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we


@@ -52,9 +54,14 @@ class ForgotPasswordController extends Controller
             $request->only('email')
         );
 
             $request->only('email')
         );
 

-        if ($response === Password::RESET_LINK_SENT || $response === Password::INVALID_USER) {
+        if ($response === Password::RESET_LINK_SENT) {
+            $this->logActivity(ActivityType::AUTH_PASSWORD_RESET, $request->get('email'));
+        }
+
+        if (in_array($response, [Password::RESET_LINK_SENT, Password::INVALID_USER, Password::RESET_THROTTLED])) {

             $message = trans('auth.reset_password_sent', ['email' => $request->get('email')]);
             $this->showSuccessNotification($message);
             $message = trans('auth.reset_password_sent', ['email' => $request->get('email')]);
             $this->showSuccessNotification($message);

+

             return back()->with('status', trans($response));
         }
 
             return back()->with('status', trans($response));
         }