fix: ignore whitespace before & in formurlencoded (#699)

Author: AnWeber

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## [unreleased]
+
+### Fix
+- ignore whitespace before & in formurlencoded (#699)
+
 ## [6.16.6] (2025-01-11)
 
 ### Fix

src/plugins/core/registerCorePlugin.ts

@@ -29,7 +29,7 @@ function initOnRequestHook(api: models.HttpyacHooksApi) {
   api.hooks.onRequest.addHook('setDefaultHttpyacHeaders', request.setDefaultHttpyacHeaders);
   api.hooks.onRequest.addHook('requestVariableReplacer', request.requestVariableReplacer);
   api.hooks.onRequest.addHook('transformRequestBody', request.transformRequestBodyToBuffer);
-  api.hooks.onRequest.addHook('transfromMultilineFormUrlEncoded', request.transfromMultilineFormUrlEncoded);
+  api.hooks.onRequest.addHook('transformMultilineFormUrlEncoded', request.transformMultilineFormUrlEncoded);
   api.hooks.onRequest.addHook('encodeRequestBody', request.encodeRequestBody);
 
   api.hooks.onRequest.addInterceptor(request.isTrustedInterceptor);

src/plugins/core/request/index.ts

@@ -7,4 +7,4 @@ export * from './resolveRequestBody';
 export * from './setDefaultHttpyacHeaders';
 export * from './setEnvRequestOptions';
 export * from './transformRequestBodyToBuffer';
-export * from './transfromMultilineFormUrlEncoded';
+export * from './transformMultilineFormUrlEncoded';

src/plugins/core/request/transformMultilineFormUrlEncoded.spec.ts

@@ -0,0 +1,42 @@
+import { transformMultilineFormUrlEncoded } from './transformMultilineFormUrlEncoded';
+import { Request } from '../../../models';
+describe('transformMultilineFormUrlEncoded', () => {
+  it('transformMultilineFormUrlEncoded should return joined string', () => {
+    const request = {
+      body: 'foo = a&\nbar = b',
+      contentType: {
+        mimeType: 'application/x-www-form-urlencoded',
+      },
+    } as Request;
+    transformMultilineFormUrlEncoded(request);
+    expect(request.body).toBe('foo=a&bar=b');
+  });
+
+  it('transformMultilineFormUrlEncoded should return without whitespace around &', () => {
+    const request = {
+      body: 'foo = a & bar = b',
+      contentType: {
+        mimeType: 'application/x-www-form-urlencoded',
+      },
+    } as Request;
+    transformMultilineFormUrlEncoded(request);
+    expect(request.body).toBe('foo=a&bar=b');
+  });
+  it('transformMultilineFormUrlEncoded should ignore whitespace in content', () => {
+    const request = {
+      body: 'foo = a & bar = bl a',
+      contentType: {
+        mimeType: 'application/x-www-form-urlencoded',
+      },
+    } as Request;
+    transformMultilineFormUrlEncoded(request);
+    expect(request.body).toBe('foo=a&bar=bl a');
+  });
+  it('transformMultilineFormUrlEncoded should ignore content on wrong mimetype', () => {
+    const request = {
+      body: 'foo = a&\nbar = b',
+    } as Request;
+    transformMultilineFormUrlEncoded(request);
+    expect(request.body).toBe('foo = a&\nbar = b');
+  });
+});

…uest/transfromMultilineFormUrlEncoded.ts …uest/transformMultilineFormUrlEncoded.tssrc/plugins/core/request/transfromMultilineFormUrlEncoded.ts renamed to src/plugins/core/request/transformMultilineFormUrlEncoded.ts src/plugins/core/request/transfromMultilineFormUrlEncoded.ts renamed to src/plugins/core/request/transformMultilineFormUrlEncoded.ts

@@ -1,18 +1,24 @@
 import * as models from '../../../models';
 import * as utils from '../../../utils';
 
-export async function transfromMultilineFormUrlEncoded(request: models.Request): Promise<void> {
+export async function transformMultilineFormUrlEncoded(request: models.Request): Promise<void> {
   if (request.body && utils.isString(request.body) && utils.isMimeTypeFormUrlEncoded(request.contentType)) {
     const lines = utils.toMultiLineArray(request.body);
     if (lines.length > 0) {
       const result = [];
 
+      const splitCharts = ['=', '&'];
+
       for (const line of lines) {
         result.push(
-          line
-            .split('=')
-            .map(t => t.trim())
-            .join('=')
+          splitCharts.reduce(
+            (p, c) =>
+              p
+                .split(c)
+                .map(t => t.trim())
+                .join(c),
+            line
+          )
         );
       }
       request.body = result.join('');