Merge pull request #13 from roippi/nested_variable_fix

validate query arguments while processing AST
youshido-php · Jul 13, 2016 · c79eb70 · c79eb70
2 parents a948211 + 28bef5e
commit c79eb70
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 1 deletion.
diff --git a/Tests/DataProvider/TestObjectType.php b/Tests/DataProvider/TestObjectType.php
@@ -12,6 +12,7 @@
 use Youshido\GraphQL\Type\Object\ObjectType;
 use Youshido\GraphQL\Type\Scalar\IntType;
 use Youshido\GraphQL\Type\Scalar\StringType;
+use Youshido\GraphQL\Type\NonNullType;
 
 class TestObjectType extends AbstractObjectType
 {
@@ -27,7 +28,35 @@ public function build($config)
                     'country' => new StringType(),
                     'city'    => new StringType()
                 ],
-            ]));
+            ]))
+            ->addField('location', [
+                 'type'    => new ObjectType(
+                     [
+                         'name'   => 'Location',
+                         'fields' => [
+                             'address'    => new StringType()
+                         ]
+                     ]
+                 ),
+                 'args'    => [
+                     'noop' => new IntType()
+                 ],
+                 'resolve' => function ($value, $args, $info) {
+                   return ['address' => '1234 Street'];
+                 }
+             ]
+            )
+            ->addField(
+                'echo', [
+                    'type'    => new StringType(),
+                    'args'    => [
+                        'value' => new NonNullType(new StringType())
+                    ],
+                    'resolve' => function ($value, $args, $info) {
+                        return $args['value'];
+                    }
+                ]
+            );
     }
 
     public function getInterfaces()

diff --git a/Tests/DataProvider/TestSchema.php b/Tests/DataProvider/TestSchema.php
@@ -12,6 +12,9 @@
 use Youshido\GraphQL\Config\Schema\SchemaConfig;
 use Youshido\GraphQL\Execution\ResolveInfo;
 use Youshido\GraphQL\Schema\AbstractSchema;
+use Youshido\GraphQL\Type\NonNullType;
+use Youshido\GraphQL\Type\Scalar\IntType;
+use Youshido\GraphQL\Type\Scalar\StringType;
 
 class TestSchema extends AbstractSchema
 {

diff --git a/Tests/Schema/ProcessorTest.php b/Tests/Schema/ProcessorTest.php
@@ -55,6 +55,34 @@ public function testEmptyQueries()
 
     }
 
+  public function testNestedVariables() {
+    $processor = new Processor(new TestSchema());
+    $noArgsQuery = '{ me { echo(value:"foo") } }';
+    $expectedData = ['data' => ['me' => ['echo' => 'foo']]];
+    $processor->processPayload($noArgsQuery, ['value' => 'foo']);
+    $this->assertEquals($expectedData, $processor->getResponseData());
+
+    $parameterizedFieldQuery =
+        'query nestedFieldQuery($value:String!){
+          me {
+            echo(value:$value)
+          }
+        }';
+    $processor->processPayload($parameterizedFieldQuery, ['value' => 'foo']);
+    $this->assertEquals($expectedData, $processor->getResponseData());
+
+    $parameterizedQueryQuery =
+        'query nestedQueryQuery($value:Int){
+          me {
+            location(noop:$value) {
+              address
+            }
+          }
+        }';
+    $processor->processPayload($parameterizedQueryQuery, ['value' => 1]);
+    $this->assertArrayNotHasKey('errors', $processor->getResponseData());
+  }
+
     public function testListNullResponse()
     {
         $processor = new Processor(new Schema([

diff --git a/src/Execution/Processor.php b/src/Execution/Processor.php
@@ -126,6 +126,10 @@ protected function executeOperation(Query $query, $currentLevelSchema)
      */
     protected function processQueryAST(Query $query, AbstractField $field, $contextValue = null)
     {
+        if (!$this->resolveValidator->validateArguments($field, $query, $this->executionContext->getRequest())) {
+            return null;
+        }
+
         $resolvedValue = $this->resolveFieldValue($field, $contextValue, $query);
 
         if (!$this->resolveValidator->isValidValueForField($field, $resolvedValue)) {