DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Added a few comments to make it clearer what’s happening

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-06-21 14:33:10 -07:00
parent d4c53945d9
commit 300879847f
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Http/Controllers/Auth/ResetPasswordController.php
View file

@ -81,9 +81,10 @@ class ResetPasswordController extends Controller
$request->validate($this->rules(), $request->all(), $this->validationErrorMessages()); $request->validate($this->rules(), $request->all(), $this->validationErrorMessages());
// Check to see if the user even exists // Check to see if the user even exists
if ($user = User::where('username', '=', $request->input('username'))->first()) { if ($user = User::where('username', '=', $request->input('username'))->whereNotNull('email')->first()) {
$broker = $this->broker(); $broker = $this->broker();
// handle the password validation rules set by the admin settings
if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) { if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) {
$request->validate( $request->validate(
[ [
@ -91,30 +92,25 @@ class ResetPasswordController extends Controller
], $messages); ], $messages);
} }
// send the reset
$response = $broker->reset( $response = $broker->reset(
$this->credentials($request), function ($user, $password) { $this->credentials($request), function ($user, $password) {
$this->resetPassword($user, $password); $this->resetPassword($user, $password);
} });
);
}
// This is laravel magic - we override the sendResetFailedResponse further down to send a success message even if it failed
return $response == \Password::PASSWORD_RESET return $response == \Password::PASSWORD_RESET
? $this->sendResetResponse($request, $response) ? $this->sendResetResponse($request, $response)
: $this->sendResetFailedResponse($request, $response); : $this->sendResetFailedResponse($request, $response);
}
// the user doesn't exist, so we're not really sending anything here
return redirect()->route('login')
->withInput(['username'=> $request->input('username')])
->with('success', trans('passwords.sent'));
} }
protected function sendResetFailedResponse(Request $request, $response) protected function sendResetFailedResponse(Request $request, $response)
{ {
return redirect()->back() return redirect()->back()
->withInput(['username'=> $request->input('username')]) ->withInput(['username'=> $request->input('username')])
->withErrors(['username' => trans($response), 'password' => trans($response)]); ->with('success', trans('passwords.sent'));
} }
} }