Merge pull request #1189 from acelaya-forks/feature/roll-back-domain-redirects-logic

Reolled-back logic that would have made domains with no specific redi…

module/Core/src/ErrorHandler/NotFoundRedirectHandler.php

@@ -27,9 +27,18 @@ class NotFoundRedirectHandler implements MiddlewareInterface
         /** @var NotFoundType $notFoundType */
         $notFoundType = $request->getAttribute(NotFoundType::class);
         $authority = $request->getUri()->getAuthority();
-        $redirectConfig = $this->domainService->findByAuthority($authority) ?? $this->redirectOptions;
-        $redirectResponse = $this->redirectResolver->resolveRedirectResponse($notFoundType, $redirectConfig);
+        $domainSpecificRedirect = $this->resolveDomainSpecificRedirect($authority, $notFoundType);
 
-        return $redirectResponse ?? $handler->handle($request);
+        return $domainSpecificRedirect
+            // If we did not find domain-specific redirects for current domain, we try to fall back to default redirects
+            ?? $this->redirectResolver->resolveRedirectResponse($notFoundType, $this->redirectOptions)
+            // Ultimately, we just call next handler if no domain-specific redirects or default redirects were found
+            ?? $handler->handle($request);
+    }
+
+    private function resolveDomainSpecificRedirect(string $authority, NotFoundType $notFoundType): ?ResponseInterface
+    {
+        $domain = $this->domainService->findByAuthority($authority);
+        return $domain === null ? null : $this->redirectResolver->resolveRedirectResponse($notFoundType, $domain);
     }
 }

module/Core/test/ErrorHandler/NotFoundRedirectHandlerTest.php

@@ -81,6 +81,10 @@ class NotFoundRedirectHandlerTest extends TestCase
             $domainService->findByAuthority(Argument::cetera())
                 ->willReturn(Domain::withAuthority(''))
                 ->shouldBeCalledOnce();
+            $resolver->resolveRedirectResponse(
+                Argument::type(NotFoundType::class),
+                Argument::type(NotFoundRedirectOptions::class),
+            )->willReturn(null)->shouldBeCalledOnce();
             $resolver->resolveRedirectResponse(Argument::type(NotFoundType::class), Argument::type(Domain::class))
                 ->willReturn(null)
                 ->shouldBeCalledOnce();