Skip to content

[Security] Support union type for #[CurrentUser] attribute #61204

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

Merged
fabpot merged 1 commit into from
Jul 25, 2025
Merged

[Security] Support union type for #[CurrentUser] attribute #61204

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/Symfony/Component/Security/Http/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
7.4
---

* Add support for union types with `#[CurrentUser]`
* Deprecate callable firewall listeners, extend `AbstractListener` or implement `FirewallListenerInterface` instead
* Deprecate `AbstractListener::__invoke`

Expand Down
7 changes: 7 additions & 0 deletions src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
return [$user];
}

$types = explode('|', $argument->getType());
foreach ($types as $type) {
if ($user instanceof $type) {
return [$user];
}
}

throw new AccessDeniedException(\sprintf('The logged-in user is an instance of "%s" but a user of type "%s" is expected.', $user::class, $argument->getType()));
}
}
14 changes: 14 additions & 0 deletions src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\User\InMemoryUser;
use Symfony\Component\Security\Core\User\OAuth2User;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Http\Attribute\CurrentUser;
use Symfony\Component\Security\Http\Controller\UserValueResolver;
Expand Down Expand Up @@ -109,6 +110,19 @@ public function testResolveSucceedsWithTypedAttribute()
$this->assertSame([$user], $resolver->resolve(Request::create('/'), $metadata));
}

public function testResolveSucceedsWithUnionTypedAttribute()
{
$user = new InMemoryUser('username', 'password');
$token = new UsernamePasswordToken($user, 'provider');
$tokenStorage = new TokenStorage();
$tokenStorage->setToken($token);

$resolver = new UserValueResolver($tokenStorage);
$metadata = new ArgumentMetadata('foo', InMemoryUser::class.'|'.OAuth2User::class, false, false, null, false, [new CurrentUser()]);

$this->assertSame([$user], $resolver->resolve(Request::create('/'), $metadata));
}

public function testResolveThrowsAccessDeniedWithWrongUserClass()
{
$user = $this->createMock(UserInterface::class);
Expand Down
Loading