StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade to Laravel 9 (#4413)

Browse source 
Co-authored-by: DaneEveritt <dane@daneeveritt.com>
This commit is contained in:
Matthew Penner 2022-10-14 10:59:20 -06:00 • committed by GitHub
parent 95e15d2c8a
commit cbcf62086f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
573 changed files with 4387 additions and 9411 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Http/Controllers/Auth/AbstractLoginController.php
View file

@ -8,6 +8,8 @@ use Illuminate\Auth\AuthManager;
use Illuminate\Http\JsonResponse;
use Illuminate\Auth\Events\Failed;
use Illuminate\Container\Container;
use Illuminate\Support\Facades\Event;
use Pterodactyl\Events\Auth\DirectLogin;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Auth\Authenticatable;
@ -21,24 +23,18 @@ abstract class AbstractLoginController extends Controller
/**
* Lockout time for failed login requests.
*
* @var int
*/
protected $lockoutTime;
protected int $lockoutTime;
/**
* After how many attempts should logins be throttled and locked.
*
* @var int
*/
protected $maxLoginAttempts;
protected int $maxLoginAttempts;
/**
* Where to redirect users after login / registration.
*
* @var string
*/
protected $redirectTo = '/';
protected string $redirectTo = '/';
/**
* LoginController constructor.
@ -81,6 +77,8 @@ abstract class AbstractLoginController extends Controller
$this->auth->guard()->login($user, true);
Event::dispatch(new DirectLogin($user, true));
return new JsonResponse([
'data' => [
'complete' => true,
@ -91,7 +89,7 @@ abstract class AbstractLoginController extends Controller
}
/**
* Determine if the user is logging in using an email or username,.
* Determine if the user is logging in using an email or username.
*/
protected function getField(string $input = null): string
{
@ -103,6 +101,6 @@ abstract class AbstractLoginController extends Controller
*/
protected function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = [])
{
event(new Failed('auth', $user, $credentials));
Event::dispatch(new Failed('auth', $user, $credentials));
}
}