dependencies-upgrade
This commit is contained in:
@@ -44,6 +44,10 @@ trait AuthenticatesUsers
|
||||
}
|
||||
|
||||
if ($this->attemptLogin($request)) {
|
||||
if ($request->hasSession()) {
|
||||
$request->session()->put('auth.password_confirmed_at', time());
|
||||
}
|
||||
|
||||
return $this->sendLoginResponse($request);
|
||||
}
|
||||
|
||||
@@ -80,7 +84,7 @@ trait AuthenticatesUsers
|
||||
protected function attemptLogin(Request $request)
|
||||
{
|
||||
return $this->guard()->attempt(
|
||||
$this->credentials($request), $request->filled('remember')
|
||||
$this->credentials($request), $request->boolean('remember')
|
||||
);
|
||||
}
|
||||
|
||||
|
@@ -55,7 +55,7 @@ trait ConfirmsPasswords
|
||||
protected function rules()
|
||||
{
|
||||
return [
|
||||
'password' => 'required|password',
|
||||
'password' => 'required|current_password:web',
|
||||
];
|
||||
}
|
||||
|
||||
|
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rules;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
trait ResetsPasswords
|
||||
@@ -21,11 +22,12 @@ trait ResetsPasswords
|
||||
* If no token is present, display the link request form.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string|null $token
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function showResetForm(Request $request, $token = null)
|
||||
public function showResetForm(Request $request)
|
||||
{
|
||||
$token = $request->route()->parameter('token');
|
||||
|
||||
return view('auth.passwords.reset')->with(
|
||||
['token' => $token, 'email' => $request->email]
|
||||
);
|
||||
@@ -68,7 +70,7 @@ trait ResetsPasswords
|
||||
return [
|
||||
'token' => 'required',
|
||||
'email' => 'required|email',
|
||||
'password' => 'required|confirmed|min:8',
|
||||
'password' => ['required', 'confirmed', Rules\Password::defaults()],
|
||||
];
|
||||
}
|
||||
|
||||
|
@@ -6,7 +6,6 @@ use Illuminate\Auth\Events\Lockout;
|
||||
use Illuminate\Cache\RateLimiter;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Facades\Lang;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
@@ -42,7 +41,7 @@ trait ThrottlesLogins
|
||||
* Redirect the user after determining they are locked out.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return void
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*
|
||||
* @throws \Illuminate\Validation\ValidationException
|
||||
*/
|
||||
@@ -53,7 +52,7 @@ trait ThrottlesLogins
|
||||
);
|
||||
|
||||
throw ValidationException::withMessages([
|
||||
$this->username() => [Lang::get('auth.throttle', [
|
||||
$this->username() => [trans('auth.throttle', [
|
||||
'seconds' => $seconds,
|
||||
'minutes' => ceil($seconds / 60),
|
||||
])],
|
||||
@@ -90,7 +89,7 @@ trait ThrottlesLogins
|
||||
*/
|
||||
protected function throttleKey(Request $request)
|
||||
{
|
||||
return Str::lower($request->input($this->username())).'|'.$request->ip();
|
||||
return Str::transliterate(Str::lower($request->input($this->username())).'|'.$request->ip());
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user