DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset

Browse source 
Fixes Integrity constraint violation when emailing password reset.
This commit is contained in:
snipe 2021-07-30 16:01:53 -07:00 committed by GitHub
parent 593e1234a5 27cdfbc579
commit cdc4940338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ class ForgotPasswordController extends Controller
$request->validate([
'username' => ['required', 'max:255'],
]);
/**
@ -71,13 +71,21 @@ class ForgotPasswordController extends Controller
* Once we have attempted to send the link, we will examine the response
* then see the message we need to show to the user. Finally, we'll send out a proper response.
*/
$response = $this->broker()->sendResetLink(
array_merge(
$request->only('username'),
['activated' => '1'],
['ldap_import' => '0']
)
);
$response = null;
try {
$response = $this->broker()->sendResetLink(
array_merge(
$request->only('username'),
['activated' => '1'],
['ldap_import' => '0']
)
);
} catch(\Exception $e) {
\Log::info('Password reset attempt: User '.$request->input('username').'failed with exception: '.$e );
}
if ($response === \Password::RESET_LINK_SENT) {
\Log::info('Password reset attempt: User '.$request->input('username').' WAS found, password reset sent');