From 1e9696df64a98420a451de2527dcf19e6108ca25 Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Wed, 15 Aug 2018 17:24:21 +0530
Subject: [PATCH] Override password reset functionality

---
 app/Http/Controllers/Auth/ForgotPasswordController.php | 2 +-
 app/Http/Controllers/Auth/PasswordController.php       | 7 +++----
 resources/views/auth/reset.blade.php                   | 2 +-
 routes/web.php                                         | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index abfca9070..5b10ab968 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -61,7 +61,7 @@ class ForgotPasswordController extends Controller
                 } else {
                     $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
                 }
-                $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)], true);
+                $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code.'?email='.$user->email)], true);
                 if ($user->mobile != '' && $user->mobile != null) {
                     if ($user->first_name) {
                         $name = $user->first_name;
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 07d224371..84130a4cb 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -102,11 +102,10 @@ class PasswordController extends Controller
     {
         $this->validate(
             $request,
-            $this->getResetValidationRules(),
-            $this->getResetValidationMessages(),
-            $this->getResetValidationCustomAttributes()
+            $this->rules(),
+            $this->validationErrorMessages()
         );
-        $credentials = $this->getResetCredentials($request);
+        $credentials = $this->credentials($request);
         // dd($credentials);
         $email = $credentials['email'];
         $password = $credentials['password'];
diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php
index 0fb604fa6..28c1f791b 100644
--- a/resources/views/auth/reset.blade.php
+++ b/resources/views/auth/reset.blade.php
@@ -26,7 +26,7 @@
         <input type="hidden" name="token" value="{{ $token }}">
         <!-- Email -->
         <div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
-            <input type="email" class="form-control" name="email" placeholder="{!! Lang::get('lang.e-mail') !!}" value="{{ old('email') }}">
+            <input type="email" class="form-control" name="email" placeholder="{!! Lang::get('lang.e-mail') !!}" value="{{ $email }}" readonly>
             <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
         </div>
         <!-- password -->
diff --git a/routes/web.php b/routes/web.php
index 7d2fd6a85..69c2b9b95 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,6 +15,7 @@ Route::group(['middleware' => ['web']], function () {
         Auth::routes();
         Route::post('login', ['uses' => 'Auth\AuthController@postLogin', 'as' => 'post.login']);
         Route::post('auth/register', ['uses' => 'Auth\AuthController@postRegister', 'as' => 'post.register']);
+        Route::post('password/reset', ['uses' => 'Auth\PasswordController@reset', 'as' => 'post.reset']);
         Route::get('auth/logout', ['uses' => 'Auth\AuthController@getLogout', 'as' => 'get.logout']);
         Route::get('social/login/redirect/{provider}/{redirect?}', ['uses' => 'Auth\AuthController@redirectToProvider', 'as' => 'social.login']);
         Route::get('social/login/{provider}', ['as'=>'social.login.callback', 'uses'=>'Auth\AuthController@handleProviderCallback']);