fix: Variable is replaced in multipart/form-data when file is injected (

AnWeber/vscode-httpyac#258)

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [6.11.3] (2023-02-02)
+
+### Fix
+- Variable is replaced in multipart/form-data when file is injected (AnWeber/vscode-httpyac#258)
+
 ## [6.11.2] (2023-01-31)
 
 ### Fix

package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "publisher": "AnWeber",
   "description": "HTTP/REST CLI Client for *.http files",
-  "version": "6.11.2",
+  "version": "6.11.3",
   "homepage": "https://github.com/AnWeber/httpyac",
   "repository": {
     "type": "git",

src/models/httpRequest.ts

@@ -28,7 +28,10 @@ export interface HttpRequest extends Request<HttpMethod> {
   options?: OptionsOfUnknownResponseBody;
 }
 
-export type HttpRequestBodyLine = string | ((context: ProcessorContext) => Promise<Buffer | string | undefined>);
+export type HttpRequestBodyLine =
+  | string
+  | Buffer
+  | ((context: ProcessorContext) => Promise<Buffer | string | undefined>);
 
 export interface RequestBodyImport {
   fileName: string;

src/plugins/core/registerCorePlugin.ts

@@ -25,6 +25,7 @@ export function registerCorePlugins(api: models.HttpyacHooksApi) {
 function initOnRequestHook(api: models.HttpyacHooksApi) {
   api.hooks.onRequest.addHook('attachDefaultHeaders', request.attachDefaultHeaders);
   api.hooks.onRequest.addHook('setEnvRequestOptions', request.setEnvRequestOptions);
+  api.hooks.onRequest.addHook('resolveRequestBody', request.resolveRequestBody);
   api.hooks.onRequest.addHook('requestVariableReplacer', request.requestVariableReplacer);
   api.hooks.onRequest.addHook('transformRequestBody', request.transformRequestBodyToBuffer);
   api.hooks.onRequest.addHook('encodeRequestBody', request.encodeRequestBody);

src/plugins/core/request/index.ts

@@ -3,5 +3,6 @@ export * from './encodeRequestBody';
 export * from './excludeProxyInterceptor';
 export * from './isTrustedInterceptor';
 export * from './requestVariableReplacer';
+export * from './resolveRequestBody';
 export * from './setEnvRequestOptions';
 export * from './transformRequestBodyToBuffer';

src/plugins/core/request/resolveRequestBody.ts

@@ -0,0 +1,21 @@
+import * as models from '../../../models';
+import * as utils from '../../../utils';
+
+export async function resolveRequestBody(request: models.Request, context: models.ProcessorContext): Promise<void> {
+  if (request.body && Array.isArray(request.body)) {
+    const buffers: Array<Buffer | string> = [];
+    for (const obj of request.body) {
+      if (utils.isString(obj)) {
+        buffers.push(obj);
+      } else if (Buffer.isBuffer(obj)) {
+        buffers.push(obj);
+      } else {
+        const result = await obj(context);
+        if (result) {
+          buffers.push(result);
+        }
+      }
+    }
+    request.body = buffers;
+  }
+}

src/plugins/core/request/transformRequestBodyToBuffer.ts

@@ -31,6 +31,8 @@ export async function normalizeBody(
   for (const obj of body) {
     if (utils.isString(obj)) {
       buffers.push(obj);
+    } else if (Buffer.isBuffer(obj)) {
+      buffers.push(obj);
     } else {
       const result = await obj(context);
       if (result) {

src/plugins/core/test/body.spec.ts

@@ -111,4 +111,33 @@ invoice_text: {{bar}}
       `--WebKitFormBoundary\r\nContent-Disposition: form-data; name="text"\r\n\r\ninvoice_text: bar2\r\n--WebKitFormBoundary--`
     );
   });
+  it('should send mulitpart form body with variables and file', async () => {
+    const requests = initHttpClientProvider();
+
+    initFileProvider({ 'body.json': 'test' });
+    await sendHttp(
+      `
+@bar=bar2
+POST /post
+content-type: multipart/form-data; boundary=WebKitFormBoundary
+
+--WebKitFormBoundary
+Content-Disposition: form-data; name="text"
+
+invoice_text: {{bar}}
+--WebKitFormBoundary
+Content-Disposition: form-data; name="invoice"; filename="invoice.pdf"
+Content-Type: application/pdf
+
+< ./body.json
+--WebKitFormBoundary--
+      `
+    );
+
+    expect(requests[0].headers?.['content-type']).toBe('multipart/form-data; boundary=WebKitFormBoundary');
+    expect(Buffer.isBuffer(requests[0].body)).toBe(true);
+    expect(requests[0].body?.toString()).toBe(
+      `--WebKitFormBoundary\r\nContent-Disposition: form-data; name="text"\r\n\r\ninvoice_text: bar2\r\n--WebKitFormBoundary\r\nContent-Disposition: form-data; name="invoice"; filename="invoice.pdf"\r\nContent-Type: application/pdf\r\n\r\ntest\r\n--WebKitFormBoundary--`
+    );
+  });
 });