Better middleware for routes, cleaned up API, removed old API calls

New API routes for Server allow specifying which fractal objects to
load into the request, thus making it possible to fine-tune what data
is returned.

Author: DaneEveritt

app/Exceptions/Handler.php

@@ -46,7 +46,7 @@ public function report(Exception $exception)
      */
     public function render($request, Exception $exception)
     {
-        if ($request->expectsJson() || $request->isJson() || $request->is('api/*', 'remote/*', 'daemon/*')) {
+        if ($request->expectsJson() || $request->isJson() || $request->is(...config('pterodactyl.json_routes'))) {
 
             if (config('app.debug')) {
                 $report = [
@@ -56,7 +56,7 @@ public function render($request, Exception $exception)
             }
 
             $response = response()->json([
-                'error' => $exception->getMessage(),
+                'error' => (config('app.debug')) ? $exception->getMessage() : 'An unhandled exception was encountered with this request.',
                 'exception' => ! isset($report) ?: $report,
             ], ($this->isHttpException($exception)) ? $exception->getStatusCode() : 500, [], JSON_UNESCAPED_SLASHES);
 

…trollers/API_old/User/InfoController.php …ontrollers/API/User/ServerController.phpapp/Http/Controllers/API_old/User/InfoController.php renamed to app/Http/Controllers/API/User/ServerController.php app/Http/Controllers/API_old/User/InfoController.php renamed to app/Http/Controllers/API/User/ServerController.php

@@ -24,24 +24,35 @@
 
 namespace Pterodactyl\Http\Controllers\API\User;
 
+use Fractal;
 use Illuminate\Http\Request;
-use Pterodactyl\Http\Controllers\API\BaseController;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Transformers\User\ServerTransformer;
 
-class InfoController extends BaseController
+class ServerController extends Controller
 {
-    public function me(Request $request)
+    public function index(Request $request, $uuid)
     {
-        return $request->user()->access('service', 'node', 'allocation', 'option')->get()->map(function ($server) {
-            return [
-                'id' => $server->uuidShort,
-                'uuid' => $server->uuid,
-                'name' => $server->name,
-                'node' => $server->node->name,
-                'ip' => $server->allocation->alias,
-                'port' => $server->allocation->port,
-                'service' => $server->service->name,
-                'option' => $server->option->name,
-            ];
-        })->all();
+        $server = Server::byUuid($uuid);
+        $fractal = Fractal::create()->item($server);
+
+        if ($request->input('with')) {
+            $fractal->parseIncludes(collect(explode(',', $request->input('with')))->intersect([
+                'allocations', 'subusers', 'stats',
+            ])->toArray());
+        }
+
+        return $fractal->transformWith(new ServerTransformer)->toArray();
+    }
+
+    public function power(Request $request, $uuid)
+    {
+
+    }
+
+    public function command(Request $request, $uuid)
+    {
+
     }
 }