dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

api(application): remove old database node endpoints

Browse Source
This commit is contained in:
Matthew Penner 2021-02-05 09:43:48 -07:00
parent 72be2808f3
commit f3e7aab27c
4 changed files with 5 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/Http/Controllers/Api/Application/Databases/DatabaseController.php
View File

@ -12,28 +12,17 @@ use Pterodactyl\Transformers\Api\Application\DatabaseHostTransformer;
use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
use Pterodactyl\Http\Requests\Api\Application\Databases\GetDatabaseRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\GetDatabasesRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\DatabaseNodesRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\StoreDatabaseRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\UpdateDatabaseRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\DeleteDatabaseRequest;
use Pterodactyl\Http\Requests\Api\Application\Databases\UpdateDatabaseRequest;
class DatabaseController extends ApplicationApiController
{
/**
* @var \Pterodactyl\Services\Databases\Hosts\HostCreationService
*/
private $creationService;
/**
* @var \Pterodactyl\Services\Databases\Hosts\HostUpdateService
*/
private $updateService;
private HostCreationService $creationService;
private HostUpdateService $updateService;
/**
* DatabaseController constructor.
*
* @param \Pterodactyl\Services\Databases\Hosts\HostCreationService $creationService
* @param \Pterodactyl\Services\Databases\Hosts\HostUpdateService $updateService
*/
public function __construct(HostCreationService $creationService, HostUpdateService $updateService)
{
@ -46,9 +35,6 @@ class DatabaseController extends ApplicationApiController
/**
* Returns an array of all database hosts.
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\GetDatabasesRequest $request
*
* @return array
* @throws \Illuminate\Contracts\Container\BindingResolutionException
*/
public function index(GetDatabasesRequest $request): array
@ -73,10 +59,6 @@ class DatabaseController extends ApplicationApiController
/**
* Returns a single database host.
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\GetDatabaseRequest $request
* @param \Pterodactyl\Models\DatabaseHost $databaseHost
*
* @return array
* @throws \Illuminate\Contracts\Container\BindingResolutionException
*/
public function view(GetDatabaseRequest $request, DatabaseHost $databaseHost): array
@ -89,9 +71,6 @@ class DatabaseController extends ApplicationApiController
/**
* Creates a new database host.
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\StoreDatabaseRequest $request
*
* @return \Illuminate\Http\JsonResponse
* @throws \Throwable
*/
public function store(StoreDatabaseRequest $request): JsonResponse
@ -106,10 +85,6 @@ class DatabaseController extends ApplicationApiController
/**
* Updates a database host.
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\UpdateDatabaseRequest $request
* @param \Pterodactyl\Models\DatabaseHost $databaseHost
*
* @return array
* @throws \Throwable
*/
public function update(UpdateDatabaseRequest $request, DatabaseHost $databaseHost): array
@ -124,10 +99,6 @@ class DatabaseController extends ApplicationApiController
/**
* Deletes a database host.
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\DeleteDatabaseRequest $request
* @param \Pterodactyl\Models\DatabaseHost $databaseHost
*
* @return \Illuminate\Http\JsonResponse
* @throws \Exception
*/
public function delete(DeleteDatabaseRequest $request, DatabaseHost $databaseHost): JsonResponse
@ -136,48 +107,4 @@ class DatabaseController extends ApplicationApiController
return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
}
/**
* ?
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\DatabaseNodesRequest $request
* @param \Pterodactyl\Models\Mount $mount
*
* @return array
*/
public function addNodes(DatabaseNodesRequest $request, DatabaseHost $databaseHost): array
{
$data = $request->validated();
$nodes = $data['nodes'] ?? [];
if (count($nodes) > 0) {
$databaseHost->nodes()->syncWithoutDetaching($nodes);
}
return $this->fractal->item($databaseHost)
->transformWith($this->getTransformer(DatabaseHostTransformer::class))
->toArray();
}
/**
* ?
*
* @param \Pterodactyl\Http\Requests\Api\Application\Databases\DatabaseNodesRequest $request
* @param \Pterodactyl\Models\Mount $mount
*
* @return array
*/
public function deleteNodes(DatabaseNodesRequest $request, DatabaseHost $databaseHost): array
{
$data = $request->validated();
$nodes = $data['nodes'] ?? [];
if (count($nodes) > 0) {
$databaseHost->nodes()->detach($nodes);
}
return $this->fractal->item($databaseHost)
->transformWith($this->getTransformer(DatabaseHostTransformer::class))
->toArray();
}
}

17
app/Http/Requests/Api/Application/Databases/DatabaseNodesRequest.php
View File

@ -1,17 +0,0 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Application\Databases;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DatabaseNodesRequest extends ApplicationApiRequest
{
protected string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
protected int $permission = AdminAcl::WRITE;
public function rules(array $rules = null): array
{
return $rules ?? ['nodes' => 'required|exists:nodes,id'];
}
}

1
app/Transformers/Api/Application/DatabaseHostTransformer.php
View File

@ -50,6 +50,7 @@ class DatabaseHostTransformer extends BaseTransformer
*
* @return \League\Fractal\Resource\Collection|\League\Fractal\Resource\NullResource
*
* @throws \Illuminate\Contracts\Container\BindingResolutionException
* @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException
*/
public function includeDatabases(DatabaseHost $model)

3
routes/api-application.php
View File

@ -18,12 +18,9 @@ Route::group(['prefix' => '/databases'], function () {
Route::post('/', 'Databases\DatabaseController@store');
Route::put('/{databaseHost}/nodes', 'Databases\DatabaseController@addNodes');
Route::patch('/{databaseHost}', 'Databases\DatabaseController@update');
Route::delete('/{databaseHost}', 'Databases\DatabaseController@delete');
Route::delete('/{databaseHost}/nodes', 'Databases\DatabaseController@deleteNodes');
});
/*