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.

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

IBX-5705: Use SecurityPass to define Guard authentication provider #265

Merged
merged 1 commit into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/bundle/Core/DependencyInjection/Compiler/SecurityPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Ibexa\Contracts\Core\Repository\UserService;
use Ibexa\Core\MVC\Symfony\Security\Authentication\AnonymousAuthenticationProvider;
use Ibexa\Core\MVC\Symfony\Security\Authentication\DefaultAuthenticationSuccessHandler;
use Ibexa\Core\MVC\Symfony\Security\Authentication\GuardRepositoryAuthenticationProvider;
use Ibexa\Core\MVC\Symfony\Security\Authentication\RememberMeRepositoryAuthenticationProvider;
use Ibexa\Core\MVC\Symfony\Security\Authentication\RepositoryAuthenticationProvider;
use Ibexa\Core\MVC\Symfony\Security\HttpUtils;
Expand All @@ -32,6 +33,7 @@ public function process(ContainerBuilder $container)
{
if (!($container->hasDefinition('security.authentication.provider.dao') &&
$container->hasDefinition('security.authentication.provider.rememberme') &&
$container->hasDefinition('security.authentication.provider.guard') &&
$container->hasDefinition('security.authentication.provider.anonymous'))) {
return;
}
Expand Down Expand Up @@ -73,6 +75,13 @@ public function process(ContainerBuilder $container)
[$permissionResolverRef]
);

$guardAuthenticationProviderDef = $container->findDefinition('security.authentication.provider.guard');
$guardAuthenticationProviderDef->setClass(GuardRepositoryAuthenticationProvider::class);
$guardAuthenticationProviderDef->addMethodCall(
'setPermissionResolver',
[$permissionResolverRef]
);

$anonymousAuthenticationProviderDef = $container->findDefinition('security.authentication.provider.anonymous');
$anonymousAuthenticationProviderDef->setClass(AnonymousAuthenticationProvider::class);
$anonymousAuthenticationProviderDef->addMethodCall(
Expand Down
5 changes: 0 additions & 5 deletions src/bundle/Core/Resources/config/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ services:
tags:
- { name: kernel.event_subscriber }

Ibexa\Core\MVC\Symfony\Security\Authentication\GuardRepositoryAuthenticationProvider:
decorates: security.authentication.provider.guard
calls:
- ['setPermissionResolver', ['@Ibexa\Contracts\Core\Repository\PermissionResolver']]

ibexa.security.user_provider: '@Ibexa\Core\MVC\Symfony\Security\User\UsernameProvider'
ibexa.security.user_provider.username: '@Ibexa\Core\MVC\Symfony\Security\User\UsernameProvider'
ibexa.security.user_provider.email: '@Ibexa\Core\MVC\Symfony\Security\User\EmailProvider'
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ protected function setUp(): void
parent::setUp();
$this->setDefinition('security.authentication.provider.dao', new Definition());
$this->setDefinition('security.authentication.provider.rememberme', new Definition());
$this->setDefinition('security.authentication.provider.guard', new Definition());
$this->setDefinition('security.authentication.provider.anonymous', new Definition());
$this->setDefinition('security.http_utils', new Definition());
$this->setDefinition('security.authentication.success_handler', new Definition());
Expand Down Expand Up @@ -54,6 +55,11 @@ public function testAlteredDaoAuthenticationProvider()
'setPermissionResolver',
[new Reference(PermissionResolver::class)]
);
$this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
'security.authentication.provider.guard',
'setPermissionResolver',
[new Reference(PermissionResolver::class)]
);
$this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
'security.authentication.provider.anonymous',
'setPermissionResolver',
Expand Down
Loading