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

15
app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php
View file

@ -8,20 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteNodeRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NODES;
protected string $resource = AdminAcl::RESOURCE_NODES;
protected int $permission = AdminAcl::WRITE;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
/**
* Determine if the node being requested for editing exists
* on the Panel before validating the data.
*/
public function resourceExists(): bool
{
$node = $this->route()->parameter('node');

3
app/Http/Requests/Api/Application/Nodes/GetDeployableNodesRequest.php
View file

@ -4,9 +4,6 @@ namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
class GetDeployableNodesRequest extends GetNodesRequest
{
/**
* @return string[]
*/
public function rules(): array
{
return [

3
app/Http/Requests/Api/Application/Nodes/GetNodeRequest.php
View file

@ -6,9 +6,6 @@ use Pterodactyl\Models\Node;
class GetNodeRequest extends GetNodesRequest
{
/**
* Determine if the requested node exists on the Panel.
*/
public function resourceExists(): bool
{
$node = $this->route()->parameter('node');

11
app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php
View file

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

11
app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
View file

@ -8,15 +8,8 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreNodeRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NODES;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected string $resource = AdminAcl::RESOURCE_NODES;
protected int $permission = AdminAcl::WRITE;
/**
* Validation rules to apply to this request.

8
app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
View file

@ -6,14 +6,8 @@ use Pterodactyl\Models\Node;
class UpdateNodeRequest extends StoreNodeRequest
{
/**
* Apply validation rules to this request. Uses the parent class rules()
* function but passes in the rules for updating rather than creating.
*/
public function rules(array $rules = null): array
{
$nodeId = $this->getModel(Node::class)->id;
return parent::rules(Node::getRulesForUpdate($nodeId));
return parent::rules($rules ?? Node::getRulesForUpdate($this->route()->parameter('node')->id));
}
}