Skip to content

Commit 0e7f8ce

Browse files
DaneEverittDaneEveritt
committed
Reorganize API files
1 parent bdadec0 commit 0e7f8ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+156
-111
lines changed

‎app/Http/Controllers/API/Remote/EggInstallController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Remote;
3+
namespace Pterodactyl\Http\Controllers\Api\Remote;
44

55
use Illuminate\Http\Request;
66
use Illuminate\Http\JsonResponse;

‎app/Http/Controllers/API/Remote/EggRetrievalController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://opensource.org/licenses/MIT
88
*/
99

10-
namespace Pterodactyl\Http\Controllers\API\Remote;
10+
namespace Pterodactyl\Http\Controllers\Api\Remote;
1111

1212
use Illuminate\Http\JsonResponse;
1313
use Pterodactyl\Http\Controllers\Controller;

‎app/Http/Controllers/API/Remote/SftpController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Remote;
3+
namespace Pterodactyl\Http\Controllers\Api\Remote;
44

55
use Illuminate\Http\Request;
66
use Illuminate\Http\JsonResponse;

‎app/Http/Controllers/API/Remote/ValidateKeyController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* SOFTWARE.
2323
*/
2424

25-
namespace Pterodactyl\Http\Controllers\API\Remote;
25+
namespace Pterodactyl\Http\Controllers\Api\Remote;
2626

2727
use Spatie\Fractal\Fractal;
2828
use Pterodactyl\Http\Controllers\Controller;

‎app/Http/Controllers/Api/Application/ApplicationApiController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php

app/Http/Controllers/API/Admin/Locations/LocationController.php renamed to app/Http/Controllers/Api/Application/Locations/LocationController.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Admin\Locations;
3+
namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
44

55
use Spatie\Fractal\Fractal;
66
use Illuminate\Http\Response;
@@ -13,9 +13,9 @@
1313
use Pterodactyl\Services\Locations\LocationDeletionService;
1414
use Pterodactyl\Transformers\Api\Admin\LocationTransformer;
1515
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
16-
use Pterodactyl\Http\Requests\API\Admin\Locations\GetLocationsRequest;
17-
use Pterodactyl\Http\Requests\API\Admin\Locations\DeleteLocationRequest;
18-
use Pterodactyl\Http\Requests\API\Admin\Locations\UpdateLocationRequest;
16+
use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
17+
use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
18+
use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
1919

