Make server listing and single server view API endpoints work

2018-01-19 21:47:06 -06:00 · 2018-01-19 21:47:06 -06:00 · a497a3d153
commit a497a3d153
parent 74bdbea6a4
39 changed files with 367 additions and 176 deletions
--- a/app/Http/Controllers/Admin/ApplicationApiController.php
+++ b/app/Http/Controllers/Admin/ApplicationApiController.php
@ -14,7 +14,7 @@ use Pterodactyl\Services\Api\KeyCreationService;
 use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Api\StoreApplicationApiKeyRequest;

-class ApplicationApiController extends Controller
+class ApiController extends Controller
 {
    /**
     * @var \Prologue\Alerts\AlertsMessageBag
--- a/app/Http/Controllers/Api/Application/Locations/LocationController.php
+++ b/app/Http/Controllers/Api/Application/Locations/LocationController.php
@ -11,8 +11,8 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Pterodactyl\Services\Locations\LocationUpdateService;
 use Pterodactyl\Services\Locations\LocationCreationService;
 use Pterodactyl\Services\Locations\LocationDeletionService;
-use Pterodactyl\Transformers\Api\Admin\LocationTransformer;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\LocationTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
 use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
--- a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
@ -8,11 +8,11 @@ use Illuminate\Http\Response;
 use Pterodactyl\Models\Allocation;
 use Pterodactyl\Http\Controllers\Controller;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use Pterodactyl\Transformers\Api\Admin\AllocationTransformer;
 use Pterodactyl\Services\Allocations\AllocationDeletionService;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\AllocationTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Allocations\GetAllocationsRequest;
-use Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequest;
+use Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequestApplication;

 class AllocationController extends Controller
 {
@ -66,14 +66,14 @@ class AllocationController extends Controller
    /**
     * Delete a specific allocation from the Panel.
     *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequest $request
-     * @param \Pterodactyl\Models\Node                                                       $node
-     * @param \Pterodactyl\Models\Allocation                                                 $allocation
+     * @param \Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequestApplication $request
+     * @param \Pterodactyl\Models\Node                                                                  $node
+     * @param \Pterodactyl\Models\Allocation                                                            $allocation
     * @return \Illuminate\Http\Response
     *
     * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException
     */
-    public function delete(DeleteAllocationRequest $request, Node $node, Allocation $allocation): Response
+    public function delete(DeleteAllocationRequestApplication $request, Node $node, Allocation $allocation): Response
    {
        $this->deletionService->handle($allocation);

--- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
@ -10,9 +10,9 @@ use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Nodes\NodeUpdateService;
 use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Services\Nodes\NodeDeletionService;
-use Pterodactyl\Transformers\Api\Admin\NodeTransformer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\NodeTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodeRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodesRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nodes\StoreNodeRequest;
--- a/app/Http/Controllers/Api/Application/Servers/ServerController.php
+++ b/app/Http/Controllers/Api/Application/Servers/ServerController.php
@ -1,20 +1,18 @@
 <?php

-namespace Pterodactyl\Http\Controllers\Api\Admin;
+namespace Pterodactyl\Http\Controllers\Api\Application\Servers;

-use Spatie\Fractal\Fractal;
 use Illuminate\Http\Request;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Api\Admin\ServerTransformer;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Extensions\Spatie\Fractalistic\Fractal;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\ServerTransformer;
+use Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest;
+use Pterodactyl\Http\Requests\Api\Application\Servers\GetServersRequest;
+use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;

-class ServerController extends Controller
+class ServerController extends ApplicationApiController
 {
-    /**
-     * @var \Spatie\Fractal\Fractal
-     */
-    private $fractal;
-
    /**
     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
     */
@ -23,22 +21,43 @@ class ServerController extends Controller
    /**
     * ServerController constructor.
     *
-     * @param \Spatie\Fractal\Fractal                                     $fractal
+     * @param \Pterodactyl\Extensions\Spatie\Fractalistic\Fractal         $fractal
+     * @param \Illuminate\Http\Request                                    $request
     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
     */
-    public function __construct(Fractal $fractal, ServerRepositoryInterface $repository)
+    public function __construct(Fractal $fractal, Request $request, ServerRepositoryInterface $repository)
    {
-        $this->fractal = $fractal;
+        parent::__construct($fractal, $request);
+
        $this->repository = $repository;
    }

-    public function index(Request $request): array
+    /**
+     * Return all of the servers that currently exist on the Panel.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetServersRequest $request
+     * @return array
+     */
+    public function index(GetServersRequest $request): array
    {
-        $servers = $this->repository->paginated(50);
+        $servers = $this->repository->setSearchTerm($request->input('search'))->paginated(50);

        return $this->fractal->collection($servers)
-            ->transformWith((new ServerTransformer)->setKey())
-            ->withResourceName('server')
+            ->transformWith($this->getTransformer(ServerTransformer::class))
+            ->toArray();
+    }
+
+    /**
+     * Show a single server transformed for the application API.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest $request
+     * @param \Pterodactyl\Models\Server                                          $server
+     * @return array
+     */
+    public function view(GetServerRequest $request, Server $server): array
+    {
+        return $this->fractal->item($server)
+            ->transformWith($this->getTransformer(ServerTransformer::class))
            ->toArray();
    }
 }
--- a/app/Http/Controllers/Api/Application/Users/UserController.php
+++ b/app/Http/Controllers/Api/Application/Users/UserController.php
@ -11,9 +11,9 @@ use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Users\UserUpdateService;
 use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Users\UserDeletionService;
-use Pterodactyl\Transformers\Api\Admin\UserTransformer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\UserTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\StoreUserRequest;
--- a/app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.phpApplication
+++ b/app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.phpApplication
@ -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
--- a/app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php
+++ b/app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/ApplicationApiRequest.php
+++ b/app/Http/Requests/Api/Application/ApplicationApiRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Locations/DeleteLocationRequest.php
+++ b/app/Http/Requests/Api/Application/Locations/DeleteLocationRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Locations/GetLocationsRequest.php
+++ b/app/Http/Requests/Api/Application/Locations/GetLocationsRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
+++ b/app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Nodes/GetNodeRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/GetNodeRequest.php
@ -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.
--- a/app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Servers/GetServerRequest.php
+++ b/app/Http/Requests/Api/Application/Servers/GetServerRequest.php
@ -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;
+    }
+}
--- a/app/Http/Requests/Api/Application/Servers/GetServersRequest.php
+++ b/app/Http/Requests/Api/Application/Servers/GetServersRequest.php
@ -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',
+        ];
+    }
+}
--- a/app/Http/Requests/Api/Application/Users/DeleteUserRequest.php
+++ b/app/Http/Requests/Api/Application/Users/DeleteUserRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Users/GetUsersRequest.php
+++ b/app/Http/Requests/Api/Application/Users/GetUsersRequest.php
@ -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
--- a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
+++ b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
@ -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