bug #58 Fix authenticator registration with multiple user providers (…

…chalasr) This PR was merged into the 0.1-dev branch. Discussion ---------- Fix authenticator registration with multiple user providers Fixes #41 Commits ------- 92eec1c Fix authenticator registration with multiple user providers
thephpleague · Nov 2, 2021 · c5ecd8d · c5ecd8d
2 parents d9e7d7f + 92eec1c
commit c5ecd8d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/DependencyInjection/Security/OAuth2Factory.php b/src/DependencyInjection/Security/OAuth2Factory.php
@@ -10,6 +10,7 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * @author Mathias Arlaud <[email protected]>
@@ -21,10 +22,14 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         throw new \LogicException('OAuth2 is not supported when "security.enable_authenticator_manager" is not set to true.');
     }
 
-    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProvider): string
+    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
     {
         $authenticator = sprintf('security.authenticator.oauth2.%s', $firewallName);
-        $container->setDefinition($authenticator, new ChildDefinition(OAuth2Authenticator::class));
+
+        $definition = new ChildDefinition(OAuth2Authenticator::class);
+        $definition->replaceArgument(2, new Reference($userProviderId));
+
+        $container->setDefinition($authenticator, $definition);
 
         return $authenticator;
     }

diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use function Symfony\Component\DependencyInjection\Loader\Configurator\abstract_arg;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
@@ -55,7 +56,6 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
@@ -118,8 +118,8 @@
             ->args([
                 service('league.oauth2_server.factory.psr_http'),
                 service(ResourceServer::class),
-                service(UserProviderInterface::class),
-                null,
+                abstract_arg('User Provider'),
+                abstract_arg('Role prefix'),
             ])
         ->alias(OAuth2Authenticator::class, 'league.oauth2_server.authenticator.oauth2')
 

diff --git a/tests/TestKernel.php b/tests/TestKernel.php
@@ -108,6 +108,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 'enable_authenticator_manager' => true,
                 'firewalls' => [
                     'test' => [
+                        'provider' => 'in_memory',
                         'pattern' => '^/security-test',
                         'stateless' => true,
                         'oauth2' => true,
@@ -123,6 +124,15 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                             ],
                         ],
                     ],
+                    'another_provider' => [
+                        'memory' => [
+                            'users' => [
+                                FixtureFactory::FIXTURE_USER => [
+                                    'roles' => ['ROLE_USER'],
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ]);