Move actions into context menu, add support for deleting a backup

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

@@ -2,12 +2,16 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
+use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Services\Backups\DeleteBackupService;
 use Pterodactyl\Services\Backups\InitiateBackupService;
 use Pterodactyl\Transformers\Api\Client\BackupTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\GetBackupsRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\StoreBackupRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\DeleteBackupRequest;
 
 class BackupController extends ClientApiController
 {
@@ -16,16 +20,23 @@ class BackupController extends ClientApiController
      */
     private $initiateBackupService;
 
+    /**
+     * @var \Pterodactyl\Services\Backups\DeleteBackupService
+     */
+    private $deleteBackupService;
+
     /**
      * BackupController constructor.
      *
+     * @param \Pterodactyl\Services\Backups\DeleteBackupService $deleteBackupService
      * @param \Pterodactyl\Services\Backups\InitiateBackupService $initiateBackupService
      */
-    public function __construct(InitiateBackupService $initiateBackupService)
+    public function __construct(DeleteBackupService $deleteBackupService, InitiateBackupService $initiateBackupService)
     {
         parent::__construct();
 
         $this->initiateBackupService = $initiateBackupService;
+        $this->deleteBackupService = $deleteBackupService;
     }
 
     /**
@@ -50,7 +61,7 @@ class BackupController extends ClientApiController
      * @param \Pterodactyl\Models\Server $server
      * @return array
      *
-     * @throws \Exception
+     * @throws \Exception|\Throwable
      */
     public function store(StoreBackupRequest $request, Server $server)
     {
@@ -63,15 +74,36 @@ class BackupController extends ClientApiController
             ->toArray();
     }
 
-    public function view()
+    /**
+     * Returns information about a single backup.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Backups\GetBackupsRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Backup $backup
+     * @return array
+     */
+    public function view(GetBackupsRequest $request, Server $server, Backup $backup)
     {
+        return $this->fractal->item($backup)
+            ->transformWith($this->getTransformer(BackupTransformer::class))
+            ->toArray();
     }
 
-    public function update()
+    /**
+     * Deletes a backup from the panel as well as the remote source where it is currently
+     * being stored.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Backups\DeleteBackupRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Backup $backup
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Throwable
+     */
+    public function delete(DeleteBackupRequest $request, Server $server, Backup $backup)
     {
-    }
+        $this->deleteBackupService->handle($backup);
 
-    public function delete()
-    {
+        return JsonResponse::create([], JsonResponse::HTTP_NO_CONTENT);
     }
 }

app/Http/Requests/Api/Client/Servers/Backups/DeleteBackupRequest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Backups;
+
+use Pterodactyl\Models\Permission;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+
+class DeleteBackupRequest extends ClientApiRequest
+{
+    /**
+     * @return string
+     */
+    public function permission()
+    {
+        return Permission::ACTION_BACKUP_DELETE;
+    }
+}

app/Repositories/Wings/DaemonBackupRepository.php

@@ -39,22 +39,19 @@ class DaemonBackupRepository extends DaemonRepository
     }
 
     /**
-     * Returns a stream of a backup's contents from the Wings instance so that we
-     * do not need to send the user directly to the Daemon.
+     * Deletes a backup from the daemon.
      *
-     * @param string $backup
+     * @param \Pterodactyl\Models\Backup $backup
      * @return \Psr\Http\Message\ResponseInterface
-     *
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
-    public function getBackup(string $backup): ResponseInterface
+    public function delete(Backup $backup): ResponseInterface
     {
         Assert::isInstanceOf($this->server, Server::class);
 
         try {
-            return $this->getHttpClient()->get(
-                sprintf('/api/servers/%s/backup/%s', $this->server->uuid, $backup),
-                ['stream' => true]
+            return $this->getHttpClient()->delete(
+                sprintf('/api/servers/%s/backup/%s', $this->server->uuid, $backup->uuid)
             );
         } catch (TransferException $exception) {
             throw new DaemonConnectionException($exception);

app/Services/Backups/DeleteBackupService.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Pterodactyl\Services\Backups;
+
+use Pterodactyl\Models\Backup;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Eloquent\BackupRepository;
+use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
+
+class DeleteBackupService
+{
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\BackupRepository
+     */
+    private $repository;
+
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonBackupRepository
+     */
+    private $daemonBackupRepository;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    private $connection;
+
+    /**
+     * DeleteBackupService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface $connection
+     * @param \Pterodactyl\Repositories\Eloquent\BackupRepository $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonBackupRepository $daemonBackupRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        BackupRepository $repository,
+        DaemonBackupRepository $daemonBackupRepository
+    ) {
+        $this->repository = $repository;
+        $this->daemonBackupRepository = $daemonBackupRepository;
+        $this->connection = $connection;
+    }
+
+    /**
+     * Deletes a backup from the system.
+     *
+     * @param \Pterodactyl\Models\Backup $backup
+     * @throws \Throwable
+     */
+    public function handle(Backup $backup)
+    {
+        $this->connection->transaction(function () use ($backup) {
+            $this->daemonBackupRepository->setServer($backup->server)->delete($backup);
+
+            $this->repository->delete($backup->id);
+        });
+    }
+}