Moved all logic to redirect to specific URLs when a 404 is found to the NotFoundHandler

module/Core/src/Action/RedirectAction.php

@@ -7,11 +7,8 @@ namespace Shlinkio\Shlink\Core\Action;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Action\Util\ErrorResponseBuilderTrait;
 use Shlinkio\Shlink\Core\Options;
-use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Zend\Diactoros\Response\RedirectResponse;
 
 class RedirectAction extends AbstractTrackingAction
@@ -21,17 +18,6 @@ class RedirectAction extends AbstractTrackingAction
     /** @var Options\NotFoundRedirectOptions */
     private $redirectOptions;
 
-    public function __construct(
-        UrlShortenerInterface $urlShortener,
-        VisitsTrackerInterface $visitTracker,
-        Options\AppOptions $appOptions,
-        Options\NotFoundRedirectOptions $redirectOptions,
-        ?LoggerInterface $logger = null
-    ) {
-        parent::__construct($urlShortener, $visitTracker, $appOptions, $logger);
-        $this->redirectOptions = $redirectOptions;
-    }
-
     protected function createSuccessResp(string $longUrl): Response
     {
         // Return a redirect response to the long URL.
@@ -39,14 +25,8 @@ class RedirectAction extends AbstractTrackingAction
         return new RedirectResponse($longUrl);
     }
 
-    protected function createErrorResp(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ): Response {
-        if ($this->redirectOptions->hasInvalidShortUrlRedirect()) {
-            return new RedirectResponse($this->redirectOptions->getInvalidShortUrlRedirect());
-        }
-
+    protected function createErrorResp(ServerRequestInterface $request, RequestHandlerInterface $handler): Response
+    {
         return $this->buildErrorResponse($request, $handler);
     }
 }

module/Core/src/Response/NotFoundHandler.php

@@ -5,15 +5,19 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Response;
 
 use Fig\Http\Message\StatusCodeInterface;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Zend\Diactoros\Response;
+use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Template\TemplateRendererInterface;
 
 use function array_shift;
 use function explode;
 use function Functional\contains;
+use function rtrim;
 
 class NotFoundHandler implements RequestHandlerInterface
 {
@@ -23,11 +27,21 @@ class NotFoundHandler implements RequestHandlerInterface
     private $renderer;
     /** @var string */
     private $defaultTemplate;
+    /** @var NotFoundRedirectOptions */
+    private $redirectOptions;
+    /** @var string */
+    private $shlinkBasePath;
 
-    public function __construct(TemplateRendererInterface $renderer, string $defaultTemplate = 'ShlinkCore::error/404')
-    {
+    public function __construct(
+        TemplateRendererInterface $renderer,
+        NotFoundRedirectOptions $redirectOptions,
+        string $shlinkBasePath,
+        string $defaultTemplate = 'ShlinkCore::error/404'
+    ) {
         $this->renderer = $renderer;
         $this->defaultTemplate = $defaultTemplate;
+        $this->redirectOptions = $redirectOptions;
+        $this->shlinkBasePath = $shlinkBasePath;
     }
 
     /**
@@ -36,10 +50,15 @@ class NotFoundHandler implements RequestHandlerInterface
      * @param ServerRequestInterface $request
      *
      * @return ResponseInterface
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
+        $redirectResponse = $this->createRedirectResponse($request);
+        if ($redirectResponse !== null) {
+            return $redirectResponse;
+        }
+
         $accepts = explode(',', $request->getHeaderLine('Accept'));
         $accept = array_shift($accepts);
         $status = StatusCodeInterface::STATUS_NOT_FOUND;
@@ -55,4 +74,29 @@ class NotFoundHandler implements RequestHandlerInterface
         $notFoundTemplate = $request->getAttribute(self::NOT_FOUND_TEMPLATE, $this->defaultTemplate);
         return new Response\HtmlResponse($this->renderer->render($notFoundTemplate), $status);
     }
+
+    private function createRedirectResponse(ServerRequestInterface $request): ?ResponseInterface
+    {
+        /** @var RouteResult $routeResult */
+        $routeResult = $request->getAttribute(RouteResult::class, RouteResult::fromRouteFailure(null));
+        $isBaseUrl = rtrim($request->getUri()->getPath(), '/') === $this->shlinkBasePath;
+
+        if ($isBaseUrl && $this->redirectOptions->hasBaseUrlRedirect()) {
+            return new Response\RedirectResponse($this->redirectOptions->getBaseUrlRedirect());
+        }
+
+        if (!$isBaseUrl && $routeResult->isFailure() && $this->redirectOptions->hasRegular404Redirect()) {
+            return new Response\RedirectResponse($this->redirectOptions->getRegular404Redirect());
+        }
+
+        if (
+            $routeResult->isSuccess() &&
+            $routeResult->getMatchedRouteName() === 'long-url-redirect' &&
+            $this->redirectOptions->hasInvalidShortUrlRedirect()
+        ) {
+            return new Response\RedirectResponse($this->redirectOptions->getInvalidShortUrlRedirect());
+        }
+
+        return null;
+    }
 }