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

More API updates, better support for node config edits

Browse source
This commit is contained in:
Dane Everitt 2018-01-10 23:19:03 -06:00
parent 800e2df6b2
commit cf21fd5a4b
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
21 changed files with 449 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

53
app/Transformers/Api/Admin/AllocationTransformer.php
View file

@ -7,6 +7,16 @@ use Pterodactyl\Transformers\Api\ApiTransformer;
class AllocationTransformer extends ApiTransformer
{
/**
* Relationships that can be loaded onto allocation transformations.
*
* @var array
*/
protected $availableIncludes = [
'node',
'server',
];
/**
* Return a generic transformed allocation array.
*
@ -15,17 +25,50 @@ class AllocationTransformer extends ApiTransformer
*/
public function transform(Allocation $allocation)
{
return $this->transformWithFilter($allocation);
return [
'id' => $allocation->id,
'ip' => $allocation->ip,
'alias' => $allocation->ip_alias,
'port' => $allocation->port,
'assigned' => ! is_null($allocation->server_id),
];
}
/**
* Determine which transformer filter to apply.
* Load the node relationship onto a given transformation.
*
* @param \Pterodactyl\Models\Allocation $allocation
* @return array
* @return bool|\League\Fractal\Resource\Item
*
* @throws \Pterodactyl\Exceptions\PterodactylException
*/
protected function transformWithFilter(Allocation $allocation)
public function includeNode(Allocation $allocation)
{
return $allocation->toArray();
if (! $this->authorize('node-view')) {
return false;
}
$allocation->loadMissing('node');
return $this->item($allocation->getRelation('node'), new NodeTransformer($this->getRequest()), 'node');
}
/**
* Load the server relationship onto a given transformation.
*
* @param \Pterodactyl\Models\Allocation $allocation
* @return bool|\League\Fractal\Resource\Item
*
* @throws \Pterodactyl\Exceptions\PterodactylException
*/
public function includeServer(Allocation $allocation)
{
if (! $this->authorize('server-view')) {
return false;
}
$allocation->loadMissing('server');
return $this->item($allocation->getRelation('server'), new ServerTransformer($this->getRequest()), 'server');
}
}

6
app/Transformers/Api/Admin/UserTransformer.php
View file

@ -35,13 +35,11 @@ class UserTransformer extends ApiTransformer
*/
public function includeServers(User $user)
{
if ($this->authorize('server-list')) {
if (! $this->authorize('server-list')) {
return false;
}
if (! $user->relationLoaded('servers')) {
$user->load('servers');
}
$user->loadMissing('servers');
return $this->collection($user->getRelation('servers'), new ServerTransformer($this->getRequest()), 'server');
}