Fix GraphQL variables

mountain-loop · Oct 22, 2024 · 59b0b73 · 59b0b73
1 parent d91e60f
commit 59b0b73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/plugins/exporter-curl/src/index.ts b/plugins/exporter-curl/src/index.ts
@@ -52,7 +52,7 @@ export async function pluginHookExport(_ctx: Context, request: Partial<HttpReque
       xs.push(NEWLINE);
     }
   } else if (typeof request.body?.query === 'string') {
-    const body = { query: request.body.query, variables: request.body.variables ?? undefined };
+    const body = { query: request.body.query || '', variables: maybeParseJSON(request.body.variables, {}) };
     xs.push('--data-raw', `${quote(JSON.stringify(body))}`);
     xs.push(NEWLINE);
   } else if (typeof request.body?.text === 'string') {
@@ -92,3 +92,11 @@ function quote(arg: string): string {
 function onlyEnabled(v: { name?: string; enabled?: boolean }): boolean {
   return v.enabled !== false && !!v.name;
 }
+
+function maybeParseJSON(v: any, fallback: any): string {
+  try {
+    return JSON.parse(v);
+  } catch (err) {
+    return fallback;
+  }
+}
diff --git a/plugins/exporter-curl/tests/index.test.ts b/plugins/exporter-curl/tests/index.test.ts
@@ -46,7 +46,7 @@ describe('exporter-curl', () => {
         bodyType: 'graphql',
         body: {
           query : '{foo,bar}',
-          variables: {a: 'aaa', b: 'bbb'},
+          variables: '{"a": "aaa", "b": "bbb"}',
         },
       }),
     ).toEqual(