AAE-30882 Change buildRequest parameters

This commit is contained in:
Wojciech Duda
2025-02-18 13:43:39 +01:00
parent 7f4a46f4c3
commit 9cea847d06
2 changed files with 25 additions and 34 deletions

View File

@@ -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();

View File

@@ -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');
});
});