Fix 2nd step introspection (#5451)

Author: BoD

libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo3/tooling/SchemaHelper.kt

@@ -6,6 +6,8 @@ import com.apollographql.apollo3.api.http.HttpBody
 import com.apollographql.apollo3.api.http.HttpHeader
 import com.apollographql.apollo3.api.http.HttpMethod
 import com.apollographql.apollo3.api.http.HttpRequest
+import com.apollographql.apollo3.api.json.buildJsonString
+import com.apollographql.apollo3.api.json.writeObject
 import com.apollographql.apollo3.ast.GQLArgument
 import com.apollographql.apollo3.ast.GQLBooleanValue
 import com.apollographql.apollo3.ast.GQLDefinition
@@ -99,7 +101,13 @@ internal object SchemaHelper {
       headers: Map<String, String>,
       insecure: Boolean,
   ): String {
-    return fetch(ByteStringHttpBody("application/json", introspectionQuery), endpoint, headers, insecure)
+    val jsonBody = buildJsonString {
+      writeObject {
+        name("operationName").value("IntrospectionQuery")
+        name("query").value(introspectionQuery)
+      }
+    }
+    return fetch(ByteStringHttpBody("application/json", jsonBody), endpoint, headers, insecure)
   }
 
   internal fun List<GQLDefinition>.reworkIntrospectionQuery(features: Set<GraphQLFeature>) =

libraries/apollo-tooling/src/test/fixtures/introspection-request-draft.json

@@ -0,0 +1 @@
+{"operationName":"IntrospectionQuery","query":"query IntrospectionQuery {\n  __schema {\n    queryType {\n      name\n    }\n    mutationType {\n      name\n    }\n    subscriptionType {\n      name\n    }\n    types {\n      ...FullType\n    }\n    directives {\n      name\n      description\n      locations\n      args(includeDeprecated: true) {\n        ...InputValue\n      }\n      isRepeatable\n    }\n    description\n  }\n}\n\nfragment FullType on __Type {\n  kind\n  name\n  description\n  fields(includeDeprecated: true) {\n    name\n    description\n    args(includeDeprecated: true) {\n      ...InputValue\n    }\n    type {\n      ...TypeRef\n    }\n    isDeprecated\n    deprecationReason\n  }\n  inputFields(includeDeprecated: true) {\n    ...InputValue\n  }\n  interfaces {\n    ...TypeRef\n  }\n  enumValues(includeDeprecated: true) {\n    name\n    description\n    isDeprecated\n    deprecationReason\n  }\n  possibleTypes {\n    ...TypeRef\n  }\n  specifiedByURL\n}\n\nfragment InputValue on __InputValue {\n  name\n  description\n  type {\n    ...TypeRef\n  }\n  defaultValue\n  isDeprecated\n  deprecationReason\n}\n\nfragment TypeRef on __Type {\n  kind\n  name\n  ofType {\n    kind\n    name\n    ofType {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"}

libraries/apollo-tooling/src/test/fixtures/introspection-request-june2018.json

@@ -0,0 +1 @@
+{"operationName":"IntrospectionQuery","query":"query IntrospectionQuery {\n  __schema {\n    queryType {\n      name\n    }\n    mutationType {\n      name\n    }\n    subscriptionType {\n      name\n    }\n    types {\n      ...FullType\n    }\n    directives {\n      name\n      description\n      locations\n      args {\n        ...InputValue\n      }\n    }\n  }\n}\n\nfragment FullType on __Type {\n  kind\n  name\n  description\n  fields(includeDeprecated: true) {\n    name\n    description\n    args {\n      ...InputValue\n    }\n    type {\n      ...TypeRef\n    }\n    isDeprecated\n    deprecationReason\n  }\n  inputFields {\n    ...InputValue\n  }\n  interfaces {\n    ...TypeRef\n  }\n  enumValues(includeDeprecated: true) {\n    name\n    description\n    isDeprecated\n    deprecationReason\n  }\n  possibleTypes {\n    ...TypeRef\n  }\n}\n\nfragment InputValue on __InputValue {\n  name\n  description\n  type {\n    ...TypeRef\n  }\n  defaultValue\n}\n\nfragment TypeRef on __Type {\n  kind\n  name\n  ofType {\n    kind\n    name\n    ofType {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"}

libraries/apollo-tooling/src/test/fixtures/introspection-request-october2021.json

@@ -0,0 +1 @@
+{"operationName":"IntrospectionQuery","query":"query IntrospectionQuery {\n  __schema {\n    queryType {\n      name\n    }\n    mutationType {\n      name\n    }\n    subscriptionType {\n      name\n    }\n    types {\n      ...FullType\n    }\n    directives {\n      name\n      description\n      locations\n      args {\n        ...InputValue\n      }\n      isRepeatable\n    }\n    description\n  }\n}\n\nfragment FullType on __Type {\n  kind\n  name\n  description\n  fields(includeDeprecated: true) {\n    name\n    description\n    args {\n      ...InputValue\n    }\n    type {\n      ...TypeRef\n    }\n    isDeprecated\n    deprecationReason\n  }\n  inputFields {\n    ...InputValue\n  }\n  interfaces {\n    ...TypeRef\n  }\n  enumValues(includeDeprecated: true) {\n    name\n    description\n    isDeprecated\n    deprecationReason\n  }\n  possibleTypes {\n    ...TypeRef\n  }\n  specifiedByURL\n}\n\nfragment InputValue on __InputValue {\n  name\n  description\n  type {\n    ...TypeRef\n  }\n  defaultValue\n}\n\nfragment TypeRef on __Type {\n  kind\n  name\n  ofType {\n    kind\n    name\n    ofType {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"}

libraries/apollo-tooling/src/test/fixtures/introspection-request-oneOf.json

@@ -0,0 +1 @@
+{"operationName":"IntrospectionQuery","query":"query IntrospectionQuery {\n  __schema {\n    queryType {\n      name\n    }\n    mutationType {\n      name\n    }\n    subscriptionType {\n      name\n    }\n    types {\n      ...FullType\n    }\n    directives {\n      name\n      description\n      locations\n      args(includeDeprecated: true) {\n        ...InputValue\n      }\n      isRepeatable\n    }\n    description\n  }\n}\n\nfragment FullType on __Type {\n  kind\n  name\n  description\n  fields(includeDeprecated: true) {\n    name\n    description\n    args(includeDeprecated: true) {\n      ...InputValue\n    }\n    type {\n      ...TypeRef\n    }\n    isDeprecated\n    deprecationReason\n  }\n  inputFields(includeDeprecated: true) {\n    ...InputValue\n  }\n  interfaces {\n    ...TypeRef\n  }\n  enumValues(includeDeprecated: true) {\n    name\n    description\n    isDeprecated\n    deprecationReason\n  }\n  possibleTypes {\n    ...TypeRef\n  }\n  specifiedByURL\n  isOneOf\n}\n\nfragment InputValue on __InputValue {\n  name\n  description\n  type {\n    ...TypeRef\n  }\n  defaultValue\n  isDeprecated\n  deprecationReason\n}\n\nfragment TypeRef on __Type {\n  kind\n  name\n  ofType {\n    kind\n    name\n    ofType {\n      kind\n      name\n      ofType {\n        kind\n        name\n        ofType {\n          kind\n          name\n          ofType {\n            kind\n            name\n            ofType {\n              kind\n              name\n              ofType {\n                kind\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"}

libraries/apollo-tooling/src/test/kotlin/com/apollographql/apollo3/tooling/SchemaDownloaderTests.kt

@@ -5,18 +5,20 @@ import com.apollographql.apollo3.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
 import com.apollographql.apollo3.testing.pathToUtf8
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
 import org.junit.Test
 import java.io.File
 
 private val preIntrospectionResponseJune2018 = pathToUtf8("apollo-tooling/src/test/fixtures/pre-introspection-response-june2018.json")
+private val introspectionRequestJune2018 = pathToUtf8("apollo-tooling/src/test/fixtures/introspection-request-june2018.json")
 
 private val preIntrospectionResponseOctober2021 = pathToUtf8("apollo-tooling/src/test/fixtures/pre-introspection-response-october2021.json")
+private val introspectionRequestOctober2021 = pathToUtf8("apollo-tooling/src/test/fixtures/introspection-request-october2021.json")
 
 private val preIntrospectionResponseDraft = pathToUtf8("apollo-tooling/src/test/fixtures/pre-introspection-response-draft.json")
+private val introspectionRequestDraft = pathToUtf8("apollo-tooling/src/test/fixtures/introspection-request-draft.json")
 
 private val preIntrospectionResponseOneOf = pathToUtf8("apollo-tooling/src/test/fixtures/pre-introspection-response-oneOf.json")
+private val introspectionRequestOneOf = pathToUtf8("apollo-tooling/src/test/fixtures/introspection-request-oneOf.json")
 
 private val introspectionResponse = pathToUtf8("apollo-tooling/src/test/fixtures/introspection-response.json")
 
@@ -48,17 +50,8 @@ class SchemaDownloaderTests {
     )
 
     mockServer.takeRequest()
-    mockServer.takeRequest().body.utf8().let {
-      assertFalse(it.contains(Regex("}\\s+description\\s+}\\s+}")))
-      assertFalse(it.contains("specifiedByURL"))
-      assertFalse(it.contains("isRepeatable"))
-      assertFalse(it.contains("inputFields(includeDeprecated: true)"))
-      assertFalse(it.contains(Regex("directives\\s+\\{\\s+name\\s+description\\s+locations\\s+args\\(includeDeprecated: true\\)")))
-      assertFalse(it.contains(Regex("fields\\(includeDeprecated: true\\)\\s+\\{\\s+name\\s+description\\s+args\\(includeDeprecated: true\\)")))
-      assertFalse(it.substringAfter("fragment InputValue on __InputValue {").contains("isDeprecated"))
-      assertFalse(it.substringAfter("fragment InputValue on __InputValue {").contains("deprecationReason"))
-      assertFalse(it.contains("isOneOf"))
-    }
+    val introspectionRequest = mockServer.takeRequest().body.utf8()
+    assertEquals(introspectionRequestJune2018, introspectionRequest)
     assertEquals(introspectionResponse, tempFile.readText())
   }
 
