Nosial/FederationServer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update attachment routes to use plural form and add DELETE method handling

Browse source
This commit is contained in:
netkas 2025-06-03 13:47:22 -04:00
parent 0b463fa70c
commit 9d19fc2ef4
Signed by: netkas
GPG key ID: 4D8629441B76E4CC
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/FederationServer/Classes/Enums/Method.php
View file

@ -3,6 +3,7 @@
namespace FederationServer\Classes\Enums; namespace FederationServer\Classes\Enums;
use FederationServer\Exceptions\RequestException; use FederationServer\Exceptions\RequestException;
use FederationServer\Methods\Attachments\DeleteAttachment;
use FederationServer\Methods\Attachments\DownloadAttachment; use FederationServer\Methods\Attachments\DownloadAttachment;
use FederationServer\Methods\Attachments\UploadAttachment; use FederationServer\Methods\Attachments\UploadAttachment;
use FederationServer\Methods\Operators\CreateOperator; use FederationServer\Methods\Operators\CreateOperator;
@ -29,6 +30,7 @@
case UPLOAD_ATTACHMENT; case UPLOAD_ATTACHMENT;
case DOWNLOAD_ATTACHMENT; case DOWNLOAD_ATTACHMENT;
case DELETE_ATTACHMENT;
/** /**
* Handles the request of the method * Handles the request of the method
@ -74,6 +76,9 @@
case self::DOWNLOAD_ATTACHMENT: case self::DOWNLOAD_ATTACHMENT:
DownloadAttachment::handleRequest(); DownloadAttachment::handleRequest();
break; break;
case self::DELETE_ATTACHMENT:
DeleteAttachment::handleRequest();
break;
} }
} }
@ -90,13 +95,14 @@
{ {
$requestMethod === 'POST' && $path === '/' => null, $requestMethod === 'POST' && $path === '/' => null,
preg_match('#^/attachment/([a-fA-F0-9\-]{36,})$#', $path) => Method::DOWNLOAD_ATTACHMENT, preg_match('#^/attachments/([a-fA-F0-9\-]{36,})$#', $path) && $requestMethod === 'GET' => Method::DOWNLOAD_ATTACHMENT,
($requestMethod === 'POST' || $requestMethod === 'PUT') && $path === '/attachment/upload' => Method::UPLOAD_ATTACHMENT, preg_match('#^/attachments/([a-fA-F0-9\-]{36,})$#', $path) && $requestMethod === 'DELETE' => Method::DELETE_ATTACHMENT,
($requestMethod === 'POST' || $requestMethod === 'PUT') && $path === '/attachments/upload' => Method::UPLOAD_ATTACHMENT,
($requestMethod === 'POST' || $requestMethod === 'GET') && $path === '/operators' => Method::LIST_OPERATORS, ($requestMethod === 'POST' || $requestMethod === 'GET') && $path === '/operators' => Method::LIST_OPERATORS,
$requestMethod === 'POST' && $path === '/operators/create' => Method::CREATE_OPERATOR, $requestMethod === 'POST' && $path === '/operators/create' => Method::CREATE_OPERATOR,
preg_match('#^/operators/([a-fA-F0-9\-]{36,})$#', $path) && $requestMethod === 'POST' => Method::GET_OPERATOR, preg_match('#^/operators/([a-fA-F0-9\-]{36,})$#', $path) && $requestMethod === 'POST' => Method::GET_OPERATOR,
preg_match('#^/operators/([a-fA-F0-9\-]{36,})/delete$#', $path) && $requestMethod === 'DELETE' => Method::DELETE_OPERATOR, preg_match('#^/operators/([a-fA-F0-9\-]{36,})$#', $path) && $requestMethod === 'DELETE' => Method::DELETE_OPERATOR,
preg_match('#^/operators/([a-fA-F0-9\-]{36,})/enable$#', $path) && $requestMethod === 'POST' => Method::ENABLE_OPERATOR, preg_match('#^/operators/([a-fA-F0-9\-]{36,})/enable$#', $path) && $requestMethod === 'POST' => Method::ENABLE_OPERATOR,
preg_match('#^/operators/([a-fA-F0-9\-]{36,})/refresh$#', $path) && $requestMethod === 'POST' => Method::REFRESH_OPERATOR_API_KEY, preg_match('#^/operators/([a-fA-F0-9\-]{36,})/refresh$#', $path) && $requestMethod === 'POST' => Method::REFRESH_OPERATOR_API_KEY,
preg_match('#^/operators/([a-fA-F0-9\-]{36,})/manage_operators$#', $path) && $requestMethod === 'POST' => Method::MANAGE_OPERATORS_PERMISSION, preg_match('#^/operators/([a-fA-F0-9\-]{36,})/manage_operators$#', $path) && $requestMethod === 'POST' => Method::MANAGE_OPERATORS_PERMISSION,

2
src/FederationServer/Methods/Attachments/DownloadAttachment.php
View file

@ -18,7 +18,7 @@
*/ */
public static function handleRequest(): void public static function handleRequest(): void
{ {
if(!preg_match('#^/attachment/([a-fA-F0-9\-]{36,})$#', FederationServer::getPath(), $matches)) if(!preg_match('#^/attachments/([a-fA-F0-9\-]{36,})$#', FederationServer::getPath(), $matches))
{ {
throw new RequestException('Attachment UUID required', 405); throw new RequestException('Attachment UUID required', 405);
} }