Temporary patch to get user management pages displaying correctly

app/Services/Users/ToggleTwoFactorService.php

@@ -5,18 +5,12 @@ namespace Pterodactyl\Services\Users;
 use Carbon\Carbon;
 use Pterodactyl\Models\User;
 use PragmaRX\Google2FA\Google2FA;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
 
 class ToggleTwoFactorService
 {
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    private $config;
-
     /**
      * @var \Illuminate\Contracts\Encryption\Encrypter
      */
@@ -37,16 +31,13 @@ class ToggleTwoFactorService
      *
      * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
      * @param \PragmaRX\Google2FA\Google2FA $google2FA
-     * @param \Illuminate\Contracts\Config\Repository $config
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
      */
     public function __construct(
         Encrypter $encrypter,
         Google2FA $google2FA,
-        Repository $config,
         UserRepositoryInterface $repository
     ) {
-        $this->config = $config;
         $this->encrypter = $encrypter;
         $this->google2FA = $google2FA;
         $this->repository = $repository;
@@ -60,16 +51,18 @@ class ToggleTwoFactorService
      * @param bool|null $toggleState
      * @return bool
      *
+     * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
+     * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
+     * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid
      */
     public function handle(User $user, string $token, bool $toggleState = null): bool
     {
-        $window = $this->config->get('pterodactyl.auth.2fa.window');
         $secret = $this->encrypter->decrypt($user->totp_secret);
 
-        $isValidToken = $this->google2FA->verifyKey($secret, $token, $window);
+        $isValidToken = $this->google2FA->verifyKey($secret, $token, config()->get('pterodactyl.auth.2fa.window'));
 
         if (! $isValidToken) {
             throw new TwoFactorAuthenticationTokenInvalid;

app/Services/Users/UserUpdateService.php

@@ -3,11 +3,9 @@
 namespace Pterodactyl\Services\Users;
 
 use Pterodactyl\Models\User;
-use Illuminate\Support\Collection;
 use Illuminate\Contracts\Hashing\Hasher;
 use Pterodactyl\Traits\Services\HasUserLevels;
-use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
-use Pterodactyl\Services\DaemonKeys\RevokeMultipleDaemonKeysService;
+use Pterodactyl\Repositories\Eloquent\UserRepository;
 
 class UserUpdateService
 {
@@ -19,44 +17,33 @@ class UserUpdateService
     private $hasher;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
+     * @var \Pterodactyl\Repositories\Eloquent\UserRepository
      */
     private $repository;
 
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\RevokeMultipleDaemonKeysService
-     */
-    private $revocationService;
-
     /**
      * UpdateService constructor.
      *
      * @param \Illuminate\Contracts\Hashing\Hasher $hasher
-     * @param \Pterodactyl\Services\DaemonKeys\RevokeMultipleDaemonKeysService $revocationService
-     * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Eloquent\UserRepository $repository
      */
-    public function __construct(
-        Hasher $hasher,
-        RevokeMultipleDaemonKeysService $revocationService,
-        UserRepositoryInterface $repository
-    ) {
+    public function __construct(Hasher $hasher, UserRepository $repository)
+    {
         $this->hasher = $hasher;
         $this->repository = $repository;
-        $this->revocationService = $revocationService;
     }
 
     /**
-     * Update the user model instance. If the user has been removed as an administrator
-     * revoke all of the authentication tokens that have been assigned to their account.
+     * Update the user model instance.
      *
      * @param \Pterodactyl\Models\User $user
      * @param array $data
-     * @return \Illuminate\Support\Collection
+     * @return \Pterodactyl\Models\User
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(User $user, array $data): Collection
+    public function handle(User $user, array $data)
     {
         if (! empty(array_get($data, 'password'))) {
             $data['password'] = $this->hasher->make($data['password']);
@@ -64,17 +51,9 @@ class UserUpdateService
             unset($data['password']);
         }
 
-        if ($this->isUserLevel(User::USER_LEVEL_ADMIN)) {
-            if (array_get($data, 'root_admin', 0) == 0 && $user->root_admin) {
-                $this->revocationService->handle($user, array_get($data, 'ignore_connection_error', false));
-            }
-        } else {
-            unset($data['root_admin']);
-        }
+        /** @var \Pterodactyl\Models\User $response */
+        $response = $this->repository->update($user->id, $data);
 
-        return collect([
-            'model' => $this->repository->update($user->id, $data),
-            'exceptions' => $this->revocationService->getExceptions(),
-        ]);
+        return $response;
     }
 }