mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-03-14 04:00:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improved CreateShortCodeContentNegotiationMiddleware so that it can determine the format based on a query partameter

Browse source
This commit is contained in:
Alejandro Celaya 2018-05-03 18:32:32 +02:00
parent 59f10619ba
commit 1f78b5c524
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
module/Rest/src/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddleware.php
View file

@ -25,7 +25,11 @@ class CreateShortCodeContentNegotiationMiddleware implements MiddlewareInterface
{
/** @var JsonResponse $response */
$response = $handler->handle($request);
$acceptedType = $this->determineAcceptedType($request);
$acceptedType = $request->hasHeader('Accept')
? $this->determineAcceptTypeFromHeader($request->getHeaderLine('Accept'))
: $this->determineAcceptTypeFromQuery($request->getQueryParams());
// If JSON was requested, return the response from next handler as is
if ($acceptedType === self::JSON) {
return $response;
}
@ -38,9 +42,19 @@ class CreateShortCodeContentNegotiationMiddleware implements MiddlewareInterface
return $resp;
}
private function determineAcceptedType(ServerRequestInterface $request): string
private function determineAcceptTypeFromQuery(array $query): string
{
$accepts = \explode(',', $request->getHeaderLine('Accept'));
if (! isset($query['format'])) {
return self::JSON;
}
$format = \strtolower((string) $query['format']);
return $format === 'txt' ? self::PLAIN_TEXT : self::JSON;
}
private function determineAcceptTypeFromHeader(string $acceptValue): string
{
$accepts = \explode(',', $acceptValue);
$accept = \strtolower(\array_shift($accepts));
return \strpos($accept, 'text/plain') !== false ? self::PLAIN_TEXT : self::JSON;
}