loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix applying optional query parameters (#13419)

Browse Source 
* add query params

* update samples
This commit is contained in:
João Neto 2022-09-14 16:39:34 +02:00 committed by GitHub
parent 37fb856775
commit 7beebe693a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/ApiClient.mustache vendored
View File

@ -185,10 +185,12 @@ export default class ApiClient extends RESTDataSource {
queryParams, headerParams, formParams, bodyParam, authNames, queryParams, headerParams, formParams, bodyParam, authNames,
contentTypes, accepts, returnType, requestInit) { contentTypes, accepts, returnType, requestInit) {
var normalizedQueryParams = this.normalizeParams(queryParams);
var parameterizedPath = this.parametrizePath(path, pathParams); var parameterizedPath = this.parametrizePath(path, pathParams);
var fetchOptions = { var fetchOptions = {
headers: headerParams, headers: headerParams,
params: queryParams params: normalizedQueryParams
}; };
this.applyAuthOptions(fetchOptions, authNames); this.applyAuthOptions(fetchOptions, authNames);
@ -210,7 +212,7 @@ export default class ApiClient extends RESTDataSource {
var httpMethodFn = httpMethod.toLowerCase(); var httpMethodFn = httpMethod.toLowerCase();
if (httpMethodFn == 'get' || httpMethodFn == 'delete') { if (httpMethodFn == 'get' || httpMethodFn == 'delete') {
response = await this[httpMethodFn](parameterizedPath, [], requestInit); response = await this[httpMethodFn](parameterizedPath, normalizedQueryParams, requestInit);
} else { } else {
response = await this[httpMethodFn](parameterizedPath, body, requestInit) response = await this[httpMethodFn](parameterizedPath, body, requestInit)
} }

6
samples/client/petstore/javascript-apollo/src/ApiClient.js
View File

@ -186,10 +186,12 @@ export default class ApiClient extends RESTDataSource {
queryParams, headerParams, formParams, bodyParam, authNames, queryParams, headerParams, formParams, bodyParam, authNames,
contentTypes, accepts, returnType, requestInit) { contentTypes, accepts, returnType, requestInit) {
var normalizedQueryParams = this.normalizeParams(queryParams);
var parameterizedPath = this.parametrizePath(path, pathParams); var parameterizedPath = this.parametrizePath(path, pathParams);
var fetchOptions = { var fetchOptions = {
headers: headerParams, headers: headerParams,
params: queryParams params: normalizedQueryParams
}; };
this.applyAuthOptions(fetchOptions, authNames); this.applyAuthOptions(fetchOptions, authNames);
@ -211,7 +213,7 @@ export default class ApiClient extends RESTDataSource {
var httpMethodFn = httpMethod.toLowerCase(); var httpMethodFn = httpMethod.toLowerCase();
if (httpMethodFn == 'get' || httpMethodFn == 'delete') { if (httpMethodFn == 'get' || httpMethodFn == 'delete') {
response = await this[httpMethodFn](parameterizedPath, [], requestInit); response = await this[httpMethodFn](parameterizedPath, normalizedQueryParams, requestInit);
} else { } else {
response = await this[httpMethodFn](parameterizedPath, body, requestInit) response = await this[httpMethodFn](parameterizedPath, body, requestInit)
} }