Fix API Platform integration

lexik · Feb 21, 2023 · 36d4aea · 36d4aea
1 parent 0609638
commit 36d4aea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -2,6 +2,7 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\DependencyInjection;
 
+use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
 use Symfony\Component\Config\Definition\BaseNode;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -116,6 +117,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
                 ->arrayNode('api_platform')
+                    ->canBeEnabled()
                     ->info('API Platform compatibility: add check_path in OpenAPI documentation.')
                     ->children()
                         ->scalarNode('check_path')

diff --git a/DependencyInjection/LexikJWTAuthenticationExtension.php b/DependencyInjection/LexikJWTAuthenticationExtension.php
@@ -99,7 +99,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('lexik_jwt_authentication.encoder.signature_algorithm', $encoderConfig['signature_algorithm']);
         $container->setParameter('lexik_jwt_authentication.encoder.crypto_engine', $encoderConfig['crypto_engine']);
 
-        $tokenExtractors = self::createTokenExtractors($container, $config['token_extractors']);
+        $tokenExtractors = $this->createTokenExtractors($container, $config['token_extractors']);
         $container
             ->getDefinition('lexik_jwt_authentication.extractor.chain_extractor')
             ->replaceArgument(0, $tokenExtractors);
@@ -144,11 +144,11 @@ public function load(array $configs, ContainerBuilder $container)
                 ->replaceArgument(4, $encoderConfig['signature_algorithm']);
         }
 
-        if (!class_exists(ApiPlatformBundle::class) && (isset($config['api_platform']['check_path']) || isset($config['api_platform']['username_path']) || isset($config['api_platform']['password_path']))) {
-            throw new LogicException('API Platform cannot be detected. Try running "composer require api-platform/core".');
-        }
+        if ($this->isConfigEnabled($container, $config['api_platform'])) {
+            if (!class_exists(ApiPlatformBundle::class)) {
+                throw new LogicException('API Platform cannot be detected. Try running "composer require api-platform/core".');
+            }
 
-        if (class_exists(ApiPlatformBundle::class)) {
             $loader->load('api_platform.xml');
 
             $container
@@ -159,11 +159,11 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    private static function createTokenExtractors(ContainerBuilder $container, array $tokenExtractorsConfig)
+    private function createTokenExtractors(ContainerBuilder $container, array $tokenExtractorsConfig): array
     {
         $map = [];
 
-        if ($tokenExtractorsConfig['authorization_header']['enabled']) {
+        if ($this->isConfigEnabled($container, $tokenExtractorsConfig['authorization_header'])) {
             $authorizationHeaderExtractorId = 'lexik_jwt_authentication.extractor.authorization_header_extractor';
             $container
                 ->getDefinition($authorizationHeaderExtractorId)
@@ -173,7 +173,7 @@ private static function createTokenExtractors(ContainerBuilder $container, array
             $map[] = new Reference($authorizationHeaderExtractorId);
         }
 
-        if ($tokenExtractorsConfig['query_parameter']['enabled']) {
+        if ($this->isConfigEnabled($container, $tokenExtractorsConfig['query_parameter'])) {
             $queryParameterExtractorId = 'lexik_jwt_authentication.extractor.query_parameter_extractor';
             $container
                 ->getDefinition($queryParameterExtractorId)
@@ -182,7 +182,7 @@ private static function createTokenExtractors(ContainerBuilder $container, array
             $map[] = new Reference($queryParameterExtractorId);
         }
 
-        if ($tokenExtractorsConfig['cookie']['enabled']) {
+        if ($this->isConfigEnabled($container, $tokenExtractorsConfig['cookie'])) {
             $cookieExtractorId = 'lexik_jwt_authentication.extractor.cookie_extractor';
             $container
                 ->getDefinition($cookieExtractorId)
@@ -191,7 +191,7 @@ private static function createTokenExtractors(ContainerBuilder $container, array
             $map[] = new Reference($cookieExtractorId);
         }
 
-        if ($tokenExtractorsConfig['split_cookie']['enabled']) {
+        if ($this->isConfigEnabled($container, $tokenExtractorsConfig['split_cookie'])) {
             $cookieExtractorId = 'lexik_jwt_authentication.extractor.split_cookie_extractor';
             $container
                 ->getDefinition($cookieExtractorId)