Massively simplify API binding logic

Changes the API internals to use normal Laravel binding which automatically supports nested-models and can determine their relationships. This removes a lot of confusingly complex internal logic and replaces it with standard Laravel code.

This also removes a deprecated "getModel" method and fully replaces it with a "parameter" method that does stricter type-checking.

Author: DaneEveritt

app/Http/Controllers/Api/Application/Locations/LocationController.php

@@ -75,9 +75,9 @@ public function index(GetLocationsRequest $request): array
     /**
      * Return a single location.
      */
-    public function view(GetLocationRequest $request): array
+    public function view(GetLocationRequest $request, Location $location): array
     {
-        return $this->fractal->item($request->getModel(Location::class))
+        return $this->fractal->item($location)
             ->transformWith($this->getTransformer(LocationTransformer::class))
             ->toArray();
     }
@@ -108,9 +108,9 @@ public function store(StoreLocationRequest $request): JsonResponse
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(UpdateLocationRequest $request): array
+    public function update(UpdateLocationRequest $request, Location $location): array
     {
-        $location = $this->updateService->handle($request->getModel(Location::class), $request->validated());
+        $location = $this->updateService->handle($location, $request->validated());
 
         return $this->fractal->item($location)
             ->transformWith($this->getTransformer(LocationTransformer::class))
@@ -122,9 +122,9 @@ public function update(UpdateLocationRequest $request): array
      *
      * @throws \Pterodactyl\Exceptions\Service\Location\HasActiveNodesException
      */
-    public function delete(DeleteLocationRequest $request): Response
+    public function delete(DeleteLocationRequest $request, Location $location): Response
     {
-        $this->deletionService->handle($request->getModel(Location::class));
+        $this->deletionService->handle($location);
 
         return response('', 204);
     }

app/Http/Controllers/Api/Application/Nests/EggController.php

@@ -4,49 +4,29 @@
 
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\Nest;
-use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\EggTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Nests\Eggs\GetEggRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nests\Eggs\GetEggsRequest;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
 class EggController extends ApplicationApiController
 {
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
-     */
-    private $repository;
-
-    /**
-     * EggController constructor.
-     */
-    public function __construct(EggRepositoryInterface $repository)
-    {
-        parent::__construct();
-
-        $this->repository = $repository;
-    }
-
     /**
      * Return all eggs that exist for a given nest.
      */
-    public function index(GetEggsRequest $request): array
+    public function index(GetEggsRequest $request, Nest $nest): array
     {
-        $eggs = $this->repository->findWhere([
-            ['nest_id', '=', $request->getModel(Nest::class)->id],
-        ]);
-
-        return $this->fractal->collection($eggs)
+        return $this->fractal->collection($nest->eggs)
             ->transformWith($this->getTransformer(EggTransformer::class))
             ->toArray();
     }
 
     /**
      * Return a single egg that exists on the specified nest.
      */
-    public function view(GetEggRequest $request): array
+    public function view(GetEggRequest $request, Nest $nest, Egg $egg): array
     {
-        return $this->fractal->item($request->getModel(Egg::class))
+        return $this->fractal->item($egg)
             ->transformWith($this->getTransformer(EggTransformer::class))
             ->toArray();
     }

app/Http/Controllers/Api/Application/Nests/NestController.php

@@ -40,9 +40,9 @@ public function index(GetNestsRequest $request): array
     /**
      * Return information about a single Nest model.
      */
-    public function view(GetNestsRequest $request): array
+    public function view(GetNestsRequest $request, Nest $nest): array
     {
-        return $this->fractal->item($request->getModel(Nest::class))
+        return $this->fractal->item($nest)
             ->transformWith($this->getTransformer(NestTransformer::class))
             ->toArray();
     }

app/Http/Controllers/Api/Application/Servers/DatabaseController.php

@@ -105,12 +105,10 @@ public function store(StoreServerDatabaseRequest $request, Server $server): Json
 
     /**
      * Handle a request to delete a specific server database from the Panel.
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function delete(ServerDatabaseWriteRequest $request): Response
+    public function delete(ServerDatabaseWriteRequest $request, Server $server, Database $database): Response
     {
-        $this->databaseManagementService->delete($request->getModel(Database::class));
+        $this->databaseManagementService->delete($database);
 
         return response('', 204);
     }

app/Http/Controllers/Api/Application/Servers/ExternalServerController.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Application\Servers;
 
+use Pterodactyl\Models\Server;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Servers\GetExternalServerRequest;
@@ -11,9 +12,11 @@ class ExternalServerController extends ApplicationApiController
     /**
      * Retrieve a specific server from the database using its external ID.
      */
-    public function index(GetExternalServerRequest $request): array
+    public function index(GetExternalServerRequest $request, string $external_id): array
     {
-        return $this->fractal->item($request->getServerModel())
+        $server = Server::query()->where('external_id', $external_id)->firstOrFail();
+
+        return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))
             ->toArray();
     }

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

