Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 03:57:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

working on password reset

Browse Source
This commit is contained in:
Hillel Coren 2017-11-15 11:25:41 +02:00
parent 4c4cbf316e
commit 0f5f1b6d19
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -3,6 +3,8 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use Event; use Event;
use Illuminate\Http\Request;
use App\Models\PasswordReset;
use App\Events\UserLoggedIn; use App\Events\UserLoggedIn;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
@ -58,10 +60,13 @@ class ResetPasswordController extends Controller
public function showResetForm(Request $request, $token = null) public function showResetForm(Request $request, $token = null)
{ {
$passwordReset = PasswordReset::whereToken($token)->first(); $passwordReset = PasswordReset::whereToken($token)->first();
$email = $passwordReset ? $passwordReset->email : '';
if (! $passwordReset) {
return redirect('login')->withMessage(trans('texts.invalid_code'));
}
return view('auth.passwords.reset')->with( return view('auth.passwords.reset')->with(
['token' => $token, 'email' => $email] ['token' => $token, 'email' => $passwordReset->email]
); );
} }
} }

8
app/Http/Controllers/ClientAuth/ResetPasswordController.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers\ClientAuth;
use Password; use Password;
use Config; use Config;
use App\Models\PasswordReset;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -56,10 +57,13 @@ class ResetPasswordController extends Controller
public function showResetForm(Request $request, $token = null) public function showResetForm(Request $request, $token = null)
{ {
$passwordReset = PasswordReset::whereToken($token)->first(); $passwordReset = PasswordReset::whereToken($token)->first();
$email = $passwordReset ? $passwordReset->email : '';
if (! $passwordReset) {
return redirect('login')->withMessage(trans('texts.invalid_code'));
}
return view('clientauth.passwords.reset')->with( return view('clientauth.passwords.reset')->with(
['token' => $token, 'email' => $email] ['token' => $token, 'email' => $passwordReset->email]
); );
} }

4
resources/views/auth/passwords/reset.blade.php
View File

@ -40,7 +40,7 @@
<input type="hidden" name="token" value="{{{ $token }}}"> <input type="hidden" name="token" value="{{{ $token }}}">
<div> <div>
{!! Former::text('email')->placeholder(trans('texts.password'))->value($email)->raw() !!} {!! Former::text('email')->placeholder(trans('texts.email'))->value($email)->readonly(true)->raw() !!}
{!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->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() !!} {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
</div> </div>
@ -52,7 +52,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$('#email').focus(); $('#password').focus();
}) })
</script> </script>

2
resources/views/clientauth/passwords/reset.blade.php
View File

@ -40,7 +40,7 @@
<input type="hidden" name="token" value="{{{ $token }}}"> <input type="hidden" name="token" value="{{{ $token }}}">
<div> <div>
{!! Former::text('email')->placeholder(trans('texts.password'))->value($email)->raw() !!} {!! Former::text('email')->placeholder(trans('texts.email'))->value($email)->readonly(true)->raw() !!}
{!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->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() !!} {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
</div> </div>