Upgrade to Laravel 9 (#4413)

Co-authored-by: DaneEveritt <dane@daneeveritt.com>

app/Http/Controllers/Auth/AbstractLoginController.php

@@ -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));
     }
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -15,9 +15,6 @@ class ForgotPasswordController extends Controller
 
     /**
      * Get the response for a failed password reset link.
-     *
-     * @param \Illuminate\Http\Request
-     * @param string $response
      */
     protected function sendResetLinkFailedResponse(Request $request, $response): JsonResponse
     {

app/Http/Controllers/Auth/LoginCheckpointController.php

@@ -18,22 +18,15 @@ class LoginCheckpointController extends AbstractLoginController
 {
     private const TOKEN_EXPIRED_MESSAGE = 'The authentication token provided has expired, please refresh the page and try again.';
 
-    private ValidationFactory $validation;
-
-    private Google2FA $google2FA;
-
-    private Encrypter $encrypter;
-
     /**
      * LoginCheckpointController constructor.
      */
-    public function __construct(Encrypter $encrypter, Google2FA $google2FA, ValidationFactory $validation)
-    {
+    public function __construct(
+        private Encrypter $encrypter,
+        private Google2FA $google2FA,
+        private ValidationFactory $validation
+    ) {
         parent::__construct();
-
-        $this->google2FA = $google2FA;
-        $this->encrypter = $encrypter;
-        $this->validation = $validation;
     }
 
     /**
@@ -41,8 +34,6 @@ class LoginCheckpointController extends AbstractLoginController
      * token. Once a user has reached this stage it is assumed that they have already
      * provided a valid username and password.
      *
-     * @return \Illuminate\Http\JsonResponse|void
-     *
      * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
      * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
      * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
@@ -67,7 +58,7 @@ class LoginCheckpointController extends AbstractLoginController
         try {
             /** @var \Pterodactyl\Models\User $user */
             $user = User::query()->findOrFail($details['user_id']);
-        } catch (ModelNotFoundException $exception) {
+        } catch (ModelNotFoundException) {
             $this->sendFailedLoginResponse($request, null, self::TOKEN_EXPIRED_MESSAGE);
         }
 
@@ -95,11 +86,9 @@ class LoginCheckpointController extends AbstractLoginController
      * Determines if a given recovery token is valid for the user account. If we find a matching token
      * it will be deleted from the database.
      *
-     * @return bool
-     *
      * @throws \Exception
      */
-    protected function isValidRecoveryToken(User $user, string $value)
+    protected function isValidRecoveryToken(User $user, string $value): bool
     {
         foreach ($user->recoveryTokens as $token) {
             if (password_verify($value, $token->token)) {

app/Http/Controllers/Auth/LoginController.php

@@ -14,22 +14,18 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class LoginController extends AbstractLoginController
 {
-    private ViewFactory $view;
-
     /**
      * LoginController constructor.
      */
-    public function __construct(ViewFactory $view)
+    public function __construct(private ViewFactory $view)
     {
         parent::__construct();
-
-        $this->view = $view;
     }
 
     /**
      * Handle all incoming requests for the authentication routes and render the
-     * base authentication view component. Vuejs will take over at this point and
-     * turn the login area into a SPA.
+     * base authentication view component. React will take over at this point and
+     * turn the login area into an SPA.
      */
     public function index(): View
     {
@@ -39,8 +35,6 @@ class LoginController extends AbstractLoginController
     /**
      * Handle a login request to the application.
      *
-     * @return \Illuminate\Http\JsonResponse|void
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Illuminate\Validation\ValidationException
      */
@@ -56,14 +50,14 @@ class LoginController extends AbstractLoginController
 
             /** @var \Pterodactyl\Models\User $user */
             $user = User::query()->where($this->getField($username), $username)->firstOrFail();
-        } catch (ModelNotFoundException $exception) {
+        } catch (ModelNotFoundException) {
             $this->sendFailedLoginResponse($request);
         }
 
         // Ensure that the account is using a valid username and password before trying to
         // continue. Previously this was handled in the 2FA checkpoint, however that has
         // a flaw in which you can discover if an account exists simply by seeing if you
-        // can proceede to the next step in the login process.
+        // can proceed to the next step in the login process.
         if (!password_verify($request->input('password'), $user->password)) {
             $this->sendFailedLoginResponse($request, $user);
         }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -20,39 +20,19 @@ class ResetPasswordController extends Controller
 
     /**
      * The URL to redirect users to after password reset.
-     *
-     * @var string
      */
-    public $redirectTo = '/';
+    public string $redirectTo = '/';
 
-    /**
-     * @var bool
-     */
-    protected $hasTwoFactor = false;
-
-    /**
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    private $dispatcher;
-
-    /**
-     * @var \Illuminate\Contracts\Hashing\Hasher
-     */
-    private $hasher;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
-     */
-    private $userRepository;
+    protected bool $hasTwoFactor = false;
 
     /**
      * ResetPasswordController constructor.
      */
-    public function __construct(Dispatcher $dispatcher, Hasher $hasher, UserRepositoryInterface $userRepository)
-    {
-        $this->dispatcher = $dispatcher;
-        $this->hasher = $hasher;
-        $this->userRepository = $userRepository;
+    public function __construct(
+        private Dispatcher $dispatcher,
+        private Hasher $hasher,
+        private UserRepositoryInterface $userRepository
+    ) {
     }
 
     /**
@@ -64,7 +44,7 @@ class ResetPasswordController extends Controller
     {
         // Here we will attempt to reset the user's password. If it is successful we
         // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
+        // database. Otherwise, we will parse the error and return the response.
         $response = $this->broker()->reset(
             $this->credentials($request),
             function ($user, $password) {