From ec4a413a5b5afc3c2418533e1ac2ef18604e0d8a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 13 Apr 2017 09:45:31 +0200 Subject: [PATCH] Removed options bypass in actions in favor of implicit options middleware --- module/Rest/src/Action/AbstractRestAction.php | 29 ------------------- module/Rest/src/Action/AuthenticateAction.php | 2 +- .../Rest/src/Action/CreateShortcodeAction.php | 2 +- module/Rest/src/Action/EditTagsAction.php | 2 +- module/Rest/src/Action/GetVisitsAction.php | 2 +- .../Rest/src/Action/ListShortcodesAction.php | 3 +- module/Rest/src/Action/ResolveUrlAction.php | 2 +- 7 files changed, 6 insertions(+), 36 deletions(-) diff --git a/module/Rest/src/Action/AbstractRestAction.php b/module/Rest/src/Action/AbstractRestAction.php index c71c0176..01b8c13d 100644 --- a/module/Rest/src/Action/AbstractRestAction.php +++ b/module/Rest/src/Action/AbstractRestAction.php @@ -3,13 +3,9 @@ namespace Shlinkio\Shlink\Rest\Action; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; -use Interop\Http\ServerMiddleware\DelegateInterface; use Interop\Http\ServerMiddleware\MiddlewareInterface; -use Psr\Http\Message\ResponseInterface as Response; -use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; -use Zend\Diactoros\Response\EmptyResponse; abstract class AbstractRestAction implements MiddlewareInterface, RequestMethodInterface, StatusCodeInterface { @@ -22,29 +18,4 @@ abstract class AbstractRestAction implements MiddlewareInterface, RequestMethodI { $this->logger = $logger ?: new NullLogger(); } - - /** - * Process an incoming server request and return a response, optionally delegating - * to the next middleware component to create the response. - * - * @param Request $request - * @param DelegateInterface $delegate - * - * @return Response - */ - public function process(Request $request, DelegateInterface $delegate) - { - if ($request->getMethod() === self::METHOD_OPTIONS) { - return new EmptyResponse(); - } - - return $this->dispatch($request, $delegate); - } - - /** - * @param Request $request - * @param DelegateInterface $delegate - * @return null|Response - */ - abstract protected function dispatch(Request $request, DelegateInterface $delegate); } diff --git a/module/Rest/src/Action/AuthenticateAction.php b/module/Rest/src/Action/AuthenticateAction.php index 27d67bc3..73d6a7df 100644 --- a/module/Rest/src/Action/AuthenticateAction.php +++ b/module/Rest/src/Action/AuthenticateAction.php @@ -55,7 +55,7 @@ class AuthenticateAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - public function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { $authData = $request->getParsedBody(); if (! isset($authData['apiKey'])) { diff --git a/module/Rest/src/Action/CreateShortcodeAction.php b/module/Rest/src/Action/CreateShortcodeAction.php index e63db63a..5384aac9 100644 --- a/module/Rest/src/Action/CreateShortcodeAction.php +++ b/module/Rest/src/Action/CreateShortcodeAction.php @@ -56,7 +56,7 @@ class CreateShortcodeAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - public function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { $postData = $request->getParsedBody(); if (! isset($postData['longUrl'])) { diff --git a/module/Rest/src/Action/EditTagsAction.php b/module/Rest/src/Action/EditTagsAction.php index a61e940a..075e65f0 100644 --- a/module/Rest/src/Action/EditTagsAction.php +++ b/module/Rest/src/Action/EditTagsAction.php @@ -47,7 +47,7 @@ class EditTagsAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - protected function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { $shortCode = $request->getAttribute('shortCode'); $bodyParams = $request->getParsedBody(); diff --git a/module/Rest/src/Action/GetVisitsAction.php b/module/Rest/src/Action/GetVisitsAction.php index c5e6b71b..681c9338 100644 --- a/module/Rest/src/Action/GetVisitsAction.php +++ b/module/Rest/src/Action/GetVisitsAction.php @@ -48,7 +48,7 @@ class GetVisitsAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - public function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { $shortCode = $request->getAttribute('shortCode'); $startDate = $this->getDateQueryParam($request, 'startDate'); diff --git a/module/Rest/src/Action/ListShortcodesAction.php b/module/Rest/src/Action/ListShortcodesAction.php index b7099c1c..43803a7f 100644 --- a/module/Rest/src/Action/ListShortcodesAction.php +++ b/module/Rest/src/Action/ListShortcodesAction.php @@ -6,7 +6,6 @@ use Interop\Http\ServerMiddleware\DelegateInterface; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Log\LoggerInterface; -use Psr\Log\NullLogger; use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait; use Shlinkio\Shlink\Core\Service\ShortUrlService; use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface; @@ -50,7 +49,7 @@ class ListShortcodesAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - public function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { try { $params = $this->queryToListParams($request->getQueryParams()); diff --git a/module/Rest/src/Action/ResolveUrlAction.php b/module/Rest/src/Action/ResolveUrlAction.php index b705814a..55280922 100644 --- a/module/Rest/src/Action/ResolveUrlAction.php +++ b/module/Rest/src/Action/ResolveUrlAction.php @@ -47,7 +47,7 @@ class ResolveUrlAction extends AbstractRestAction * @param DelegateInterface $delegate * @return null|Response */ - public function dispatch(Request $request, DelegateInterface $delegate) + public function process(Request $request, DelegateInterface $delegate) { $shortCode = $request->getAttribute('shortCode');