2020
class LocationController extends Controller
2121
{
@@ -70,7 +70,7 @@ public function __construct(
7070
/**
7171
* Return all of the locations currently registered on the Panel.
7272
*
73-
* @param \Pterodactyl\Http\Requests\API\Admin\Locations\GetLocationsRequest $request
73+
* @param \Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest $request
7474
* @return array
7575
*/
7676
public function index(GetLocationsRequest $request): array
@@ -87,8 +87,8 @@ public function index(GetLocationsRequest $request): array
8787
/**
8888
* Return a single location.
8989
*
90-
* @param \Pterodactyl\Http\Controllers\API\Admin\Locations\GetLocationRequest $request
91-
* @param \Pterodactyl\Models\Location $location
90+
* @param \Pterodactyl\Http\Controllers\Api\Application\Locations\GetLocationRequest $request
91+
* @param \Pterodactyl\Models\Location $location
9292
* @return array
9393
*/
9494
public function view(GetLocationRequest $request, Location $location): array
@@ -103,7 +103,7 @@ public function view(GetLocationRequest $request, Location $location): array
103103
* Store a new location on the Panel and return a HTTP/201 response code with the
104104
* new location attached.
105105
*
106-
* @param \Pterodactyl\Http\Controllers\API\Admin\Locations\StoreLocationRequest $request
106+
* @param \Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest $request
107107
* @return \Illuminate\Http\JsonResponse
108108
*
109109
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -121,8 +121,8 @@ public function store(StoreLocationRequest $request): JsonResponse
121121
/**
122122
* Update a location on the Panel and return the updated record to the user.
123123
*
124-
* @param \Pterodactyl\Http\Requests\API\Admin\Locations\UpdateLocationRequest $request
125-
* @param \Pterodactyl\Models\Location $location
124+
* @param \Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest $request
125+
* @param \Pterodactyl\Models\Location $location
126126
* @return array
127127
*
128128
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -141,8 +141,8 @@ public function update(UpdateLocationRequest $request, Location $location): arra
141141
/**
142142
* Delete a location from the Panel.
143143
*
144-
* @param \Pterodactyl\Http\Requests\API\Admin\Locations\DeleteLocationRequest $request
145-
* @param \Pterodactyl\Models\Location $location
144+
* @param \Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest $request
145+
* @param \Pterodactyl\Models\Location $location
146146
* @return \Illuminate\Http\Response
147147
*
148148
* @throws \Pterodactyl\Exceptions\Service\Location\HasActiveNodesException

app/Http/Controllers/API/Admin/Nodes/AllocationController.php renamed to app/Http/Controllers/Api/Application/Nodes/AllocationController.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Admin\Nodes;
3+
namespace Pterodactyl\Http\Controllers\Api\Application\Nodes;
44

55
use Spatie\Fractal\Fractal;
66
use Pterodactyl\Models\Node;
@@ -11,8 +11,8 @@
1111
use Pterodactyl\Transformers\Api\Admin\AllocationTransformer;
1212
use Pterodactyl\Services\Allocations\AllocationDeletionService;
1313
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
14-
use Pterodactyl\Http\Requests\API\Admin\Allocations\GetAllocationsRequest;
15-
use Pterodactyl\Http\Requests\API\Admin\Allocations\DeleteAllocationRequest;
14+
use Pterodactyl\Http\Requests\Api\Application\Allocations\GetAllocationsRequest;
15+
use Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequest;
1616

1717
class AllocationController extends Controller
1818
{
@@ -48,8 +48,8 @@ public function __construct(AllocationDeletionService $deletionService, Allocati
4848
/**
4949
* Return all of the allocations that exist for a given node.
5050
*
51-
* @param \Pterodactyl\Http\Requests\API\Admin\Allocations\GetAllocationsRequest $request
52-
* @param \Pterodactyl\Models\Node $node
51+
* @param \Pterodactyl\Http\Requests\Api\Application\Allocations\GetAllocationsRequest $request
52+
* @param \Pterodactyl\Models\Node $node
5353
* @return array
5454
*/
5555
public function index(GetAllocationsRequest $request, Node $node): array
@@ -66,9 +66,9 @@ public function index(GetAllocationsRequest $request, Node $node): array
6666
/**
6767
* Delete a specific allocation from the Panel.
6868
*
69-
* @param \Pterodactyl\Http\Requests\API\Admin\Allocations\DeleteAllocationRequest $request
70-
* @param \Pterodactyl\Models\Node $node
71-
* @param \Pterodactyl\Models\Allocation $allocation
69+
* @param \Pterodactyl\Http\Requests\Api\Application\Allocations\DeleteAllocationRequest $request
70+
* @param \Pterodactyl\Models\Node $node
71+
* @param \Pterodactyl\Models\Allocation $allocation
7272
* @return \Illuminate\Http\Response
7373
*
7474
* @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException

app/Http/Controllers/API/Admin/Nodes/NodeController.php renamed to app/Http/Controllers/Api/Application/Nodes/NodeController.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Admin\Nodes;
3+
namespace Pterodactyl\Http\Controllers\Api\Application\Nodes;
44

55
use Spatie\Fractal\Fractal;
66
use Pterodactyl\Models\Node;
@@ -13,11 +13,11 @@
1313
use Pterodactyl\Transformers\Api\Admin\NodeTransformer;
1414
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
1515
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
16-
use Pterodactyl\Http\Requests\API\Admin\Nodes\GetNodeRequest;
17-
use Pterodactyl\Http\Requests\API\Admin\Nodes\GetNodesRequest;
18-
use Pterodactyl\Http\Requests\API\Admin\Nodes\StoreNodeRequest;
19-
use Pterodactyl\Http\Requests\API\Admin\Nodes\DeleteNodeRequest;
20-
use Pterodactyl\Http\Requests\API\Admin\Nodes\UpdateNodeRequest;
16+
use Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodeRequest;
17+
use Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodesRequest;
18+
use Pterodactyl\Http\Requests\Api\Application\Nodes\StoreNodeRequest;
19+
use Pterodactyl\Http\Requests\Api\Application\Nodes\DeleteNodeRequest;
20+
use Pterodactyl\Http\Requests\Api\Application\Nodes\UpdateNodeRequest;
2121

2222
class NodeController extends Controller
2323
{
@@ -72,7 +72,7 @@ public function __construct(
7272
/**
7373
* Return all of the nodes currently available on the Panel.
7474
*
75-
* @param \Pterodactyl\Http\Requests\API\Admin\Nodes\GetNodesRequest $request
75+
* @param \Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodesRequest $request
7676
* @return array
7777
*/
7878
public function index(GetNodesRequest $request): array
@@ -89,8 +89,8 @@ public function index(GetNodesRequest $request): array
8989
/**
9090
* Return data for a single instance of a node.
9191
*
92-
* @param \Pterodactyl\Http\Requests\API\Admin\Nodes\GetNodeRequest $request
93-
* @param \Pterodactyl\Models\Node $node
92+
* @param \Pterodactyl\Http\Requests\Api\Application\Nodes\GetNodeRequest $request
93+
* @param \Pterodactyl\Models\Node $node
9494
* @return array
9595
*/
9696
public function view(GetNodeRequest $request, Node $node): array
@@ -105,7 +105,7 @@ public function view(GetNodeRequest $request, Node $node): array
105105
* Create a new node on the Panel. Returns the created node and a HTTP/201
106106
* status response on success.
107107
*
108-
* @param \Pterodactyl\Http\Requests\API\Admin\Nodes\StoreNodeRequest $request
108+
* @param \Pterodactyl\Http\Requests\Api\Application\Nodes\StoreNodeRequest $request
109109
* @return \Illuminate\Http\JsonResponse
110110
*
111111
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -126,8 +126,8 @@ public function store(StoreNodeRequest $request): JsonResponse
126126
/**
127127
* Update an existing node on the Panel.
128128
*
129-
* @param \Pterodactyl\Http\Requests\API\Admin\Nodes\UpdateNodeRequest $request
130-
* @param \Pterodactyl\Models\Node $node
129+
* @param \Pterodactyl\Http\Requests\Api\Application\Nodes\UpdateNodeRequest $request
130+
* @param \Pterodactyl\Models\Node $node
131131
* @return array
132132
*
133133
* @throws \Pterodactyl\Exceptions\DisplayException
@@ -148,8 +148,8 @@ public function update(UpdateNodeRequest $request, Node $node): array
148148
* Deletes a given node from the Panel as long as there are no servers
149149
* currently attached to it.
150150
*
151-
* @param \Pterodactyl\Http\Requests\API\Admin\Nodes\DeleteNodeRequest $request
152-
* @param \Pterodactyl\Models\Node $node
151+
* @param \Pterodactyl\Http\Requests\Api\Application\Nodes\DeleteNodeRequest $request
152+
* @param \Pterodactyl\Models\Node $node
153153
* @return \Illuminate\Http\Response
154154
*
155155
* @throws \Pterodactyl\Exceptions\Service\HasActiveServersException

‎app/Http/Controllers/Api/Application/Servers/ServerController.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
3+
namespace Pterodactyl\Http\Controllers\Api\Admin;
4+
5+
use Spatie\Fractal\Fractal;
6+
use Illuminate\Http\Request;
7+
use Pterodactyl\Http\Controllers\Controller;
8+
use Pterodactyl\Transformers\Api\Admin\ServerTransformer;
9+
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
10+
11+
class ServerController extends Controller
12+
{
13+
/**
14+
* @var \Spatie\Fractal\Fractal
15+
*/
16+
private $fractal;
17+
18+
/**
19+
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
20+
*/
21+
private $repository;
22+
23+
/**
24+
* ServerController constructor.
25+
*
26+
* @param \Spatie\Fractal\Fractal $fractal
27+
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
28+
*/
29+
public function __construct(Fractal $fractal, ServerRepositoryInterface $repository)
30+
{
31+
$this->fractal = $fractal;
32+
$this->repository = $repository;
33+
}
34+
35+
public function index(Request $request): array
36+
{
37+
$servers = $this->repository->paginated(50);
38+
39+
return $this->fractal->collection($servers)
40+
->transformWith((new ServerTransformer)->setKey())
41+
->withResourceName('server')
42+
->toArray();
43+
}
44+
}

app/Http/Controllers/API/Admin/Users/UserController.php renamed to app/Http/Controllers/Api/Application/Users/UserController.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Pterodactyl\Http\Controllers\API\Admin\Users;
3+
namespace Pterodactyl\Http\Controllers\Api\Application\Users;
44

55
use Spatie\Fractal\Fractal;
66
use Illuminate\Http\Request;
@@ -14,11 +14,11 @@
1414
use Pterodactyl\Transformers\Api\Admin\UserTransformer;
1515
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
1616
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
17-
use Pterodactyl\Http\Requests\API\Admin\Users\GetUserRequest;
18-
use Pterodactyl\Http\Requests\API\Admin\Users\GetUsersRequest;
19-
use Pterodactyl\Http\Requests\API\Admin\Users\StoreUserRequest;
20-
use Pterodactyl\Http\Requests\API\Admin\Users\DeleteUserRequest;
21-
use Pterodactyl\Http\Requests\API\Admin\Users\UpdateUserRequest;
17+
use Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest;
18+
use Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest;
19+
use Pterodactyl\Http\Requests\Api\Application\Users\StoreUserRequest;
20+
use Pterodactyl\Http\Requests\Api\Application\Users\DeleteUserRequest;
21+
use Pterodactyl\Http\Requests\Api\Application\Users\UpdateUserRequest;
2222

2323
class UserController extends Controller
2424
{
@@ -75,7 +75,7 @@ public function __construct(
7575
* of a collection of users including any defined relations passed in
7676
* the request.
7777
*
78-
* @param \Pterodactyl\Http\Requests\API\Admin\Users\GetUsersRequest $request
78+
* @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest $request
7979
* @return array
8080
*/
8181
public function index(GetUsersRequest $request): array
@@ -93,8 +93,8 @@ public function index(GetUsersRequest $request): array
9393
* Handle a request to view a single user. Includes any relations that
9494
* were defined in the request.
9595
*
96-
* @param \Pterodactyl\Http\Requests\API\Admin\Users\GetUserRequest $request
97-
* @param \Pterodactyl\Models\User $user
96+
* @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest $request
97+
* @param \Pterodactyl\Models\User $user
9898
* @return array
9999
*/
100100
public function view(GetUserRequest $request, User $user): array
@@ -113,8 +113,8 @@ public function view(GetUserRequest $request, User $user): array
113113
* Revocation errors are returned under the 'revocation_errors' key in the response
114114
* meta. If there are no errors this is an empty array.
115115
*
116-
* @param \Pterodactyl\Http\Requests\API\Admin\Users\UpdateUserRequest $request
117-
* @param \Pterodactyl\Models\User $user
116+
* @param \Pterodactyl\Http\Requests\Api\Application\Users\UpdateUserRequest $request
117+
* @param \Pterodactyl\Models\User $user
118118
* @return array
119119
*
120120
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -156,7 +156,7 @@ public function update(UpdateUserRequest $request, User $user): array
156156
* Store a new user on the system. Returns the created user and a HTTP/201
157157
* header on successful creation.
158158
*
159-
* @param \Pterodactyl\Http\Requests\API\Admin\Users\StoreUserRequest $request
159+
* @param \Pterodactyl\Http\Requests\Api\Application\Users\StoreUserRequest $request
160160
* @return \Illuminate\Http\JsonResponse
161161
*
162162
* @throws \Exception
@@ -179,8 +179,8 @@ public function store(StoreUserRequest $request): JsonResponse
179179
* Handle a request to delete a user from the Panel. Returns a HTTP/204 response
180180
* on successful deletion.
181181
*
182-
* @param \Pterodactyl\Http\Requests\API\Admin\Users\DeleteUserRequest $request
183-
* @param \Pterodactyl\Models\User $user
182+
* @param \Pterodactyl\Http\Requests\Api\Application\Users\DeleteUserRequest $request
183+
* @param \Pterodactyl\Models\User $user
184184
* @return \Illuminate\Http\Response
185185
*
186186
* @throws \Pterodactyl\Exceptions\DisplayException

0 commit comments

Comments
 (0)