Make server listing and single server view API endpoints work

app/Transformers/Api/Admin/ServerVariableTransformer.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Transformers\Admin;
-
-use Illuminate\Http\Request;
-use Pterodactyl\Models\ServerVariable;
-use League\Fractal\TransformerAbstract;
-
-class ServerVariableTransformer extends TransformerAbstract
-{
-    /**
-     * List of resources that can be included.
-     *
-     * @var array
-     */
-    protected $availableIncludes = ['parent'];
-
-    /**
-     * The Illuminate Request object if provided.
-     *
-     * @var \Illuminate\Http\Request|bool
-     */
-    protected $request;
-
-    /**
-     * Setup request object for transformer.
-     *
-     * @param \Illuminate\Http\Request|bool $request
-     */
-    public function __construct($request = false)
-    {
-        if (! $request instanceof Request && $request !== false) {
-            throw new DisplayException('Request passed to constructor must be of type Request or false.');
-        }
-
-        $this->request = $request;
-    }
-
-    /**
-     * Return a generic transformed server variable array.
-     *
-     * @return array
-     */
-    public function transform(ServerVariable $variable)
-    {
-        return $variable->toArray();
-    }
-
-    /**
-     * Return the parent service variable data.
-     *
-     * @return \Leauge\Fractal\Resource\Item
-     */
-    public function includeParent(ServerVariable $variable)
-    {
-        if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {
-            return;
-        }
-
-        return $this->item($variable->variable, new ServiceVariableTransformer($this->request), 'variable');
-    }
-}

app/Transformers/Api/Application/AllocationTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
 use Pterodactyl\Models\Allocation;
 use Pterodactyl\Services\Acl\Api\AdminAcl;

app/Transformers/Api/Application/BaseTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
 use Cake\Chronos\Chronos;
 use Pterodactyl\Models\ApiKey;
@@ -17,6 +17,17 @@ abstract class BaseTransformer extends TransformerAbstract
      */
     private $key;
 
