fix cannot import from Insomnia data dumps if the dump contains a Gra…

…phQL request with an empty body
sunny-chung · Dec 4, 2023 · a977426 · a977426
1 parent e40eab8
commit a977426
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/importer/InsomniaV4Importer.kt b/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/importer/InsomniaV4Importer.kt
@@ -31,6 +31,7 @@ import com.sunnychung.application.multiplatform.hellohttp.model.UserKeyValuePair
 import com.sunnychung.application.multiplatform.hellohttp.model.UserRequestTemplate
 import com.sunnychung.application.multiplatform.hellohttp.model.UserRequestExample
 import com.sunnychung.application.multiplatform.hellohttp.model.insomniav4.InsomniaV4
+import com.sunnychung.application.multiplatform.hellohttp.util.emptyToNull
 import com.sunnychung.application.multiplatform.hellohttp.util.log
 import com.sunnychung.application.multiplatform.hellohttp.util.replaceIf
 import com.sunnychung.application.multiplatform.hellohttp.util.uuidString
@@ -209,16 +210,23 @@ class InsomniaV4Importer {
                             "application/octet-stream" -> FileBody(
                                 filePath = it.body.fileName
                             )
-                            "application/graphql" -> jsonParser.readValue<GraphqlRequestBody>(it.body.text ?: "")
-                                .let {
-                                    GraphqlBody(
-                                        document = it.query,
-                                        variables = jsonParser.writerWithDefaultPrettyPrinter()
-                                            .writeValueAsString(it.variables)
-                                            .let { if (it == "null") "" else it },
-                                        operationName = it.operationName,
-                                    )
+                            "application/graphql" -> it.body.text.emptyToNull()?.let { body ->
+                                try {
+                                    jsonParser.readValue<GraphqlRequestBody>(body)
+                                        .let {
+                                            GraphqlBody(
+                                                document = it.query,
+                                                variables = jsonParser.writerWithDefaultPrettyPrinter()
+                                                    .writeValueAsString(it.variables)
+                                                    .let { if (it == "null") "" else it },
+                                                operationName = it.operationName,
+                                            )
+                                        }
+                                } catch (e: Throwable) {
+                                    log.w(e) { "Insomnia import error while parsing JSON of GraphQL content. Will use default empty value." }
+                                    null
                                 }
+                            } ?: GraphqlBody(document = "", variables = "", operationName = null)
                             else -> StringBody(it.body.text?.convertVariables(postFlightBodyVariables) ?: "")
                         },
                         headers = it.parseHeaders(postFlightBodyVariables),