bug #48385 [Security] Reuse AbstractFactory's config tree in AccessTokenFactory (chalasr)

welcoMattic · welcoMattic · commit 6f762ef40810 · 2022-11-30T14:53:04.000+01:00
This PR was merged into the 6.2 branch. Discussion ---------- [Security] Reuse `AbstractFactory`'s config tree in `AccessTokenFactory` | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Avoids duplicating options, removing the extra `user_provider` option which is available as `provider` for all authenticator factories extending the abstract one. Last-time 6.2 adjustment, otherwise we'll have to deprecate in 6.3. Commits ------- 31f05a4 [Security] Reuse `AbstractFactory`'s config tree in `AccessTokenFactory`
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -36,14 +36,12 @@ public function __construct()
 
     public function addConfiguration(NodeDefinition $node): void
     {
-        $builder = $node->children();
+        parent::addConfiguration($node);
 
+        $builder = $node->children();
         $builder
             ->scalarNode('token_handler')->isRequired()->end()
-            ->scalarNode('user_provider')->defaultNull()->end()
             ->scalarNode('realm')->defaultNull()->end()
-            ->scalarNode('success_handler')->defaultNull()->end()
-            ->scalarNode('failure_handler')->defaultNull()->end()
             ->arrayNode('token_extractors')
                 ->fixXmlConfig('token_extractors')
                 ->beforeNormalization()
@@ -71,7 +69,6 @@ public function getKey(): string
 
     public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
     {
-        $userProvider = new Reference($config['user_provider'] ?? $userProviderId);
         $successHandler = isset($config['success_handler']) ? new Reference($this->createAuthenticationSuccessHandler($container, $firewallName, $config)) : null;
         $failureHandler = isset($config['failure_handler']) ? new Reference($this->createAuthenticationFailureHandler($container, $firewallName, $config)) : null;
         $authenticatorId = sprintf('security.authenticator.access_token.%s', $firewallName);
@@ -81,7 +78,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             ->setDefinition($authenticatorId, new ChildDefinition('security.authenticator.access_token'))
             ->replaceArgument(0, new Reference($config['token_handler']))
             ->replaceArgument(1, new Reference($extractorId))
-            ->replaceArgument(2, $userProvider)
+            ->replaceArgument(2, new Reference($userProviderId))
             ->replaceArgument(3, $successHandler)
             ->replaceArgument(4, $failureHandler)
             ->replaceArgument(5, $config['realm'])
