StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make server listing and single server view API endpoints work

Browse source
This commit is contained in:
Dane Everitt 2018-01-19 21:47:06 -06:00
parent 74bdbea6a4
commit a497a3d153
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
39 changed files with 367 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.php → app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.phpApplication
View file

@ -5,9 +5,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Allocations;
use Pterodactyl\Models\Node;
use Pterodactyl\Models\Allocation;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteAllocationRequest extends ApiAdminRequest
class DeleteAllocationRequest extends ApplicationApiRequest
{
/**
* @var string

4
app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php
View file

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Allocations;
use Pterodactyl\Models\Node;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetAllocationsRequest extends ApiAdminRequest
class GetAllocationsRequest extends ApplicationApiRequest
{
/**
* @var string

2
app/Http/Requests/Api/Application/ApiAdminRequest.php → app/Http/Requests/Api/Application/ApplicationApiRequest.php
View file

@ -8,7 +8,7 @@ use Illuminate\Foundation\Http\FormRequest;
use Pterodactyl\Exceptions\PterodactylException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
abstract class ApiAdminRequest extends FormRequest
abstract class ApplicationApiRequest extends FormRequest
{
/**
* The resource that should be checked when performing the authorization

4
app/Http/Requests/Api/Application/Locations/DeleteLocationRequest.php
View file

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteLocationRequest extends ApiAdminRequest
class DeleteLocationRequest extends ApplicationApiRequest
{
/**
* @var string

4
app/Http/Requests/Api/Application/Locations/GetLocationsRequest.php
View file

@ -3,9 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetLocationsRequest extends ApiAdminRequest
class GetLocationsRequest extends ApplicationApiRequest
{
/**
* @var string

4
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View file

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreLocationRequest extends ApiAdminRequest
class StoreLocationRequest extends ApplicationApiRequest
{
/**
* @var string

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

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
use Pterodactyl\Models\Node;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteNodeRequest extends ApiAdminRequest
class DeleteNodeRequest extends ApplicationApiRequest
{
/**
* @var string

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

@ -3,9 +3,8 @@
namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
use Pterodactyl\Models\Node;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
class GetNodeRequest extends ApiAdminRequest
class GetNodeRequest extends GetNodesRequest
{
/**
* Determine if the requested node exists on the Panel.

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

@ -3,9 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetNodesRequest extends ApiAdminRequest
class GetNodesRequest extends ApplicationApiRequest
{
/**
* @var string

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

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
use Pterodactyl\Models\Node;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreNodeRequest extends ApiAdminRequest
class StoreNodeRequest extends ApplicationApiRequest
{
/**
* @var string

32
app/Http/Requests/Api/Application/Servers/GetServerRequest.php Normal file
View file

@ -0,0 +1,32 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Application\Servers;
use Pterodactyl\Models\Server;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetServerRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
/**
* Determine if the requested server exists on the Panel.
*
* @return bool
*/
public function resourceExists(): bool
{
$server = $this->route()->parameter('server');
return $server instanceof Server && $server->exists;
}
}

29
app/Http/Requests/Api/Application/Servers/GetServersRequest.php Normal file
View file

@ -0,0 +1,29 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Application\Servers;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetServersRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
/**
* @return array
*/
public function rules(): array
{
return [
'search' => 'string|max:100',
];
}
}

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

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Users;
use Pterodactyl\Models\User;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteUserRequest extends ApiAdminRequest
class DeleteUserRequest extends ApplicationApiRequest
{
/**
* @var string

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

@ -3,9 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Application\Users;
use Pterodactyl\Services\Acl\Api\AdminAcl as Acl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetUsersRequest extends ApiAdminRequest
class GetUsersRequest extends ApplicationApiRequest
{
/**
* @var string

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

@ -4,9 +4,9 @@ namespace Pterodactyl\Http\Requests\Api\Application\Users;
use Pterodactyl\Models\User;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreUserRequest extends ApiAdminRequest
class StoreUserRequest extends ApplicationApiRequest
{
/**
* @var string