Update logic that handles creation of folders for a server

Author: DaneEveritt

app/Contracts/Repository/Daemon/FileRepositoryInterface.php

@@ -47,4 +47,13 @@ public function putContent(string $path, string $content): ResponseInterface;
      * @throws \GuzzleHttp\Exception\TransferException
      */
     public function getDirectory(string $path): array;
+
+    /**
+     * Creates a new directory for the server in the given $path.
+     *
+     * @param string $name
+     * @param string $path
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function createDirectory(string $name, string $path): ResponseInterface;
 }

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

@@ -4,12 +4,14 @@
 
 use Carbon\Carbon;
 use Ramsey\Uuid\Uuid;
+use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DownloadFileRequest;
 
 class FileController extends ClientApiController
@@ -53,6 +55,21 @@ public function listDirectory(ListFilesRequest $request): JsonResponse
         ]);
     }
 
+    /**
+     * Creates a new folder on the server.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest $request
+     * @return \Illuminate\Http\Response
+     */
+    public function createFolder(CreateFolderRequest $request): Response
+    {
+        $this->fileRepository
+            ->setServer($request->getModel(Server::class))
+            ->createDirectory($request->input('name'), $request->input('directory', '/'));
+
+        return Response::create('s');
+    }
+
     /**
      * Configure a reference to a file to download in the cache so that when the
      * user hits the Daemon and it verifies with the Panel they'll actually be able

app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php

@@ -39,7 +39,7 @@ public function handle(Request $request, Closure $next)
         $server = $request->route()->parameter('server');
 
         if (! $server instanceof Server) {
-            throw new NotFoundHttpException;
+            throw new NotFoundHttpException(trans('exceptions.api.resource_not_found'));
         }
 
         if ($server->suspended) {

app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php

@@ -26,8 +26,13 @@ public function handle($request, Closure $next)
         // column rather than the default 'id'.
         $this->router->bind('server', function ($value) use ($request) {
             try {
+                $column = 'uuidShort';
+                if (preg_match('/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i', $value)) {
+                    $column = 'uuid';
+                }
+
                 return Container::getInstance()->make(ServerRepositoryInterface::class)->findFirstWhere([
-                    ['uuidShort', '=', $value],
+                    [$column, '=', $value],
                 ]);
             } catch (RecordNotFoundException $ex) {
                 $request->attributes->set('is_missing_model', true);

app/Http/Requests/Api/Client/Servers/Files/CreateFolderRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
+
+use Pterodactyl\Models\Server;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+
+class CreateFolderRequest extends ClientApiRequest
+{
+    /**
+     * Checks that the authenticated user is allowed to create files on the server.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        return $this->user()->can('create-files', $this->getModel(Server::class));
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'root' => 'sometimes|nullable|string',
+            'name' => 'required|string',
+        ];
+    }
+}

app/Http/Requests/Api/Client/Servers/Files/ListFilesRequest.php

@@ -17,4 +17,14 @@ public function authorize(): bool
     {
         return $this->user()->can('list-files', $this->getModel(Server::class));
     }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'directory' => 'sometimes|nullable|string',
+        ];
+    }
 }

app/Repositories/Daemon/FileRepository.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Repositories\Daemon;
 
 use stdClass;
+use RuntimeException;
 use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
 
@@ -86,4 +87,18 @@ public function getDirectory(string $path): array
 
         return json_decode($response->getBody());
     }
+
+    /**
+     * Creates a new directory for the server in the given $path.
+     *
+     * @param string $name
+     * @param string $path
+     * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \RuntimeException
+     */
+    public function createDirectory(string $name, string $path): ResponseInterface
+    {
+        throw new RuntimeException('Not implemented.');
+    }
 }

app/Repositories/Wings/FileRepository.php

@@ -66,4 +66,22 @@ public function getDirectory(string $path): array
 
         return json_decode($response->getBody(), true);
     }
+
+    /**
+     * Creates a new directory for the server in the given $path.
+     *
+     * @param string $name
+     * @param string $path
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function createDirectory(string $name, string $path): ResponseInterface
+    {
+        return $this->getHttpClient()->post(
+            sprintf('/api/servers/%s/files/create-directory', $this->getServer()->uuid),
+            [
+                'name' => $name,
+                'directory' => $path,
+            ]
+        );
+    }
 }

resources/assets/scripts/api/http.ts

@@ -1,4 +1,4 @@
-import axios, {AxiosInstance, AxiosRequestConfig} from 'axios';
+import axios, {AxiosInstance} from 'axios';
 import {ServerApplicationCredentials} from "@/store/types";
 
 // This token is set in the bootstrap.js file at the beginning of the request

resources/assets/scripts/api/server/files/createFolder.ts

@@ -1,12 +1,13 @@
-import {ServerApplicationCredentials} from "@/store/types";
-import {withCredentials} from "@/api/http";
+import http from "@/api/http";
 
 /**
  * Connects to the remote daemon and creates a new folder on the server.
  */
-export function createFolder(server: string, credentials: ServerApplicationCredentials, path: string): Promise<void> {
+export function createFolder(server: string, directory: string, name: string): Promise<void> {
     return new Promise((resolve, reject) => {
-        withCredentials(server, credentials).post('/v1/server/file/folder', { path })
+        http.post(`/api/client/servers/${server}/files/create-folder`, {
+            directory, name,
+        })
             .then(() => resolve())
             .catch(reject);
     });