From 303e17f6af403608c3781af00f0ecd18166f8193 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 10 Jan 2018 15:10:49 +0200
Subject: [PATCH] Fix for password reset

---
 app/Http/Controllers/Auth/ResetPasswordController.php    | 9 +--------
 .../Controllers/ClientAuth/ResetPasswordController.php   | 9 +--------
 resources/views/auth/passwords/reset.blade.php           | 2 +-
 resources/views/clientauth/passwords/reset.blade.php     | 2 +-
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index b19a40cde50f..f99fc56e397b 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
 
 use Event;
 use Illuminate\Http\Request;
-use App\Models\PasswordReset;
 use App\Events\UserLoggedIn;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
@@ -59,14 +58,8 @@ class ResetPasswordController extends Controller
 
     public function showResetForm(Request $request, $token = null)
     {
-        $passwordReset = PasswordReset::whereToken($token)->first();
-
-        if (! $passwordReset) {
-            return redirect('login')->withMessage(trans('texts.invalid_code'));
-        }
-
         return view('auth.passwords.reset')->with(
-            ['token' => $token, 'email' => $passwordReset->email]
+            ['token' => $token]
         );
     }
 }
diff --git a/app/Http/Controllers/ClientAuth/ResetPasswordController.php b/app/Http/Controllers/ClientAuth/ResetPasswordController.php
index 70dfbb1322c1..511c10cfa92e 100644
--- a/app/Http/Controllers/ClientAuth/ResetPasswordController.php
+++ b/app/Http/Controllers/ClientAuth/ResetPasswordController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\ClientAuth;
 
 use Password;
 use Config;
-use App\Models\PasswordReset;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
@@ -55,14 +54,8 @@ class ResetPasswordController extends Controller
 
     public function showResetForm(Request $request, $token = null)
     {
-        $passwordReset = PasswordReset::whereToken($token)->first();
-
-        if (! $passwordReset) {
-            return redirect('login')->withMessage(trans('texts.invalid_code'));
-        }
-
         return view('clientauth.passwords.reset')->with(
-            ['token' => $token, 'email' => $passwordReset->email]
+            ['token' => $token]
         );
     }
 
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 46ff102143bf..7ecf64a063ba 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -40,7 +40,7 @@
     <input type="hidden" name="token" value="{{{ $token }}}">
 
     <div>
-        {!! Former::text('email')->placeholder(trans('texts.email'))->value($email)->readonly(true)->raw() !!}
+        {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}
         {!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
         {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
     </div>
diff --git a/resources/views/clientauth/passwords/reset.blade.php b/resources/views/clientauth/passwords/reset.blade.php
index f0a0b05aaf39..199e949db881 100644
--- a/resources/views/clientauth/passwords/reset.blade.php
+++ b/resources/views/clientauth/passwords/reset.blade.php
@@ -40,7 +40,7 @@
         <input type="hidden" name="token" value="{{{ $token }}}">
 
         <div>
-            {!! Former::text('email')->placeholder(trans('texts.email'))->value($email)->readonly(true)->raw() !!}
+            {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}
             {!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
             {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
         </div>