DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Added new password complexity rules to forgot password

Browse source
This commit is contained in:
snipe 2020-11-03 11:42:42 -08:00
parent 44e5fec707
commit cfc1e1366c
1 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,9 +3,13 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\SaveUserRequest;
use App\Models\Setting; use App\Models\Setting;
use App\Models\User;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator;
class ResetPasswordController extends Controller class ResetPasswordController extends Controller
{ {
@ -71,34 +75,49 @@ class ResetPasswordController extends Controller
} }
// public function reset(Request $request) public function reset(Request $request)
// { {
// $this->validate($request, $this->rules(), $this->validationErrorMessages());
// $messages = [
// // These two lines below allow you to bypass the default validation. 'password.not_in' => trans('validation.disallow_same_pwd_as_user_fields'),
// $broker = $this->broker(); ];
// $broker->validate(function () {
// return true; $validator = $request->validate($this->rules(), $request->all(), $this->validationErrorMessages());
// });
// // Check to see if the user even exists
// $response->reset( $user = User::where('username', '=', $request->input('username'))->first();
// $this->credentials($request), function ($user, $password) {
// \Log::debug('resetting the password to '.$password); $broker = $this->broker();
// $this->resetPassword($user, $password); if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== FALSE) {
// } \Log::debug('disallow_same_pwd_as_user_fields is active on the password settings');
// ); $request->validate(
// [
// return $response == \Password::PASSWORD_RESET 'password' => 'required|notIn:["'.$user->email.'","'.$user->username.'","'.$user->first_name.'","'.$user->last_name.'"'
// ? $this->sendResetResponse($response) ], $messages);
// : $this->sendResetFailedResponse($request, $response);
// } }
$response = $broker->reset(
$this->credentials($request), function ($user, $password) {
\Log::debug('resetting the password to '.$password);
$this->resetPassword($user, $password);
}
);
return $response == \Password::PASSWORD_RESET
? $this->sendResetResponse($request, $response)
: $this->sendResetFailedResponse($request, $response);
}
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)]); ->withErrors(['username' => trans($response), 'password' => trans($response)]);
} }
} }