@@ -76,17 +69,8 @@ class SchemaDownloaderTests {
     )
 
     mockServer.takeRequest()
-    mockServer.takeRequest().body.utf8().let {
-      assertTrue(it.contains(Regex("}\\s+description\\s+}\\s+}")))
-      assertTrue(it.contains("specifiedByURL"))
-      assertTrue(it.contains("isRepeatable"))
-      assertFalse(it.contains("inputFields(includeDeprecated: true)"))
-      assertFalse(it.contains(Regex("directives\\s+\\{\\s+name\\s+description\\s+locations\\s+args\\(includeDeprecated: true\\)")))
-      assertFalse(it.contains(Regex("fields\\(includeDeprecated: true\\)\\s+\\{\\s+name\\s+description\\s+args\\(includeDeprecated: true\\)")))
-      assertFalse(it.substringAfter("fragment InputValue on __InputValue {").contains("isDeprecated"))
-      assertFalse(it.substringAfter("fragment InputValue on __InputValue {").contains("deprecationReason"))
-      assertFalse(it.contains("isOneOf"))
-    }
+    val introspectionRequest = mockServer.takeRequest().body.utf8()
+    assertEquals(introspectionRequestOctober2021, introspectionRequest)
     assertEquals(introspectionResponse, tempFile.readText())
   }
 
