From 6147c3e5db4868b3e9ddff436899ee8b85b3fd08 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 23 Jan 2020 11:01:04 +0530
Subject: [PATCH] Issue #2114

---
 .../Controllers/ResetPasswordController.php   | 46 +++++++++++--------
 .../Controllers/ForgetPasswordController.php  | 42 +++++++++--------
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php
index 73e47ef7f..304d915eb 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php
@@ -57,27 +57,33 @@ class ResetPasswordController extends Controller
      */
     public function store()
     {
-        $this->validate(request(), [
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => 'required|confirmed|min:6',
-        ]);
-
-        $response = $this->broker()->reset(
-            request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) {
-                $this->resetPassword($customer, $password);
-            }
-        );
-
-        if ($response == Password::PASSWORD_RESET) {
-            return redirect()->route($this->_config['redirect']);
-        }
-
-        return back()
-            ->withInput(request(['email']))
-            ->withErrors([
-                'email' => trans($response)
+        try {
+            $this->validate(request(), [
+                'token' => 'required',
+                'email' => 'required|email',
+                'password' => 'required|confirmed|min:6',
             ]);
+
+            $response = $this->broker()->reset(
+                request(['email', 'password', 'password_confirmation', 'token']), function ($customer, $password) {
+                    $this->resetPassword($customer, $password);
+                }
+            );
+
+            if ($response == Password::PASSWORD_RESET) {
+                return redirect()->route($this->_config['redirect']);
+            }
+
+            return back()
+                ->withInput(request(['email']))
+                ->withErrors([
+                    'email' => trans($response)
+                ]);
+        } catch(\Exception $e) {
+            session()->flash('success', trans($e->getMessage()));
+
+            return redirect()->back();
+        }
     }
 
     /**
diff --git a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
index 3ad6f1bc0..4be924629 100755
--- a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
+++ b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
@@ -35,7 +35,7 @@ class ForgetPasswordController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\View\View 
+     * @return \Illuminate\View\View
      */
     public function create()
     {
@@ -49,25 +49,31 @@ class ForgetPasswordController extends Controller
      */
     public function store()
     {
-        $this->validate(request(), [
-            'email' => 'required|email'
-        ]);
+        try {
+            $this->validate(request(), [
+                'email' => 'required|email'
+            ]);
 
-        $response = $this->broker()->sendResetLink(
-            request(['email'])
-        );
-
-        if ($response == Password::RESET_LINK_SENT) {
-            session()->flash('success', trans($response));
-
-            return back();
-        }
-
-        return back()
-            ->withInput(request(['email']))
-            ->withErrors(
-                ['email' => trans($response)]
+            $response = $this->broker()->sendResetLink(
+                request(['email'])
             );
+
+            if ($response == Password::RESET_LINK_SENT) {
+                session()->flash('success', trans($response));
+
+                return back();
+            }
+
+            return back()
+                ->withInput(request(['email']))
+                ->withErrors(
+                    ['email' => trans($response)]
+                );
+        } catch(\Exception $e) {
+            session()->flash('success', trans($e->getMessage()));
+
+            return redirect()->back();
+        }
     }
 
     /**