Skip to content

Commit 7beebe6

Browse files
authored
Fix applying optional query parameters (#13419)
* add query params * update samples
1 parent 37fb856 commit 7beebe6

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/ApiClient.mustache

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,12 @@ export default class ApiClient extends RESTDataSource {
185185
queryParams, headerParams, formParams, bodyParam, authNames,
186186
contentTypes, accepts, returnType, requestInit) {
187187
188+
var normalizedQueryParams = this.normalizeParams(queryParams);
189+
188190
var parameterizedPath = this.parametrizePath(path, pathParams);
189191
var fetchOptions = {
190192
headers: headerParams,
191-
params: queryParams
193+
params: normalizedQueryParams
192194
};
193195

194196
this.applyAuthOptions(fetchOptions, authNames);
@@ -210,7 +212,7 @@ export default class ApiClient extends RESTDataSource {
210212
var httpMethodFn = httpMethod.toLowerCase();
211213

212214
if (httpMethodFn == 'get' || httpMethodFn == 'delete') {
213-
response = await this[httpMethodFn](parameterizedPath, [], requestInit);
215+
response = await this[httpMethodFn](parameterizedPath, normalizedQueryParams, requestInit);
214216
} else {
215217
response = await this[httpMethodFn](parameterizedPath, body, requestInit)
216218
}

samples/client/petstore/javascript-apollo/src/ApiClient.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,12 @@ export default class ApiClient extends RESTDataSource {
186186
queryParams, headerParams, formParams, bodyParam, authNames,
187187
contentTypes, accepts, returnType, requestInit) {
188188

189+
var normalizedQueryParams = this.normalizeParams(queryParams);
190+
189191
var parameterizedPath = this.parametrizePath(path, pathParams);
190192
var fetchOptions = {
191193
headers: headerParams,
192-
params: queryParams
194+
params: normalizedQueryParams
193195
};
194196

195197
this.applyAuthOptions(fetchOptions, authNames);
@@ -211,7 +213,7 @@ export default class ApiClient extends RESTDataSource {
211213
var httpMethodFn = httpMethod.toLowerCase();
212214

213215
if (httpMethodFn == 'get' || httpMethodFn == 'delete') {
214-
response = await this[httpMethodFn](parameterizedPath, [], requestInit);
216+
response = await this[httpMethodFn](parameterizedPath, normalizedQueryParams, requestInit);
215217
} else {
216218
response = await this[httpMethodFn](parameterizedPath, body, requestInit)
217219
}

0 commit comments

Comments
 (0)