diff --git a/src/templates/core/axios/request.hbs b/src/templates/core/axios/request.hbs index 6612f1614..85c511ff3 100644 --- a/src/templates/core/axios/request.hbs +++ b/src/templates/core/axios/request.hbs @@ -35,9 +35,6 @@ import type { OpenAPIConfig } from './OpenAPI'; {{>functions/getQueryString}} -{{>functions/getUrl}} - - {{>functions/getFormData}} @@ -61,6 +58,8 @@ import type { OpenAPIConfig } from './OpenAPI'; {{>functions/catchErrorCodes}} +{{>functions/getUrl}} + /** * Request method @@ -73,7 +72,7 @@ import type { OpenAPIConfig } from './OpenAPI'; export const request = (config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise => { return new CancelablePromise(async (resolve, reject, onCancel) => { try { - const url = getUrl(config, options); + const url = getUrl(config, { ...options, query: undefined }); const formData = getFormData(options); const body = getRequestBody(options); const headers = await getHeaders(config, options, formData); diff --git a/src/templates/core/axios/sendRequest.hbs b/src/templates/core/axios/sendRequest.hbs index 66b5dcb1d..6f06e06ec 100644 --- a/src/templates/core/axios/sendRequest.hbs +++ b/src/templates/core/axios/sendRequest.hbs @@ -15,6 +15,7 @@ export const sendRequest = async ( headers, data: body ?? formData, method: options.method, + params: options.query, withCredentials: config.WITH_CREDENTIALS, withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false, cancelToken: source.token, diff --git a/src/templates/core/functions/getQueryString.hbs b/src/templates/core/functions/getQueryString.hbs index 7946851dd..57fd8bb33 100644 --- a/src/templates/core/functions/getQueryString.hbs +++ b/src/templates/core/functions/getQueryString.hbs @@ -8,8 +8,8 @@ export const getQueryString = (params: Record): string => { const process = (key: string, value: any) => { if (isDefined(value)) { if (Array.isArray(value)) { - value.forEach(v => { - process(key, v); + value.forEach((v, i) => { + process(`${key}[${i}]`, v); }); } else if (typeof value === 'object') { Object.entries(value).forEach(([k, v]) => {