From 9cea847d063b6cdc1c50c60b2838070bcc9e70ce Mon Sep 17 00:00:00 2001 From: Wojciech Duda <69160975+wojd0@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:43:39 +0100 Subject: [PATCH] AAE-30882 Change buildRequest parameters --- lib/js-api/src/superagentHttpClient.ts | 23 +++---------- lib/js-api/test/superagentHttpClient.spec.ts | 36 +++++++++++--------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/lib/js-api/src/superagentHttpClient.ts b/lib/js-api/src/superagentHttpClient.ts index b501546ac0..f1670e1627 100644 --- a/lib/js-api/src/superagentHttpClient.ts +++ b/lib/js-api/src/superagentHttpClient.ts @@ -48,11 +48,7 @@ export class SuperagentHttpClient implements HttpClient { const { returnType } = options; const { eventEmitter, apiClientEmitter } = emitters; - const { urlWithParams, fetchOptions } = this.buildRequest({ - ...options, - url, - securityOptions - }); + const { urlWithParams, fetchOptions } = this.buildRequest({ ...options, url }, securityOptions); const controller = new AbortController(); fetchOptions.signal = controller.signal; @@ -100,19 +96,10 @@ export class SuperagentHttpClient implements HttpClient { return promise; } - private buildRequest({ - httpMethod, - url, - queryParams, - headerParams, - formParams, - bodyParam, - contentType, - accept, - responseType, - returnType, - securityOptions - }: RequestOptions & { securityOptions: SecurityOptions }) { + private buildRequest( + { httpMethod, url, queryParams, headerParams, formParams, bodyParam, contentType, accept, responseType, returnType }: RequestOptions, + securityOptions: SecurityOptions + ) { const urlWithParams = new URL(url); urlWithParams.search = new URLSearchParams(SuperagentHttpClient.normalizeParams(queryParams)).toString(); diff --git a/lib/js-api/test/superagentHttpClient.spec.ts b/lib/js-api/test/superagentHttpClient.spec.ts index 9cb0d2a7ee..a9dac14ebe 100644 --- a/lib/js-api/test/superagentHttpClient.spec.ts +++ b/lib/js-api/test/superagentHttpClient.spec.ts @@ -99,15 +99,17 @@ describe('SuperagentHttpClient', () => { const httpMethod = 'GET'; const securityOptions = { ...defaultSecurityOptions }; - const request = client['buildRequest']({ - ...options, - path: '', - httpMethod, - url, - bodyParam: null, - returnType: null, + const request = client['buildRequest']( + { + ...options, + path: '', + httpMethod, + url, + bodyParam: null, + returnType: null + }, securityOptions - }); + ); expect(request.urlWithParams).toEqual(url); const { fetchOptions } = request; @@ -129,15 +131,17 @@ describe('SuperagentHttpClient', () => { (isBrowser as jest.Mock).mockReturnValue(false); - const request = client['buildRequest']({ - ...options, - path: '', - httpMethod, - url, - bodyParam: null, - returnType: null, + const request = client['buildRequest']( + { + ...options, + path: '', + httpMethod, + url, + bodyParam: null, + returnType: null + }, securityOptions - }); + ); expect(request.fetchOptions.headers['cookie']).toEqual('testCookie'); }); });