Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the client API to be consistent with how validation is handled

Browse source
This commit is contained in:
Dane Everitt 2021-08-04 20:55:15 -07:00
parent b47d262ee0
commit 622d292f39
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 59 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Requests/Api/Client/Servers/Files/ChmodFilesRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class ChmodFilesRequest extends ClientApiRequest implements ClientPermissionsRequest
class ChmodFilesRequest extends ClientApiRequest
{
public function permission(): string
{

3
app/Http/Requests/Api/Client/Servers/Files/CompressFilesRequest.php
View file

@ -7,9 +7,6 @@ use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class CompressFilesRequest extends ClientApiRequest
{
/**
* Checks that the authenticated user is allowed to create archives for this server.
*/
public function permission(): string
{
return Permission::ACTION_FILE_ARCHIVE;

3
app/Http/Requests/Api/Client/Servers/Files/CopyFileRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class CopyFileRequest extends ClientApiRequest implements ClientPermissionsRequest
class CopyFileRequest extends ClientApiRequest
{
public function permission(): string
{

3
app/Http/Requests/Api/Client/Servers/Files/CreateFolderRequest.php
View file

@ -7,9 +7,6 @@ use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class CreateFolderRequest extends ClientApiRequest
{
/**
* Checks that the authenticated user is allowed to create files on the server.
*/
public function permission(): string
{
return Permission::ACTION_FILE_CREATE;

3
app/Http/Requests/Api/Client/Servers/Files/DeleteFileRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class DeleteFileRequest extends ClientApiRequest implements ClientPermissionsRequest
class DeleteFileRequest extends ClientApiRequest
{
public function permission(): string
{

18
app/Http/Requests/Api/Client/Servers/Files/DownloadFileRequest.php
View file

@ -1,18 +0,0 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Server;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class DownloadFileRequest extends ClientApiRequest
{
/**
* Ensure that the user making this request has permission to download files
* from this server.
*/
public function authorize(): bool
{
return $this->user()->can('file.read', $this->getModel(Server::class));
}
}

8
app/Http/Requests/Api/Client/Servers/Files/GetFileContentsRequest.php
View file

@ -3,16 +3,10 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class GetFileContentsRequest extends ClientApiRequest implements ClientPermissionsRequest
class GetFileContentsRequest extends ClientApiRequest
{
/**
* Returns the permissions string indicating which permission should be used to
* validate that the authenticated user has permission to perform this action aganist
* the given resource (server).
*/
public function permission(): string
{
return Permission::ACTION_FILE_READ_CONTENT;

3
app/Http/Requests/Api/Client/Servers/Files/PullFileRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class PullFileRequest extends ClientApiRequest implements ClientPermissionsRequest
class PullFileRequest extends ClientApiRequest
{
public function permission(): string
{

3
app/Http/Requests/Api/Client/Servers/Files/RenameFileRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class RenameFileRequest extends ClientApiRequest implements ClientPermissionsRequest
class RenameFileRequest extends ClientApiRequest
{
/**
* The permission the user is required to have in order to perform this

5
app/Http/Requests/Api/Client/Servers/Files/UploadFileRequest.php
View file

@ -7,10 +7,7 @@ use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class UploadFileRequest extends ClientApiRequest
{
/**
* @return string
*/
public function permission()
public function permission(): string
{
return Permission::ACTION_FILE_CREATE;
}

3
app/Http/Requests/Api/Client/Servers/Files/WriteFileContentRequest.php
View file

@ -3,10 +3,9 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class WriteFileContentRequest extends ClientApiRequest implements ClientPermissionsRequest
class WriteFileContentRequest extends ClientApiRequest
{
/**
* Returns the permissions string indicating which permission should be used to