Prevent creating a new database via the application API if server is at its limit; closes #2129

app/Http/Controllers/Admin/ServersController.php

@@ -312,12 +312,12 @@ class ServersController extends Controller
      * Creates a new database assigned to a specific server.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest $request
-     * @param int $server
+     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\RedirectResponse
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
-    public function newDatabase(StoreServerDatabaseRequest $request, $server)
+    public function newDatabase(StoreServerDatabaseRequest $request, Server $server)
     {
         $this->databaseManagementService->create($server, [
             'database' => $request->input('database'),
@@ -326,7 +326,7 @@ class ServersController extends Controller
             'max_connections' => $request->input('max_connections'),
         ]);
 
-        return redirect()->route('admin.servers.view.database', $server)->withInput();
+        return redirect()->route('admin.servers.view.database', $server->id)->withInput();
     }
 
     /**

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

@@ -57,13 +57,12 @@ class DatabaseController extends ApplicationApiController
      * server.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\GetServerDatabasesRequest $request
+     * @param \Pterodactyl\Models\Server $server
      * @return array
      */
-    public function index(GetServerDatabasesRequest $request): array
+    public function index(GetServerDatabasesRequest $request, Server $server): array
     {
-        $databases = $this->repository->getDatabasesForServer($request->getModel(Server::class)->id);
-
-        return $this->fractal->collection($databases)
+        return $this->fractal->collection($server->databases)
             ->transformWith($this->getTransformer(ServerDatabaseTransformer::class))
             ->toArray();
     }
@@ -72,11 +71,13 @@ class DatabaseController extends ApplicationApiController
      * Return a single server database.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\GetServerDatabaseRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Database $database
      * @return array
      */
-    public function view(GetServerDatabaseRequest $request): array
+    public function view(GetServerDatabaseRequest $request, Server $server, Database $database): array
     {
-        return $this->fractal->item($request->getModel(Database::class))
+        return $this->fractal->item($database)
             ->transformWith($this->getTransformer(ServerDatabaseTransformer::class))
             ->toArray();
     }
@@ -85,29 +86,31 @@ class DatabaseController extends ApplicationApiController
      * Reset the password for a specific server database.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\ServerDatabaseWriteRequest $request
-     * @return \Illuminate\Http\Response
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Database $database
+     * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Throwable
      */
-    public function resetPassword(ServerDatabaseWriteRequest $request): Response
+    public function resetPassword(ServerDatabaseWriteRequest $request, Server $server, Database $database): JsonResponse
     {
-        $this->databasePasswordService->handle($request->getModel(Database::class));
+        $this->databasePasswordService->handle($database);
 
-        return response('', 204);
+        return JsonResponse::create([], JsonResponse::HTTP_NO_CONTENT);
     }
 
     /**
      * Create a new database on the Panel for a given server.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\StoreServerDatabaseRequest $request
+     * @param \Pterodactyl\Models\Server $server
      * @return \Illuminate\Http\JsonResponse
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
-    public function store(StoreServerDatabaseRequest $request): JsonResponse
+    public function store(StoreServerDatabaseRequest $request, Server $server): JsonResponse
     {
-        $server = $request->getModel(Server::class);
-        $database = $this->databaseManagementService->create($server->id, $request->validated());
+        $database = $this->databaseManagementService->create($server, $request->validated());
 
         return $this->fractal->item($database)
             ->transformWith($this->getTransformer(ServerDatabaseTransformer::class))
@@ -117,7 +120,7 @@ class DatabaseController extends ApplicationApiController
                     'database' => $database->id,
                 ]),
             ])
-            ->respond(201);
+            ->respond(Response::HTTP_CREATED);
     }
 
     /**

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

@@ -69,9 +69,7 @@ class DatabaseController extends ClientApiController
      */
     public function index(GetDatabasesRequest $request, Server $server): array
     {
-        $databases = $this->repository->getDatabasesForServer($server->id);
-
-        return $this->fractal->collection($databases)
+        return $this->fractal->collection($server->databases)
             ->transformWith($this->getTransformer(DatabaseTransformer::class))
             ->toArray();
     }
@@ -83,6 +81,8 @@ class DatabaseController extends ClientApiController
      * @param \Pterodactyl\Models\Server $server
      * @return array
      *
+     * @throws \Throwable
+     * @throws \Pterodactyl\Exceptions\Service\Database\TooManyDatabasesException
      * @throws \Pterodactyl\Exceptions\Service\Database\DatabaseClientFeatureNotEnabledException
      */
     public function store(StoreDatabaseRequest $request, Server $server): array