mirror of
https://github.com/shlinkio/shlink.git
synced 2025-02-16 10:14:54 -06:00
Deleted ResponseTypeMiddleware which is not ussable anymore
This commit is contained in:
parent
a81dba58bd
commit
f3d2cf5e15
@ -19,7 +19,6 @@ return [
|
||||
|
||||
Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
|
||||
Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
|
||||
Middleware\ResponseTypeMiddleware::class => AnnotatedFactory::class,
|
||||
Middleware\NotFoundMiddleware::class => AnnotatedFactory::class,
|
||||
],
|
||||
],
|
||||
|
@ -1,99 +0,0 @@
|
||||
<?php
|
||||
namespace Shlinkio\Shlink\Rest\Middleware;
|
||||
|
||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
||||
use Psr\Http\Message\ResponseInterface as Response;
|
||||
use Psr\Http\Message\ServerRequestInterface as Request;
|
||||
use Shlinkio\Shlink\Rest\Util\RestUtils;
|
||||
use Zend\Diactoros\Response\JsonResponse;
|
||||
use Zend\Expressive\Router\RouteResult;
|
||||
use Zend\I18n\Translator\TranslatorInterface;
|
||||
use Zend\Stratigility\MiddlewareInterface;
|
||||
|
||||
class ResponseTypeMiddleware implements MiddlewareInterface
|
||||
{
|
||||
/**
|
||||
* @var TranslatorInterface
|
||||
*/
|
||||
private $translator;
|
||||
|
||||
/**
|
||||
* ResponseTypeMiddleware constructor.
|
||||
* @param TranslatorInterface $translator
|
||||
*
|
||||
* @Inject({"translator"})
|
||||
*/
|
||||
public function __construct(TranslatorInterface $translator)
|
||||
{
|
||||
$this->translator = $translator;
|
||||
}
|
||||
|
||||
/**
|
||||
* Process an incoming error, along with associated request and response.
|
||||
*
|
||||
* Accepts an error, a server-side request, and a response instance, and
|
||||
* does something with them; if further processing can be done, it can
|
||||
* delegate to `$out`.
|
||||
*
|
||||
* @see MiddlewareInterface
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
* @param null|callable $out
|
||||
* @return null|Response
|
||||
*/
|
||||
public function __invoke(Request $request, Response $response, callable $out = null)
|
||||
{
|
||||
$accept = $request->getHeader('Accept');
|
||||
if (! empty(array_intersect(['application/json', 'text/json', 'application/x-json'], $accept))) {
|
||||
$status = $this->determineStatus($request, $response);
|
||||
$errorData = $this->determineErrorCode($request, $status);
|
||||
|
||||
return new JsonResponse($errorData, $status);
|
||||
}
|
||||
|
||||
return $out($request, $response);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
* @return int
|
||||
*/
|
||||
protected function determineStatus(Request $request, Response $response)
|
||||
{
|
||||
/** @var RouteResult $routeResult */
|
||||
$routeResult = $request->getAttribute(RouteResult::class);
|
||||
if ($routeResult->isFailure()) {
|
||||
return 404;
|
||||
}
|
||||
|
||||
$status = $response->getStatusCode();
|
||||
return $status >= 400 ? $status : 500;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param int $status
|
||||
* @return string
|
||||
*/
|
||||
protected function determineErrorCode(Request $request, $status)
|
||||
{
|
||||
$errorData = $request->getAttribute('errorData');
|
||||
if (isset($errorData)) {
|
||||
return $errorData;
|
||||
}
|
||||
|
||||
switch ($status) {
|
||||
case 404:
|
||||
return [
|
||||
'error' => RestUtils::NOT_FOUND_ERROR,
|
||||
'message' => $this->translator->translate('Requested route does not exist'),
|
||||
];
|
||||
default:
|
||||
return [
|
||||
'error' => RestUtils::UNKNOWN_ERROR,
|
||||
'message' => $this->translator->translate('Unknown error occured'),
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user