fix(symfony): graphql security/validator only when enabled

api-platform · Sep 5, 2023 · 7ecfdff · 7ecfdff
1 parent 31b7a61
commit 7ecfdff
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 23 deletions.
diff --git a/src/GraphQl/Tests/Util/ArrayTraitTest.php b/src/GraphQl/Tests/Util/ArrayTraitTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Util;
+namespace ApiPlatform\GraphQl\Tests\Util;
 
 use ApiPlatform\GraphQl\Util\ArrayTrait;
 use PHPUnit\Framework\TestCase;

diff --git a/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
@@ -704,6 +704,10 @@ private function registerValidatorConfiguration(ContainerBuilder $container, arr
             $loader->load('metadata/validator.xml');
             $loader->load('symfony/validator.xml');
 
+            if ($this->isConfigEnabled($container, $config['graphql'])) {
+                $loader->load('graphql/validator.xml');
+            }
+
             $container->registerForAutoconfiguration(ValidationGroupsGeneratorInterface::class)
                 ->addTag('api_platform.validation_groups_generator');
             $container->registerForAutoconfiguration(PropertySchemaRestrictionMetadataInterface::class)
@@ -808,6 +812,10 @@ private function registerSecurityConfiguration(ContainerBuilder $container, arra
 
         $loader->load('security.xml');
         $loader->load('legacy/security.xml');
+
+        if ($this->isConfigEnabled($container, $config['graphql'])) {
+            $loader->load('graphql/security.xml');
+        }
     }
 
     private function registerOpenApiConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader): void

diff --git a/src/Symfony/Bundle/Resources/config/graphql/security.xml b/src/Symfony/Bundle/Resources/config/graphql/security.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="api_platform.graphql.state_provider.access_checker" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.read">
+            <argument type="service" id="api_platform.graphql.state_provider.access_checker.inner" />
+            <argument type="service" id="api_platform.security.resource_access_checker" />
+        </service>
+
+        <service id="api_platform.graphql.state_provider.access_checker.post_deserialize" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.denormalizer">
+            <argument type="service" id="api_platform.graphql.state_provider.access_checker.post_deserialize.inner" />
+            <argument type="service" id="api_platform.security.resource_access_checker" />
+            <argument>post_denormalize</argument>
+        </service>
+
+        <service id="api_platform.graphql.state_provider.access_checker.post_validate" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.validate">
+            <argument type="service" id="api_platform.graphql.state_provider.access_checker.post_validate.inner" />
+            <argument type="service" id="api_platform.security.resource_access_checker" />
+            <argument>post_validate</argument>
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/Resources/config/graphql/validator.xml b/src/Symfony/Bundle/Resources/config/graphql/validator.xml
@@ -0,0 +1,10 @@
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="api_platform.graphql.state_provider.validate" class="ApiPlatform\Symfony\Validator\State\ValidateProvider" decorates="api_platform.graphql.state_provider" decoration-priority="200">
+            <argument type="service" id="api_platform.graphql.state_provider.validate.inner" />
+            <argument type="service" id="api_platform.validator" />
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/Resources/config/security.xml b/src/Symfony/Bundle/Resources/config/security.xml
@@ -33,23 +33,6 @@
             <argument>post_validate</argument>
         </service>
 
-        <service id="api_platform.graphql.state_provider.access_checker" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.read">
-            <argument type="service" id="api_platform.graphql.state_provider.access_checker.inner" />
-            <argument type="service" id="api_platform.security.resource_access_checker" />
-        </service>
-
-        <service id="api_platform.graphql.state_provider.access_checker.post_deserialize" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.denormalizer">
-            <argument type="service" id="api_platform.graphql.state_provider.access_checker.post_deserialize.inner" />
-            <argument type="service" id="api_platform.security.resource_access_checker" />
-            <argument>post_denormalize</argument>
-        </service>
-
-        <service id="api_platform.graphql.state_provider.access_checker.post_validate" class="ApiPlatform\Symfony\Security\State\AccessCheckerProvider" decorates="api_platform.graphql.state_provider.validate">
-            <argument type="service" id="api_platform.graphql.state_provider.access_checker.post_validate.inner" />
-            <argument type="service" id="api_platform.security.resource_access_checker" />
-            <argument>post_validate</argument>
-        </service>
-
         <service id="api_platform.security.expression_language_provider" class="ApiPlatform\Symfony\Security\Core\Authorization\ExpressionLanguageProvider" public="false">
             <tag name="security.expression_language_provider" />
         </service>

diff --git a/src/Symfony/Bundle/Resources/config/symfony/validator.xml b/src/Symfony/Bundle/Resources/config/symfony/validator.xml
@@ -25,11 +25,6 @@
             <argument type="service" id="api_platform.validator" />
         </service>
 
-        <service id="api_platform.graphql.state_provider.validate" class="ApiPlatform\Symfony\Validator\State\ValidateProvider" decorates="api_platform.graphql.state_provider" decoration-priority="200">
-            <argument type="service" id="api_platform.graphql.state_provider.validate.inner" />
-            <argument type="service" id="api_platform.validator" />
-        </service>
-
     </services>
 
 </container>