Skip to content

Commit a4fc319

Browse files
nibytesnibytes
authored
Fix #5420 add headers from configuration object (#5422)
* Fix #5420 add headers from configuration object * Add baseOptions undefined checking #5420 * Update the samples and replace array to object #5420 * Update sample
1 parent ea2acf0 commit a4fc319

File tree

9 files changed

+242
-121
lines changed

9 files changed

+242
-121
lines changed

‎modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
189189
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
190190
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
191191
delete localVarUrlObj.search;
192-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
192+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
193+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
193194
{{#hasFormParams}}
194195
localVarRequestOptions.data = localVarFormParams{{#vendorExtensions}}{{^multipartFormData}}.toString(){{/multipartFormData}}{{/vendorExtensions}};
195196
{{/hasFormParams}}

‎samples/client/petstore/typescript-axios/builds/default/api.ts

Lines changed: 40 additions & 20 deletions
Large diffs are not rendered by default.

‎samples/client/petstore/typescript-axios/builds/es6-target/api.ts

Lines changed: 40 additions & 20 deletions
Large diffs are not rendered by default.

‎samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts

Lines changed: 40 additions & 20 deletions
Large diffs are not rendered by default.

‎samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts

Lines changed: 40 additions & 20 deletions
Large diffs are not rendered by default.

‎samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
6565
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
6666
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
6767
delete localVarUrlObj.search;
68-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
68+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
69+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
6970
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
7071
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
7172

@@ -116,7 +117,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
116117
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
117118
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
118119
delete localVarUrlObj.search;
119-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
120+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
121+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
120122

121123
return {
122124
url: globalImportUrl.format(localVarUrlObj),
@@ -163,7 +165,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
163165
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
164166
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
165167
delete localVarUrlObj.search;
166-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
168+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
169+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
167170

168171
return {
169172
url: globalImportUrl.format(localVarUrlObj),
@@ -210,7 +213,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
210213
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
211214
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
212215
delete localVarUrlObj.search;
213-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
216+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
217+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
214218

215219
return {
216220
url: globalImportUrl.format(localVarUrlObj),
@@ -253,7 +257,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
253257
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
254258
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
255259
delete localVarUrlObj.search;
256-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
260+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
261+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
257262

258263
return {
259264
url: globalImportUrl.format(localVarUrlObj),
@@ -298,7 +303,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
298303
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
299304
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
300305
delete localVarUrlObj.search;
301-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
306+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
307+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
302308
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
303309
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
304310

@@ -357,7 +363,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
357363
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
358364
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
359365
delete localVarUrlObj.search;
360-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
366+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
367+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
361368
localVarRequestOptions.data = localVarFormParams.toString();
362369

363370
return {
@@ -415,7 +422,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
415422
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
416423
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
417424
delete localVarUrlObj.search;
418-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
425+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
426+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
419427
localVarRequestOptions.data = localVarFormParams;
420428

421429
return {

‎samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
5454
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
5555
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
5656
delete localVarUrlObj.search;
57-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
57+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
58+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
5859

5960
return {
6061
url: globalImportUrl.format(localVarUrlObj),
@@ -91,7 +92,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
9192
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
9293
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
9394
delete localVarUrlObj.search;
94-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
95+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
96+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
9597

9698
return {
9799
url: globalImportUrl.format(localVarUrlObj),
@@ -126,7 +128,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
126128
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
127129
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
128130
delete localVarUrlObj.search;
129-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
131+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
132+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
130133

131134
return {
132135
url: globalImportUrl.format(localVarUrlObj),
@@ -162,7 +165,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
162165
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
163166
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
164167
delete localVarUrlObj.search;
165-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
168+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
169+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
166170
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
167171
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
168172

‎samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
5555
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
5656
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
5757
delete localVarUrlObj.search;
58-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
58+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
59+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
5960
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
6061
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
6162

@@ -93,7 +94,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
9394
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
9495
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
9596
delete localVarUrlObj.search;
96-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
97+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
98+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
9799
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
98100
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
99101

@@ -131,7 +133,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
131133
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
132134
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
133135
delete localVarUrlObj.search;
134-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
136+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
137+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
135138
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
136139
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
137140

@@ -168,7 +171,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
168171
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
169172
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
170173
delete localVarUrlObj.search;
171-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
174+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
175+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
172176

173177
return {
174178
url: globalImportUrl.format(localVarUrlObj),
@@ -203,7 +207,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
203207
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
204208
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
205209
delete localVarUrlObj.search;
206-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
210+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
211+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
207212

208213
return {
209214
url: globalImportUrl.format(localVarUrlObj),
@@ -250,7 +255,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
250255
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
251256
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
252257
delete localVarUrlObj.search;
253-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
258+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
259+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
254260

255261
return {
256262
url: globalImportUrl.format(localVarUrlObj),
@@ -279,7 +285,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
279285
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
280286
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
281287
delete localVarUrlObj.search;
282-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
288+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
289+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
283290

284291
return {
285292
url: globalImportUrl.format(localVarUrlObj),
@@ -321,7 +328,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
321328
localVarUrlObj.query = {...localVarUrlObj.query, ...localVarQueryParameter, ...options.query};
322329
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
323330
delete localVarUrlObj.search;
324-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
331+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
332+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
325333
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
326334
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
327335

0 commit comments

Comments
 (0)