Merge remote-tracking branch 'origin/MC-21524-schema' into MC-21694-bucket

Author: cpartica

dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php

@@ -56,6 +56,124 @@ public function testIntrospectionQuery()
         $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
     }
 
+    /**
+     * Tests that Introspection is allowed by default
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectionQueryWithOnlySchema()
+    {
+        $query
+            = <<<QUERY
+ {
+  __schema {
+    queryType { name }
+    types{
+      ...FullType
+    }
+    }
+  }
+fragment FullType on __Type{
+  name
+  kind
+  fields(includeDeprecated:true){
+    name
+    args{
+      ...InputValue
+    }
+         }
+    }
+    
+fragment TypeRef on __Type {
+  kind
+  name
+  ofType{
+    kind
+    name
+  }
+}
+fragment InputValue on __InputValue {
+  name
+  description
+  type { ...TypeRef }
+  defaultValue
+}
+QUERY;
+        $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
+        $response = $this->graphQlQuery($query);
+
+        $query
+            = <<<QUERY
+query IntrospectionQuery {
+  __schema {
+    queryType { name }
+    types{
+      ...FullType
+    }
+    }
+  }
+fragment FullType on __Type{
+  name
+  kind
+  fields(includeDeprecated:true){
+    name
+    args{
+      ...InputValue
+    }
+         }
+    }
+    
+fragment TypeRef on __Type {
+  kind
+  name
+  ofType{
+    kind
+    name
+  }
+}
+fragment InputValue on __InputValue {
+  name
+  description
+  type { ...TypeRef }
+  defaultValue
+}
+QUERY;
+        $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
+        $responseFields = $this->graphQlQuery($query);
+        $this->assertResponseFields($response, $responseFields);
+        $this->assertEquals($responseFields, $response);
+    }
+
+    /**
+     * Tests that Introspection is allowed by default
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectionQueryWithOnlyType()
+    {
+        $query
+            = <<<QUERY
+{
+  __type(name:"Query")
+    {
+    name
+      kind
+    fields(includeDeprecated:true){
+      name
+      type{
+        kind
+        name
+      }
+      description
+      isDeprecated
+      deprecationReason
+    }
+  }
+} 
+QUERY;
+        $this->assertArrayHasKey('__type', $this->graphQlQuery($query));
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['__type']['fields']);
+    }
+
     /**
      * Tests that Introspection Query with deprecated annotations on enum values, fields are read.
      */

lib/internal/Magento/Framework/GraphQl/Query/Fields.php

@@ -46,10 +46,12 @@ public function setQuery($query, array $variables = null)
             if (isset($variables)) {
                 $queryFields = array_merge($queryFields, $this->extractVariables($variables));
             }
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Exception $e) {
             // If a syntax error is encountered do not collect fields
         }
-        if (isset($queryFields['IntrospectionQuery'])) {
+        if (isset($queryFields['IntrospectionQuery']) || (isset($queryFields['__schema'])) ||
+            (isset($queryFields['__type']))) {
             // It must be possible to query any fields during introspection query
             $queryFields = [];
         }
@@ -80,6 +82,7 @@ private function extractVariables(array $variables): array
         $fields = [];
         foreach ($variables as $key => $value) {
             if (is_array($value)) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $fields = array_merge($fields, $this->extractVariables($value));
             }
             $fields[$key] = $key;