@@ -86,9 +86,9 @@ public function store(StoreServerRequest $request): JsonResponse
     /**
      * Show a single server transformed for the application API.
      */
-    public function view(GetServerRequest $request): array
+    public function view(GetServerRequest $request, Server $server): array
     {
-        return $this->fractal->item($request->getModel(Server::class))
+        return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))
             ->toArray();
     }

app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php

@@ -42,14 +42,14 @@ public function __construct(
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function details(UpdateServerDetailsRequest $request): array
+    public function details(UpdateServerDetailsRequest $request, Server $server): array
     {
-        $server = $this->detailsModificationService->returnUpdatedModel()->handle(
-            $request->getModel(Server::class),
+        $updated = $this->detailsModificationService->returnUpdatedModel()->handle(
+            $server,
             $request->validated()
         );
 
-        return $this->fractal->item($server)
+        return $this->fractal->item($updated)
             ->transformWith($this->getTransformer(ServerTransformer::class))
             ->toArray();
     }

app/Http/Controllers/Api/Application/Servers/StartupController.php

@@ -34,11 +34,11 @@ public function __construct(StartupModificationService $modificationService)
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function index(UpdateServerStartupRequest $request): array
+    public function index(UpdateServerStartupRequest $request, Server $server): array
     {
         $server = $this->modificationService
             ->setUserLevel(User::USER_LEVEL_ADMIN)
-            ->handle($request->getModel(Server::class), $request->validated());
+            ->handle($server, $request->validated());
 
         return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))

app/Http/Controllers/Api/Application/Users/ExternalUserController.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Application\Users;
 
+use Pterodactyl\Models\User;
 use Pterodactyl\Transformers\Api\Application\UserTransformer;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 use Pterodactyl\Http\Requests\Api\Application\Users\GetExternalUserRequest;
@@ -11,9 +12,11 @@ class ExternalUserController extends ApplicationApiController
     /**
      * Retrieve a specific user from the database using their external ID.
      */
-    public function index(GetExternalUserRequest $request): array
+    public function index(GetExternalUserRequest $request, string $external_id): array
     {
-        return $this->fractal->item($request->getUserModel())
+        $user = User::query()->where('external_id', $external_id)->firstOrFail();
+
+        return $this->fractal->item($user)
             ->transformWith($this->getTransformer(UserTransformer::class))
             ->toArray();
     }

app/Http/Controllers/Api/Client/Servers/ScheduleController.php

@@ -52,8 +52,7 @@ public function __construct(ScheduleRepository $repository, ProcessScheduleServi
      */
     public function index(ViewScheduleRequest $request, Server $server)
     {
-        $schedules = $server->schedule;
-        $schedules->loadMissing('tasks');
+        $schedules = $server->schedules->loadMissing('tasks');
 
         return $this->fractal->collection($schedules)
             ->transformWith($this->getTransformer(ScheduleTransformer::class))