support multipart

Author: jackkav

packages/insomnia/src/main/importers/importers/curl.test.ts

@@ -87,6 +87,34 @@ describe('curl', () => {
         },
       ],
     },
+    {
+      name: 'should handle multipart',
+      curl: 'curl https://insomnia.rest/signup -F file=@/home/user/file.txt -F foo=bar -F baz=qux',
+      expected: [
+        {
+          body: {
+            mimeType: 'multipart/form-data',
+            params: [
+              {
+                fileName: '/home/user/file.txt',
+                name: 'file',
+                type: 'file',
+              },
+              {
+                name: 'foo',
+                type: 'text',
+                value: 'bar',
+              },
+              {
+                name: 'baz',
+                type: 'text',
+                value: 'qux',
+              },
+            ],
+          },
+        },
+      ],
+    },
     {
       name: 'should handle --data with url-encoded ampersand',
       curl: "curl -X POST https://example.com -H 'Content-Type: application/x-www-form-urlencoded' --data 'first=1&second=2'",

packages/insomnia/src/main/importers/importers/curl.ts

@@ -33,10 +33,19 @@ export const convert: Converter = rawData => {
 // This preserves existing behaviour, if there are bugs they will be here.
 const transformCurlDataObjectToInsomniaBody = (
   data: curlconverter.JSONOutput['data'],
+  files: curlconverter.JSONOutput['files'],
   mimeType: string,
 ): ImportRequest['body'] => {
   if (!data) {
-    return { mimeType };
+    return {};
+  }
+  // Handle multipart form data with files and text fields
+  if (files) {
+    const f = files ? Object.entries(files).map(([name, fileName]) => ({ name, fileName, type: 'file' })) : [];
+    return {
+      params: [...f, ...(Object.entries(data).map(([name, value]) => ({ name, value, type: 'text' })) as Parameter[])],
+      mimeType: 'multipart/form-data',
+    };
   }
   // Handle non-form-urlencoded bodies as text
   if (mimeType !== 'application/x-www-form-urlencoded') {
@@ -86,7 +95,7 @@ const transformCurlDataObjectToInsomniaBody = (
 };
 const transformCurlObjectToInsomniaRequest = (output: curlconverter.JSONOutput): ImportRequest => {
   const mimeType = output.headers?.['Content-Type'] || '';
-  const body = transformCurlDataObjectToInsomniaBody(output.data, mimeType);
+  const body = transformCurlDataObjectToInsomniaBody(output.data, output.files, mimeType);
 
   // Match our auth types to curlconverter
   const mapAuthTypeToInsomniaAuthType: Record<AuthType, SupportedAuthTypes> = {

packages/insomnia/src/main/importers/importers/fixtures/curl/question-mark-input.sh

@@ -1 +1 @@
-curl http://192.168.1.1:9200/executions/_search\?pretty --data '{"query":{"match_all":{}}}'
+curl http://192.168.1.1:9200/executions/_search\?pretty --json '{"query":{"match_all":{}}}'