DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use username for forgotten password

Browse source 
Since emails are not required to be unique
This commit is contained in:
snipe 2020-11-02 23:57:00 -08:00
parent b828985151
commit c800662f0c
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Auth/ForgotPasswordController.php
View file

@ -5,7 +5,6 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
class ForgotPasswordController extends Controller class ForgotPasswordController extends Controller
{ {
@ -60,7 +59,7 @@ class ForgotPasswordController extends Controller
*/ */
$request->validate([ $request->validate([
'email' => ['required', 'email', 'max:255'], 'username' => ['required', 'max:255'],
]); ]);
@ -74,16 +73,16 @@ class ForgotPasswordController extends Controller
*/ */
$response = $this->broker()->sendResetLink( $response = $this->broker()->sendResetLink(
array_merge( array_merge(
$request->only('email'), $request->only('username'),
['activated' => '1'], ['activated' => '1'],
['ldap_import' => '0'] ['ldap_import' => '0']
) )
); );
if ($response === \Password::RESET_LINK_SENT) { if ($response === \Password::RESET_LINK_SENT) {
\Log::info('Password reset attempt: User '.$request->input('email').' found, password reset sent'); \Log::info('Password reset attempt: User '.$request->input('username').' WAS found, password reset sent');
} else { } else {
\Log::info('Password reset attempt: User '.$request->input('email').' not found or user is inactive'); \Log::info('Password reset attempt: User matching username '.$request->input('username').' NOT FOUND or user is inactive');
} }

6
resources/views/auth/passwords/email.blade.php
View file

@ -31,11 +31,11 @@
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<div class="col-md-12"> <div class="col-md-12">
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="{{ trans('admin/users/table.email') }}" aria-label="email"> <input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="{{ trans('admin/users/table.username') }}" aria-label="username">
{!! $errors->first('email', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('username', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>