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

api(application): fix requests

Browse source
This commit is contained in:
Matthew Penner 2021-01-23 18:17:35 -07:00
parent 409c081275
commit 5737b5dc5d
54 changed files with 88 additions and 556 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Requests/Api/Application/Users/DeleteUserRequest.php
View file

@ -8,19 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteUserRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
protected string $resource = AdminAcl::RESOURCE_USERS;
protected int $permission = AdminAcl::WRITE;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
/**
* Determine if the requested user exists on the Panel.
*/
public function resourceExists(): bool
{
$user = $this->route()->parameter('user');

23
app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php
View file

@ -10,24 +10,10 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetExternalUserRequest extends ApplicationApiRequest
{
/**
* @var User
*/
private $userModel;
private User $userModel;
protected string $resource = AdminAcl::RESOURCE_USERS;
protected int $permission = AdminAcl::READ;
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
/**
* Determine if the requested external user exists.
*/
public function resourceExists(): bool
{
$repository = $this->container->make(UserRepositoryInterface::class);
@ -43,9 +29,6 @@ class GetExternalUserRequest extends ApplicationApiRequest
return true;
}
/**
* Return the user model for the requested external user.
*/
public function getUserModel(): User
{
return $this->userModel;

5
app/Http/Requests/Api/Application/Users/GetUserRequest.php
View file

@ -6,11 +6,6 @@ use Pterodactyl\Models\User;
class GetUserRequest extends GetUsersRequest
{
/**
* Determine if the requested role exists on the Panel.
*
* @return bool
*/
public function resourceExists(): bool
{
$user = $this->route()->parameter('user');

11
app/Http/Requests/Api/Application/Users/GetUsersRequest.php
View file

@ -7,13 +7,6 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetUsersRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = Acl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = Acl::READ;
protected string $resource = Acl::RESOURCE_USERS;
protected int $permission = Acl::READ;
}

26
app/Http/Requests/Api/Application/Users/StoreUserRequest.php
View file

@ -8,19 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreUserRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
protected string $resource = AdminAcl::RESOURCE_USERS;
protected int $permission = AdminAcl::WRITE;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
/**
* Return the validation rules for this request.
*/
public function rules(array $rules = null): array
{
$rules = $rules ?? User::getRules();
@ -40,10 +30,7 @@ class StoreUserRequest extends ApplicationApiRequest
return $response;
}
/**
* @return array
*/
public function validated()
public function validated(): array
{
$data = parent::validated();
@ -55,12 +42,7 @@ class StoreUserRequest extends ApplicationApiRequest
return $data;
}
/**
* Rename some fields to be more user friendly.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'external_id' => 'Third Party Identifier',

7
app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
View file

@ -6,13 +6,8 @@ use Pterodactyl\Models\User;
class UpdateUserRequest extends StoreUserRequest
{
/**
* Return the validation rules for this request.
*/
public function rules(array $rules = null): array
{
$userId = $this->getModel(User::class)->id;
return parent::rules(User::getRulesForUpdate($userId));
return parent::rules($rules ?? User::getRulesForUpdate($this->route()->parameter('user')->id));
}
}