@@ -104,17 +88,8 @@ class SchemaDownloaderTests {
     )
 
     mockServer.takeRequest()
-    mockServer.takeRequest().body.utf8().let {
-      assertTrue(it.contains(Regex("}\\s+description\\s+}\\s+}")))
-      assertTrue(it.contains("specifiedByURL"))
-      assertTrue(it.contains("isRepeatable"))
-      assertTrue(it.contains("inputFields(includeDeprecated: true)"))
-      assertTrue(it.contains(Regex("directives\\s+\\{\\s+name\\s+description\\s+locations\\s+args\\(includeDeprecated: true\\)")))
-      assertTrue(it.contains(Regex("fields\\(includeDeprecated: true\\)\\s+\\{\\s+name\\s+description\\s+args\\(includeDeprecated: true\\)")))
-      assertTrue(it.substringAfter("fragment InputValue on __InputValue {").contains("isDeprecated"))
-      assertTrue(it.substringAfter("fragment InputValue on __InputValue {").contains("deprecationReason"))
-      assertFalse(it.contains("isOneOf"))
-    }
+    val introspectionRequest = mockServer.takeRequest().body.utf8()
+    assertEquals(introspectionRequestDraft, introspectionRequest)
     assertEquals(introspectionResponse, tempFile.readText())
   }
 
@@ -132,17 +107,8 @@ class SchemaDownloaderTests {
     )
 
     mockServer.takeRequest()
-    mockServer.takeRequest().body.utf8().let {
-      assertTrue(it.contains(Regex("}\\s+description\\s+}\\s+}")))
-      assertTrue(it.contains("specifiedByURL"))
-      assertTrue(it.contains("isRepeatable"))
-      assertTrue(it.contains("inputFields(includeDeprecated: true)"))
-      assertTrue(it.contains(Regex("directives\\s+\\{\\s+name\\s+description\\s+locations\\s+args\\(includeDeprecated: true\\)")))
-      assertTrue(it.contains(Regex("fields\\(includeDeprecated: true\\)\\s+\\{\\s+name\\s+description\\s+args\\(includeDeprecated: true\\)")))
-      assertTrue(it.substringAfter("fragment InputValue on __InputValue {").contains("isDeprecated"))
-      assertTrue(it.substringAfter("fragment InputValue on __InputValue {").contains("deprecationReason"))
-      assertTrue(it.contains("isOneOf"))
-    }
+    val introspectionRequest = mockServer.takeRequest().body.utf8()
+    assertEquals(introspectionRequestOneOf, introspectionRequest)
     assertEquals(introspectionResponse, tempFile.readText())
   }
 }