Fix extra params middleware for GET/HEAD requests

- Skip adding body to GET/HEAD requests which don't allow request bodies
- Clean up global middleware registry between tests to prevent leakage
- Fix query params to use modifiedRequest instead of original request

Author: clavery

packages/b2c-tooling-sdk/src/clients/middleware.ts

@@ -212,6 +212,10 @@ export function createExtraParamsMiddleware(config: ExtraParamsConfig): Middlewa
     async onRequest({request}) {
       let modifiedRequest = request;
 
+      // HTTP methods that don't allow a request body
+      const methodsWithoutBody = ['GET', 'HEAD'];
+      const canHaveBody = !methodsWithoutBody.includes(modifiedRequest.method.toUpperCase());
+
       // Add extra headers first (before other modifications)
       if (config.headers && Object.keys(config.headers).length > 0) {
         const newHeaders = new Headers(modifiedRequest.headers);
@@ -222,28 +226,26 @@ export function createExtraParamsMiddleware(config: ExtraParamsConfig): Middlewa
         modifiedRequest = new Request(modifiedRequest.url, {
           method: modifiedRequest.method,
           headers: newHeaders,
-          body: modifiedRequest.body,
-          duplex: modifiedRequest.body ? 'half' : undefined,
+          ...(canHaveBody && modifiedRequest.body ? {body: modifiedRequest.body, duplex: 'half'} : {}),
         } as RequestInit);
       }
 
       // Add extra query parameters
       if (config.query && Object.keys(config.query).length > 0) {
-        const url = new URL(request.url);
+        const url = new URL(modifiedRequest.url);
         for (const [key, value] of Object.entries(config.query)) {
           if (value !== undefined) {
             url.searchParams.set(key, String(value));
           }
         }
         logger.trace(
-          {extraQuery: config.query, originalUrl: request.url, newUrl: url.toString()},
+          {extraQuery: config.query, originalUrl: modifiedRequest.url, newUrl: url.toString()},
           '[ExtraParams] Adding extra query params to URL',
         );
         modifiedRequest = new Request(url.toString(), {
-          method: request.method,
-          headers: request.headers,
-          body: request.body,
-          duplex: request.body ? 'half' : undefined,
+          method: modifiedRequest.method,
+          headers: modifiedRequest.headers,
+          ...(canHaveBody && modifiedRequest.body ? {body: modifiedRequest.body, duplex: 'half'} : {}),
         } as RequestInit);
       }
 
@@ -268,8 +270,8 @@ export function createExtraParamsMiddleware(config: ExtraParamsConfig): Middlewa
           } catch {
             logger.warn('[ExtraParams] Could not parse request body as JSON, skipping body merge');
           }
-        } else if (!modifiedRequest.body) {
-          // No existing body, create one with extra fields
+        } else if (!modifiedRequest.body && canHaveBody) {
+          // No existing body, create one with extra fields (only for methods that allow a body)
           logger.trace({body: config.body}, '[ExtraParams] Creating new body with extra fields');
           const headers = new Headers(modifiedRequest.headers);
           headers.set('content-type', 'application/json');

packages/b2c-tooling-sdk/test/cli/base-command.test.ts

@@ -6,6 +6,7 @@
 import {expect} from 'chai';
 import {Config} from '@oclif/core';
 import {BaseCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {globalMiddlewareRegistry} from '@salesforce/b2c-tooling-sdk/clients';
 
 // Create a concrete test command class
 class TestBaseCommand extends BaseCommand<typeof TestBaseCommand> {
@@ -57,6 +58,11 @@ describe('cli/base-command', () => {
     command = new TestBaseCommand([], config);
   });
 
+  afterEach(() => {
+    // Clean up the global middleware registry between tests
+    globalMiddlewareRegistry.clear();
+  });
+
   describe('init', () => {
     it('initializes command with default flags', async () => {
       // Mock parse method