Skip to content

Commit ad24f74

Browse files
committed
Refactor: Simplify login redirect URL generation in ExceptionListener
1 parent 7c277d2 commit ad24f74

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/CoreBundle/EventListener/ExceptionListener.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@ public function __invoke(ExceptionEvent $event): void
3636

3737
if ($exception instanceof NotAllowedException) {
3838
if (null === $this->tokenStorage->getToken()) {
39-
$currentUrl = $request->getUri();
40-
$parsedUrl = parse_url($currentUrl);
41-
$baseUrl = $parsedUrl['scheme'].'://'.$parsedUrl['host'];
42-
$path = rtrim($parsedUrl['path'], '/') ?: '';
43-
$query = $parsedUrl['query'] ?? '';
44-
$redirectUrl = $baseUrl.$path.($query ? '?'.$query : '');
45-
46-
$loginUrl = $this->router->generate('login', ['redirect' => $redirectUrl], UrlGeneratorInterface::ABSOLUTE_URL);
39+
$loginUrl = $this->router->generate(
40+
'login',
41+
['redirect' => $request->getRequestUri()],
42+
UrlGeneratorInterface::ABSOLUTE_URL
43+
);
4744
$event->setResponse(new RedirectResponse($loginUrl));
4845

4946
return;

0 commit comments

Comments
 (0)