Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Allow headless.redirectMiddlewares feature without EXT:redirects #809

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BUGFIX] Allow headless.redirectMiddlewares feature without EXT:redirects #809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions Configuration/RequestMiddlewares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use FriendsOfTYPO3\Headless\Middleware\SiteBaseRedirectResolver;
use FriendsOfTYPO3\Headless\Middleware\UserIntMiddleware;
use TYPO3\CMS\Core\Configuration\Features;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;

return (static function (): array {
Expand Down Expand Up @@ -61,26 +62,14 @@
return $middlewares;
}

return array_merge_recursive($middlewares, [
$middlewares = array_merge_recursive($middlewares, [
'frontend' => [
'typo3/cms-redirects/redirecthandler' => [
'disabled' => true,
],
'typo3/cms-frontend/shortcut-and-mountpoint-redirect' => [
'disabled' => true,
],
'typo3/cms-frontend/base-redirect-resolver' => [
'target' => SiteBaseRedirectResolver::class,
],
'headless/cms-redirects/redirecthandler' => [
'target' => RedirectHandler::class,
'before' => [
'typo3/cms-frontend/base-redirect-resolver',
],
'after' => [
'typo3/cms-frontend/authentication',
],
],
'headless/cms-frontend/shortcut-and-mountpoint-redirect' => [
'target' => ShortcutAndMountPointRedirect::class,
'after' => [
Expand All @@ -92,4 +81,25 @@
],
],
]);

if (!ExtensionManagementUtility::isLoaded('redirects')) {
return $middlewares;
}

return array_merge_recursive($middlewares, [
'frontend' => [
'typo3/cms-redirects/redirecthandler' => [
'disabled' => true,
],
'headless/cms-redirects/redirecthandler' => [
'target' => RedirectHandler::class,
'before' => [
'typo3/cms-frontend/base-redirect-resolver',
],
'after' => [
'typo3/cms-frontend/authentication',
],
],
],
]);
})();
Loading