Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api(client): fix AccountController

Browse source
This commit is contained in:
Matthew Penner 2021-03-06 15:49:44 -07:00
parent 264c3865b2
commit 5fe86f164e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Api/Client/AccountController.php
View file

@ -4,8 +4,7 @@ namespace Pterodactyl\Http\Controllers\Api\Client;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse; use Illuminate\Auth\AuthManager;
use Illuminate\Auth\SessionGuard;
use Pterodactyl\Services\Users\UserUpdateService; use Pterodactyl\Services\Users\UserUpdateService;
use Pterodactyl\Transformers\Api\Client\AccountTransformer; use Pterodactyl\Transformers\Api\Client\AccountTransformer;
use Pterodactyl\Http\Requests\Api\Client\Account\UpdateEmailRequest; use Pterodactyl\Http\Requests\Api\Client\Account\UpdateEmailRequest;
@ -13,17 +12,17 @@ use Pterodactyl\Http\Requests\Api\Client\Account\UpdatePasswordRequest;
class AccountController extends ClientApiController class AccountController extends ClientApiController
{ {
private SessionGuard $sessionGuard; private AuthManager $authManager;
private UserUpdateService $updateService; private UserUpdateService $updateService;
/** /**
* AccountController constructor. * AccountController constructor.
*/ */
public function __construct(SessionGuard $sessionGuard, UserUpdateService $updateService) public function __construct(AuthManager $authManager, UserUpdateService $updateService)
{ {
parent::__construct(); parent::__construct();
$this->sessionGuard = $sessionGuard; $this->authManager = $authManager;
$this->updateService = $updateService; $this->updateService = $updateService;
} }
@ -45,7 +44,7 @@ class AccountController extends ClientApiController
* @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/ */
public function updateEmail(UpdateEmailRequest $request): JsonResponse public function updateEmail(UpdateEmailRequest $request): Response
{ {
$this->updateService->handle($request->user(), $request->validated()); $this->updateService->handle($request->user(), $request->validated());
@ -59,11 +58,11 @@ class AccountController extends ClientApiController
* @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/ */
public function updatePassword(UpdatePasswordRequest $request): JsonResponse public function updatePassword(UpdatePasswordRequest $request): Response
{ {
$this->updateService->handle($request->user(), $request->validated()); $this->updateService->handle($request->user(), $request->validated());
$this->sessionGuard->logoutOtherDevices($request->input('password')); $this->authManager->logoutOtherDevices($request->input('password'));
return $this->returnNoContent(); return $this->returnNoContent();
} }