fix variables in GraphQL query documents imported from Insomnia and P…

…ostman were not resolved
sunny-chung · Dec 4, 2023 · 8b18b74 · 8b18b74
1 parent 0187632
commit 8b18b74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/importer/InsomniaV4Importer.kt b/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/importer/InsomniaV4Importer.kt
@@ -215,10 +215,11 @@ class InsomniaV4Importer {
                                     jsonParser.readValue<GraphqlRequestBody>(body)
                                         .let {
                                             GraphqlBody(
-                                                document = it.query,
+                                                document = it.query.convertVariables(postFlightBodyVariables),
                                                 variables = jsonParser.writerWithDefaultPrettyPrinter()
                                                     .writeValueAsString(it.variables)
-                                                    .let { if (it == "null") "" else it },
+                                                    .let { if (it == "null") "" else it }
+                                                    .convertVariables(postFlightBodyVariables),
                                                 operationName = it.operationName,
                                             )
                                         }

diff --git a/...otlin/com/sunnychung/application/multiplatform/hellohttp/importer/PostmanV2ZipImporter.kt b/...otlin/com/sunnychung/application/multiplatform/hellohttp/importer/PostmanV2ZipImporter.kt
@@ -223,8 +223,8 @@ class PostmanV2ZipImporter {
 
                         "file" -> FileBody(file?.src)
                         "graphql" -> GraphqlBody(
-                            document = graphql?.query ?: "",
-                            variables = graphql?.variables ?: "",
+                            document = graphql?.query?.convertVariables() ?: "",
+                            variables = graphql?.variables?.convertVariables() ?: "",
                             operationName = null
                         )