OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensured domain is taken into account when generating QR codes

Browse Source
This commit is contained in:
Alejandro Celaya
2019-10-22 19:43:53 +02:00
parent 6d366188c9
commit cd6f067fe5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/Core/src/Action/QrCodeAction.php
View File

@@ -59,8 +59,10 @@ class QrCodeAction implements MiddlewareInterface
{ {
// Make sure the short URL exists for this short code // Make sure the short URL exists for this short code
$shortCode = $request->getAttribute('shortCode'); $shortCode = $request->getAttribute('shortCode');
$domain = $request->getUri()->getAuthority();
try { try {
$this->urlShortener->shortCodeToUrl($shortCode); $this->urlShortener->shortCodeToUrl($shortCode, $domain);
} catch (InvalidShortCodeException | EntityDoesNotExistException $e) { } catch (InvalidShortCodeException | EntityDoesNotExistException $e) {
$this->logger->warning('An error occurred while creating QR code. {e}', ['e' => $e]); $this->logger->warning('An error occurred while creating QR code. {e}', ['e' => $e]);
return $this->buildErrorResponse($request, $handler); return $this->buildErrorResponse($request, $handler);

1
module/Core/src/Service/UrlShortener.php
View File

@@ -152,6 +152,7 @@ class UrlShortener implements UrlShortenerInterface
if ($shortUrl === null) { if ($shortUrl === null) {
throw EntityDoesNotExistException::createFromEntityAndConditions(ShortUrl::class, [ throw EntityDoesNotExistException::createFromEntityAndConditions(ShortUrl::class, [
'shortCode' => $shortCode, 'shortCode' => $shortCode,
'domain' => $domain,
]); ]);
} }