-
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace default SiteBaseRedirectResolver with headless' one in order to handle proper redirects with headless approach.
- Loading branch information
1 parent
e7c1fe8
commit 188931c
Showing
3 changed files
with
210 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the "headless" Extension for TYPO3 CMS. | ||
* | ||
* For the full copyright and license information, please read the | ||
* LICENSE.md file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace FriendsOfTYPO3\Headless\Middleware; | ||
|
||
use FriendsOfTYPO3\Headless\Utility\UrlUtility; | ||
use Psr\Http\Message\ResponseInterface; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
use Psr\Http\Server\RequestHandlerInterface; | ||
use TYPO3\CMS\Core\Http\JsonResponse; | ||
use TYPO3\CMS\Core\Http\RedirectResponse; | ||
use TYPO3\CMS\Core\Utility\GeneralUtility; | ||
|
||
class SiteBaseRedirectResolver extends \TYPO3\CMS\Frontend\Middleware\SiteBaseRedirectResolver | ||
{ | ||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface | ||
{ | ||
$response = parent::process($request, $handler); | ||
|
||
$site = $request->getAttribute('site'); | ||
$siteConf = $site->getConfiguration(); | ||
|
||
if (!($siteConf['headless'] ?? false)) { | ||
return $response; | ||
} | ||
|
||
if ($response instanceof RedirectResponse) { | ||
$urlUtility = GeneralUtility::makeInstance(UrlUtility::class)->withRequest($request); | ||
return new JsonResponse([ | ||
'redirectUrl' => $urlUtility->prepareRelativeUrlIfPossible( | ||
$urlUtility->getFrontendUrlWithSite( | ||
$response->getHeader('location')[0] ?? '', | ||
$site | ||
) | ||
), | ||
'statusCode' => $response->getStatusCode(), | ||
]); | ||
} | ||
|
||
return $response; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,155 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the "headless" Extension for TYPO3 CMS. | ||
* | ||
* For the full copyright and license information, please read the | ||
* LICENSE.md file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace FriendsOfTYPO3\Headless\Tests\Unit\Middleware; | ||
|
||
use FriendsOfTYPO3\Headless\Middleware\SiteBaseRedirectResolver; | ||
use FriendsOfTYPO3\Headless\Utility\UrlUtility; | ||
use Prophecy\Argument; | ||
use Prophecy\PhpUnit\ProphecyTrait; | ||
use Symfony\Component\DependencyInjection\Container; | ||
use TYPO3\CMS\Core\ExpressionLanguage\Resolver; | ||
use TYPO3\CMS\Core\Http\JsonResponse; | ||
use TYPO3\CMS\Core\Http\ServerRequest; | ||
use TYPO3\CMS\Core\Http\Uri; | ||
use TYPO3\CMS\Core\Routing\SiteRouteResult; | ||
use TYPO3\CMS\Core\Site\Entity\Site; | ||
use TYPO3\CMS\Core\Site\Entity\SiteLanguage; | ||
use TYPO3\CMS\Core\Site\SiteFinder; | ||
use TYPO3\CMS\Core\Utility\GeneralUtility; | ||
use TYPO3\CMS\Frontend\Controller\ErrorController; | ||
use TYPO3\CMS\Frontend\Http\RequestHandler; | ||
use TYPO3\TestingFramework\Core\Unit\UnitTestCase; | ||
|
||
use function json_decode; | ||
|
||
class SiteBaseRedirectResolverTest extends UnitTestCase | ||
{ | ||
use ProphecyTrait; | ||
protected bool $resetSingletonInstances = true; | ||
|
||
public function testJsonRedirect() | ||
{ | ||
$site = new Site('test', 1, [ | ||
'base' => 'https://www.typo3.org', | ||
'headless' => true, | ||
'languages' => [ | ||
[ | ||
'title' => 'English', | ||
'enabled' => true, | ||
'languageId' => 0, | ||
'base' => '/en-us', | ||
'typo3Language' => 'default', | ||
'locale' => 'en_US.UTF-8', | ||
'iso-639-1' => 'en', | ||
'navigationTitle' => 'English', | ||
'hreflang' => 'en-us', | ||
'direction' => 'ltr', | ||
'flag' => 'us', | ||
], | ||
]]); | ||
|
||
$siteFinder = $this->prophesize(SiteFinder::class); | ||
$siteFinder->getSiteByPageId(1)->willReturn($site); | ||
|
||
$container = new Container(); | ||
$urlUtility = GeneralUtility::makeInstance(UrlUtility::class, null, $this->prophesize(Resolver::class)->reveal(), $siteFinder->reveal()); | ||
$container->set(UrlUtility::class, $urlUtility); | ||
|
||
GeneralUtility::setContainer($container); | ||
|
||
$resolver = new SiteBaseRedirectResolver(); | ||
|
||
$request = new ServerRequest(); | ||
$request = $request->withAttribute('site', $site); | ||
|
||
$uri = new Uri('https://www.typo3.org/'); | ||
|
||
$request = $request->withUri($uri); | ||
$request = $request->withAttribute('routing', new SiteRouteResult($uri, $site)); | ||
|
||
$response = $resolver->process($request, $this->prophesize(RequestHandler::class)->reveal()); | ||
|
||
self::assertSame(['redirectUrl' => 'https://www.typo3.org/en-us', 'statusCode' => 307], json_decode($response->getBody()->getContents(), true)); | ||
|
||
// language resolved | ||
$uri = new Uri('https://www.typo3.org/en-us/'); | ||
|
||
$request = $request->withUri($uri); | ||
$request = $request->withAttribute('routing', new SiteRouteResult($uri, $site)); | ||
$request = $request->withAttribute('language', new SiteLanguage(0, 'en', new Uri('/en-us'), ['enabled' => true])); | ||
|
||
$handler = $this->prophesize(RequestHandler::class); | ||
$handler->handle($request)->willReturn(new JsonResponse(['nextMiddleware' => true])); | ||
|
||
$response = $resolver->process($request, $handler->reveal()); | ||
|
||
self::assertSame(['nextMiddleware' => true], json_decode($response->getBody()->getContents(), true)); | ||
|
||
// handle initial data | ||
$uri = new Uri('https://www.typo3.org/en-us/?type=834'); | ||
|
||
$request = $request->withUri($uri); | ||
$request = $request->withAttribute('language', null); | ||
|
||
$handler = $this->prophesize(RequestHandler::class); | ||
$handler->handle($request)->willReturn(new JsonResponse(['nextMiddleware' => true])); | ||
|
||
$response = $resolver->process($request, $handler->reveal()); | ||
|
||
self::assertSame(['redirectUrl' => 'https://www.typo3.org/en-us', 'statusCode' => 307], json_decode($response->getBody()->getContents(), true)); | ||
|
||
// handle non-headless domain | ||
$site = new Site('test', 1, [ | ||
'base' => 'https://www.typo3.org', | ||
'headless' => false, | ||
'languages' => [ | ||
[ | ||
'title' => 'English', | ||
'enabled' => true, | ||
'languageId' => 0, | ||
'base' => '/en-us', | ||
'typo3Language' => 'default', | ||
'locale' => 'en_US.UTF-8', | ||
'iso-639-1' => 'en', | ||
'navigationTitle' => 'English', | ||
'hreflang' => 'en-us', | ||
'direction' => 'ltr', | ||
'flag' => 'us', | ||
], | ||
]]); | ||
|
||
$siteFinder = $this->prophesize(SiteFinder::class); | ||
$siteFinder->getSiteByPageId(1)->willReturn($site); | ||
|
||
$container = new Container(); | ||
$urlUtility = GeneralUtility::makeInstance(UrlUtility::class, null, $this->prophesize(Resolver::class)->reveal(), $siteFinder->reveal()); | ||
$container->set(UrlUtility::class, $urlUtility); | ||
$errorController = $this->prophesize(ErrorController::class); | ||
$errorController->pageNotFoundAction(Argument::any(), Argument::any(), Argument::any())->willReturn(new JsonResponse(['ErrorController' => true])); | ||
|
||
$container->set(ErrorController::class, $errorController->reveal()); | ||
GeneralUtility::setContainer($container); | ||
|
||
$uri = new Uri('https://www.typo3.org/'); | ||
|
||
$request = new ServerRequest(); | ||
$request = $request->withUri($uri); | ||
$request = $request->withAttribute('site', $site); | ||
|
||
$handler = $this->prophesize(RequestHandler::class); | ||
$handler->handle($request)->willReturn(new JsonResponse(['nextMiddleware' => true])); | ||
|
||
$response = $resolver->process($request, $handler->reveal()); | ||
|
||
self::assertSame(['ErrorController' => true], json_decode($response->getBody()->getContents(), true)); | ||
} | ||
} |