dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

actually fix bad merge

Browse Source
This commit is contained in:
Matthew Penner 2021-08-21 13:35:55 -06:00
parent 69df0adbd9
commit 8f43ca66df
No known key found for this signature in database
GPG Key ID: 5396CC4C3C1C9704
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/Client/AccountController.php
View File

@ -4,7 +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\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;
@ -12,22 +12,22 @@ use Pterodactyl\Http\Requests\Api\Client\Account\UpdatePasswordRequest;
class AccountController extends ClientApiController class AccountController extends ClientApiController
{ {
private AuthManager $authManager; private SessionGuard $sessionGuard;
private UserUpdateService $updateService; private UserUpdateService $updateService;
/** /**
* AccountController constructor. * AccountController constructor.
*/ */
public function __construct(AuthManager $authManager, UserUpdateService $updateService) public function __construct(SessionGuard $sessionGuard, UserUpdateService $updateService)
{ {
parent::__construct(); parent::__construct();
$this->authManager = $authManager; $this->sessionGuard = $sessionGuard;
$this->updateService = $updateService; $this->updateService = $updateService;
} }
/** /**
* Get's information about the currently authenticated user. * Gets information about the currently authenticated user.
* *
* @throws \Illuminate\Contracts\Container\BindingResolutionException * @throws \Illuminate\Contracts\Container\BindingResolutionException
*/ */
@ -67,7 +67,7 @@ class AccountController extends ClientApiController
// other devices functionality to work. // other devices functionality to work.
$this->sessionGuard->setUser($user); $this->sessionGuard->setUser($user);
$this->authManager->logoutOtherDevices($request->input('password')); $this->sessionGuard->logoutOtherDevices($request->input('password'));
return $this->returnNoContent(); return $this->returnNoContent();
} }