diff --git a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php index dde7afa1..5e7d6498 100644 --- a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php +++ b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php @@ -37,8 +37,12 @@ class BackendUserHandler implements \TYPO3\CMS\Core\SingletonInterface, Middlewa { public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - /** @var InternalRequestContext $internalRequestContext */ $internalRequestContext = $request->getAttribute('typo3.testing.context'); + if (!$internalRequestContext instanceof InternalRequestContext) { + // Skip requests not dispatched by executeFrontendSubRequest(), e.g. a sub-request + // an extension builds itself: they carry no user to log in. + return $handler->handle($request); + } $backendUserId = $internalRequestContext->getBackendUserId(); $workspaceId = $internalRequestContext->getWorkspaceId(); diff --git a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/FrontendUserHandler.php b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/FrontendUserHandler.php index b95a0015..ef3acb2b 100644 --- a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/FrontendUserHandler.php +++ b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/FrontendUserHandler.php @@ -37,8 +37,12 @@ class FrontendUserHandler implements MiddlewareInterface { public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { - /** @var InternalRequestContext $internalRequestContext */ $internalRequestContext = $request->getAttribute('typo3.testing.context'); + if (!$internalRequestContext instanceof InternalRequestContext) { + // Skip requests not dispatched by executeFrontendSubRequest(), e.g. a sub-request + // an extension builds itself: they carry no user to log in. + return $handler->handle($request); + } $frontendUserId = $internalRequestContext->getFrontendUserId(); if ($frontendUserId === null) { diff --git a/Tests/Unit/JsonResponse/Middleware/UserHandlerWithoutTestingContextTest.php b/Tests/Unit/JsonResponse/Middleware/UserHandlerWithoutTestingContextTest.php new file mode 100644 index 00000000..f71137e1 --- /dev/null +++ b/Tests/Unit/JsonResponse/Middleware/UserHandlerWithoutTestingContextTest.php @@ -0,0 +1,73 @@ + [ + 'middleware' => new FrontendUserHandler(), + ]; + yield 'backend user handler' => [ + 'middleware' => new BackendUserHandler(), + ]; + } + + /** + * A frontend request may reach the middleware stack without passing + * FunctionalTestCase::executeFrontendSubRequest(), e.g. a sub-request + * an extension builds and dispatches itself, so it carries no + * typo3.testing.context attribute. + */ + #[Test] + #[DataProvider('userHandlerDataProvider')] + public function requestWithoutTestingContextIsPassedOn(MiddlewareInterface $middleware): void + { + $request = new ServerRequest('https://website.local/', 'GET'); + $expectedResponse = new Response(); + $handler = new class ($expectedResponse) implements RequestHandlerInterface { + public ?ServerRequestInterface $handledRequest = null; + + public function __construct(private readonly ResponseInterface $response) {} + + public function handle(ServerRequestInterface $request): ResponseInterface + { + $this->handledRequest = $request; + return $this->response; + } + }; + + $response = $middleware->process($request, $handler); + + self::assertSame($expectedResponse, $response); + self::assertSame($request, $handler->handledRequest); + } +}