From 31f05a49b52cf0c5fb2da7eff801eef90b3b95ef Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Tue, 29 Nov 2022 12:08:41 +0100 Subject: [PATCH] [Security] Reuse `AbstractFactory`'s config tree in `AccessTokenFactory` --- .../Security/Factory/AccessTokenFactory.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php index b59f7974f1e87..2fbf3b2f8b567 100644 --- 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'])