+    /**
+     * BaseTransformer constructor.
+     */
+    public function __construct()
+    {
+        // Transformers allow for dependency injection on the handle method.
+        if (method_exists($this, 'handle')) {
+            Container::getInstance()->call([$this, 'handle']);
+        }
+    }
+
     /**
      * Set the HTTP request class being used for this request.
      *
@@ -59,11 +70,11 @@ abstract class BaseTransformer extends TransformerAbstract
      *
      * @param string $abstract
      * @param array  $parameters
-     * @return \Pterodactyl\Transformers\Api\Admin\BaseTransformer
+     * @return \Pterodactyl\Transformers\Api\Application\BaseTransformer
      */
     protected function makeTransformer(string $abstract, array $parameters = []): self
     {
-        /** @var \Pterodactyl\Transformers\Api\Admin\BaseTransformer $transformer */
+        /** @var \Pterodactyl\Transformers\Api\Application\BaseTransformer $transformer */
         $transformer = Container::getInstance()->makeWith($abstract, $parameters);
         $transformer->setKey($this->getKey());
 

app/Transformers/Api/Application/EggVariableTransformer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Transformers\Api\Application;
+
+use Pterodactyl\Models\EggVariable;
+
+class EggVariableTransformer extends BaseTransformer
+{
+    public function transform(EggVariable $model)
+    {
+        return $model->toArray();
+    }
+}

app/Transformers/Api/Application/LocationTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
 use Pterodactyl\Models\Location;
 use Pterodactyl\Services\Acl\Api\AdminAcl;

app/Transformers/Api/Application/NodeTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
 use Pterodactyl\Models\Node;
 use Pterodactyl\Services\Acl\Api\AdminAcl;

app/Transformers/Api/Application/ServerTransformer.php

@@ -1,14 +1,19 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
+use Cake\Chronos\Chronos;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Transformers\Admin\PackTransformer;
-use Pterodactyl\Transformers\Admin\ServerVariableTransformer;
+use Pterodactyl\Services\Servers\EnvironmentService;
 
 class ServerTransformer extends BaseTransformer
 {
+    /**
+     * @var \Pterodactyl\Services\Servers\EnvironmentService
+     */
+    private $environmentService;
+
     /**
      * List of resources that can be included.
      *
@@ -26,15 +31,55 @@ class ServerTransformer extends BaseTransformer
         'node',
     ];
 
+    /**
+     * Perform dependency injection.
+     *
+     * @param \Pterodactyl\Services\Servers\EnvironmentService $environmentService
+     */
+    public function handle(EnvironmentService $environmentService)
+    {
+        $this->environmentService = $environmentService;
+    }
+
     /**
      * Return a generic transformed server array.
      *
      * @param \Pterodactyl\Models\Server $server
      * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function transform(Server $server): array
     {
-        return collect($server->toArray())->only($server->getTableColumns())->toArray();
+        return [
+            'id' => $server->getKey(),
+            'uuid' => $server->uuid,
+            'identifier' => $server->uuidShort,
+            'name' => $server->name,
+            'description' => $server->description,
+            'suspended' => (bool) $server->suspended,
+            'limits' => [
+                'memory' => $server->memory,
+                'swap' => $server->swap,
+                'disk' => $server->disk,
+                'io' => $server->io,
+                'cpu' => $server->cpu,
+            ],
+            'user' => $server->owner_id,
+            'node' => $server->node_id,
+            'allocation' => $server->allocation_id,
+            'nest' => $server->nest_id,
+            'egg' => $server->egg_id,
+            'pack' => $server->pack_id,
+            'container' => [
+                'startup_command' => $server->startup,
+                'image' => $server->image,
+                'installed' => (int) $server->installed === 1,
+                'environment' => $this->environmentService->handle($server),
+            ],
+            'created_at' => Chronos::createFromFormat(Chronos::DEFAULT_TO_STRING_FORMAT, $server->created_at)->setTimezone('UTC')->toIso8601String(),
+            'updated_at' => Chronos::createFromFormat(Chronos::DEFAULT_TO_STRING_FORMAT, $server->updated_at)->setTimezone('UTC')->toIso8601String(),
+        ];
     }
 
     /**
@@ -94,16 +139,16 @@ class ServerTransformer extends BaseTransformer
      * @param \Pterodactyl\Models\Server $server
      * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
      */
-    public function includePack(Server $server)
-    {
-        if (! $this->authorize(AdminAcl::RESOURCE_PACKS)) {
-            return $this->null();
-        }
-
-        $server->loadMissing('pack');
-
-        return $this->item($server->getRelation('pack'), $this->makeTransformer(PackTransformer::class), 'pack');
-    }
+//    public function includePack(Server $server)
+//    {
+//        if (! $this->authorize(AdminAcl::RESOURCE_PACKS)) {
+//            return $this->null();
+//        }
+//
+//        $server->loadMissing('pack');
+//
+//        return $this->item($server->getRelation('pack'), $this->makeTransformer(PackTransformer::class), 'pack');
+//    }
 
     /**
      * Return a generic array with nest information for this server.
@@ -111,16 +156,16 @@ class ServerTransformer extends BaseTransformer
      * @param \Pterodactyl\Models\Server $server
      * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
      */
-    public function includeNest(Server $server)
-    {
-        if (! $this->authorize(AdminAcl::RESOURCE_NESTS)) {
-            return $this->null();
-        }
-
-        $server->loadMissing('nest');
-
-        return $this->item($server->getRelation('nest'), $this->makeTransformer(NestTransformer::class), 'nest');
-    }
+//    public function includeNest(Server $server)
+//    {
+//        if (! $this->authorize(AdminAcl::RESOURCE_NESTS)) {
+//            return $this->null();
+//        }
+//
+//        $server->loadMissing('nest');
+//
+//        return $this->item($server->getRelation('nest'), $this->makeTransformer(NestTransformer::class), 'nest');
+//    }
 
     /**
      * Return a generic array with service option information for this server.
@@ -136,14 +181,14 @@ class ServerTransformer extends BaseTransformer
 
         $server->loadMissing('egg');
 
-        return $this->item($server->getRelation('egg'), $this->makeTransformer(EggTransformer::class), 'egg');
+        return $this->item($server->getRelation('egg'), $this->makeTransformer(EggVariableTransformer::class), 'egg');
     }
 
     /**
      * Return a generic array of data about subusers for this server.
      *
      * @param \Pterodactyl\Models\Server $server
-     * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
+     * @return \League\Fractal\Resource\Collection|\League\Fractal\Resource\NullResource
      */
     public function includeVariables(Server $server)
     {
@@ -153,7 +198,7 @@ class ServerTransformer extends BaseTransformer
 
         $server->loadMissing('variables');
 
-        return $this->item($server->getRelation('variables'), $this->makeTransformer(ServerVariableTransformer::class), 'server_variable');
+        return $this->collection($server->getRelation('variables'), $this->makeTransformer(ServerVariableTransformer::class), 'server_variable');
     }
 
     /**

app/Transformers/Api/Application/ServerVariableTransformer.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Pterodactyl\Transformers\Api\Application;
+
+use Pterodactyl\Models\ServerVariable;
+use Pterodactyl\Services\Acl\Api\AdminAcl;
+
+class ServerVariableTransformer extends BaseTransformer
+{
+    /**
+     * List of resources that can be included.
+     *
+     * @var array
+     */
+    protected $availableIncludes = ['parent'];
+
+    /**
+     * Return a generic transformed server variable array.
+     *
+     * @param \Pterodactyl\Models\ServerVariable $variable
+     * @return array
+     */
+    public function transform(ServerVariable $variable)
+    {
+        return $variable->toArray();
+    }
+
+    /**
+     * Return the parent service variable data.
+     *
+     * @param \Pterodactyl\Models\ServerVariable $variable
+     * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
+     */
+    public function includeParent(ServerVariable $variable)
+    {
+        if (! $this->authorize(AdminAcl::RESOURCE_EGGS)) {
+            return $this->null();
+        }
+
+        $variable->loadMissing('variable');
+
+        return $this->item($variable->getRelation('variable'), $this->makeTransformer(EggVariableTransformer::class), 'variable');
+    }
+}

app/Transformers/Api/Application/UserTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Transformers\Api\Admin;
+namespace Pterodactyl\Transformers\Api\Application;
 
 use Pterodactyl\Models\User;
 use Pterodactyl\Services\Acl\Api\AdminAcl;