[BUGFIX] Proper checks for headless mode

TYPO3-Headless · Dec 13, 2023 · 23f3057 · 23f3057
1 parent 426e3fe
commit 23f3057
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Classes/Middleware/SiteBaseRedirectResolver.php b/Classes/Middleware/SiteBaseRedirectResolver.php
@@ -11,6 +11,7 @@
 
 namespace FriendsOfTYPO3\Headless\Middleware;
 
+use FriendsOfTYPO3\Headless\Utility\HeadlessMode;
 use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -22,6 +23,8 @@
 
 class SiteBaseRedirectResolver extends \TYPO3\CMS\Frontend\Middleware\SiteBaseRedirectResolver
 {
+    public function __construct(private readonly HeadlessMode $headlessMode) {}
+
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $response = parent::process($request, $handler);
@@ -32,9 +35,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $response;
         }
 
-        $siteConf = $site->getConfiguration();
-
-        if (!($siteConf['headless'] ?? false)) {
+        if (!$this->headlessMode->withRequest($request)->isEnabled()) {
             return $response;
         }
 

diff --git a/Tests/Unit/Middleware/SiteBaseRedirectResolverTest.php b/Tests/Unit/Middleware/SiteBaseRedirectResolverTest.php
@@ -12,6 +12,8 @@
 namespace FriendsOfTYPO3\Headless\Tests\Unit\Middleware;
 
 use FriendsOfTYPO3\Headless\Middleware\SiteBaseRedirectResolver;
+use FriendsOfTYPO3\Headless\Utility\Headless;
+use FriendsOfTYPO3\Headless\Utility\HeadlessMode;
 use FriendsOfTYPO3\Headless\Utility\UrlUtility;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -67,7 +69,7 @@ public function testJsonRedirect()
 
         GeneralUtility::setContainer($container);
 
-        $resolver = new SiteBaseRedirectResolver();
+        $resolver = new SiteBaseRedirectResolver(new HeadlessMode());
 
         $request = new ServerRequest();
         $request = $request->withAttribute('site', $site);
@@ -76,6 +78,7 @@ public function testJsonRedirect()
 
         $request = $request->withUri($uri);
         $request = $request->withAttribute('routing', new SiteRouteResult($uri, $site));
+        $request = $request->withAttribute('headless', new Headless(HeadlessMode::FULL));
 
         $response = $resolver->process($request, $this->prophesize(RequestHandler::class)->reveal());