Skip to content

Commit 6892768

Browse files
wing328wing328
authored
[typescript-axios] add support for accept headers (#22318)
* cherry pick the change from 22299 * fix accept headers
1 parent fd72d4d commit 6892768

File tree

17 files changed

+274
-580
lines changed

17 files changed

+274
-580
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,30 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
186186
localVarFormParams.append('{{baseName}}', {{paramName}} as any);{{/isEnumRef}}{{^isEnumRef}}
187187
localVarFormParams.append('{{baseName}}', new Blob([JSON.stringify({{paramName}})], { type: "application/json", }));{{/isEnumRef}}{{/isPrimitiveType}}{{/multipartFormData}}
188188
}{{/isArray}}
189-
{{/formParams}}{{/vendorExtensions}}
190-
{{#vendorExtensions}}{{#hasFormParams}}{{^multipartFormData}}
191-
localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';{{/multipartFormData}}{{#multipartFormData}}
192-
localVarHeaderParameter['Content-Type'] = 'multipart/form-data';{{/multipartFormData}}
193-
{{/hasFormParams}}{{/vendorExtensions}}
189+
{{/formParams}}
190+
{{/vendorExtensions}}
191+
{{#vendorExtensions}}
192+
{{#hasFormParams}}
193+
{{^multipartFormData}}
194+
localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
195+
{{/multipartFormData}}
196+
{{#multipartFormData}}
197+
localVarHeaderParameter['Content-Type'] = 'multipart/form-data';
198+
{{/multipartFormData}}
199+
{{/hasFormParams}}
200+
{{/vendorExtensions}}
194201
{{#bodyParam}}
195202
{{^consumes}}
196203
localVarHeaderParameter['Content-Type'] = 'application/json';
197204
{{/consumes}}
198205
{{#consumes.0}}
199206
localVarHeaderParameter['Content-Type'] = '{{{mediaType}}}';
200207
{{/consumes.0}}
201-
202208
{{/bodyParam}}
209+
{{#hasProduces}}
210+
localVarHeaderParameter['Accept'] = '{{#produces}}{{{mediaType}}}{{^-last}},{{/-last}}{{/produces}}';
211+
{{/hasProduces}}
212+
203213
{{#headerParams}}
204214
{{#isArray}}
205215
if ({{paramName}}) {

‎samples/client/echo_api/typescript-axios/build/api.ts‎

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

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
107107
const localVarHeaderParameter = {} as any;
108108
const localVarQueryParameter = {} as any;
109109

110-
111-
112110
localVarHeaderParameter['Content-Type'] = 'application/json';
113111

114112
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -140,8 +138,6 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
140138
const localVarHeaderParameter = {} as any;
141139
const localVarQueryParameter = {} as any;
142140

143-
144-
145141
localVarHeaderParameter['Content-Type'] = 'application/json';
146142

147143
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -173,8 +169,6 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
173169
const localVarHeaderParameter = {} as any;
174170
const localVarQueryParameter = {} as any;
175171

176-
177-
178172
localVarHeaderParameter['Content-Type'] = 'application/json';
179173

180174
setSearchParams(localVarUrlObj, localVarQueryParameter);

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

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
139139
// oauth required
140140
await setOAuthToObject(localVarHeaderParameter, "petstore_auth", ["write:pets", "read:pets"], configuration)
141141

142-
143-
144142
localVarHeaderParameter['Content-Type'] = 'application/json';
145143

146144
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -182,7 +180,6 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
182180
await setOAuthToObject(localVarHeaderParameter, "petstore_auth", ["write:pets", "read:pets"], configuration)
183181

184182

185-
186183
if (apiKey != null) {
187184
localVarHeaderParameter['api_key'] = String(apiKey);
188185
}
@@ -225,8 +222,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
225222
localVarQueryParameter['status'] = status.join(COLLECTION_FORMATS.csv);
226223
}
227224

225+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
228226

229-
230227
setSearchParams(localVarUrlObj, localVarQueryParameter);
231228
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
232229
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -267,8 +264,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
267264
localVarQueryParameter['tags'] = tags.join(COLLECTION_FORMATS.csv);
268265
}
269266

267+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
270268

271-
272269
setSearchParams(localVarUrlObj, localVarQueryParameter);
273270
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
274271
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -304,8 +301,8 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
304301
// authentication api_key required
305302
await setApiKeyToObject(localVarHeaderParameter, "api_key", configuration)
306303

304+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
307305

308-
309306
setSearchParams(localVarUrlObj, localVarQueryParameter);
310307
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
311308
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -341,8 +338,6 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
341338
// oauth required
342339
await setOAuthToObject(localVarHeaderParameter, "petstore_auth", ["write:pets", "read:pets"], configuration)
343340

344-
345-
346341
localVarHeaderParameter['Content-Type'] = 'application/json';
347342

348343
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -389,14 +384,12 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
389384
if (name !== undefined) {
390385
localVarFormParams.set('name', name as any);
391386
}
392-
387+
393388
if (status !== undefined) {
394389
localVarFormParams.set('status', status as any);
395390
}
396-
397-
398391
localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
399-
392+
400393
setSearchParams(localVarUrlObj, localVarQueryParameter);
401394
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
402395
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -441,14 +434,13 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration)
441434
if (additionalMetadata !== undefined) {
442435
localVarFormParams.append('additionalMetadata', additionalMetadata as any);
443436
}
444-
437+
445438
if (file !== undefined) {
446439
localVarFormParams.append('file', file as any);
447440
}
448-
449-
450441
localVarHeaderParameter['Content-Type'] = 'multipart/form-data';
451-
442+
localVarHeaderParameter['Accept'] = 'application/json';
443+
452444
setSearchParams(localVarUrlObj, localVarQueryParameter);
453445
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
454446
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -812,7 +804,6 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
812804
const localVarQueryParameter = {} as any;
813805

814806

815-
816807
setSearchParams(localVarUrlObj, localVarQueryParameter);
817808
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
818809
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -844,8 +835,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
844835
// authentication api_key required
845836
await setApiKeyToObject(localVarHeaderParameter, "api_key", configuration)
846837

838+
localVarHeaderParameter['Accept'] = 'application/json';
847839

848-
849840
setSearchParams(localVarUrlObj, localVarQueryParameter);
850841
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
851842
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -878,8 +869,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
878869
const localVarHeaderParameter = {} as any;
879870
const localVarQueryParameter = {} as any;
880871

872+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
881873

882-
883874
setSearchParams(localVarUrlObj, localVarQueryParameter);
884875
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
885876
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -911,9 +902,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
911902
const localVarHeaderParameter = {} as any;
912903
const localVarQueryParameter = {} as any;
913904

914-
915-
916905
localVarHeaderParameter['Content-Type'] = 'application/json';
906+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
917907

918908
setSearchParams(localVarUrlObj, localVarQueryParameter);
919909
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -1113,8 +1103,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
11131103
const localVarHeaderParameter = {} as any;
11141104
const localVarQueryParameter = {} as any;
11151105

1116-
1117-
11181106
localVarHeaderParameter['Content-Type'] = 'application/json';
11191107

11201108
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -1149,8 +1137,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
11491137
const localVarHeaderParameter = {} as any;
11501138
const localVarQueryParameter = {} as any;
11511139

1152-
1153-
11541140
localVarHeaderParameter['Content-Type'] = 'application/json';
11551141

11561142
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -1185,8 +1171,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
11851171
const localVarHeaderParameter = {} as any;
11861172
const localVarQueryParameter = {} as any;
11871173

1188-
1189-
11901174
localVarHeaderParameter['Content-Type'] = 'application/json';
11911175

11921176
setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -1223,7 +1207,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
12231207
const localVarQueryParameter = {} as any;
12241208

12251209

1226-
12271210
setSearchParams(localVarUrlObj, localVarQueryParameter);
12281211
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
12291212
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -1256,8 +1239,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
12561239
const localVarHeaderParameter = {} as any;
12571240
const localVarQueryParameter = {} as any;
12581241

1242+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
12591243

1260-
12611244
setSearchParams(localVarUrlObj, localVarQueryParameter);
12621245
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
12631246
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -1300,8 +1283,8 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
13001283
localVarQueryParameter['password'] = password;
13011284
}
13021285

1286+
localVarHeaderParameter['Accept'] = 'application/xml,application/json';
13031287

1304-
13051288
setSearchParams(localVarUrlObj, localVarQueryParameter);
13061289
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
13071290
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -1331,7 +1314,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
13311314
const localVarQueryParameter = {} as any;
13321315

13331316

1334-
13351317
setSearchParams(localVarUrlObj, localVarQueryParameter);
13361318
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
13371319
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -1367,8 +1349,6 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
13671349
const localVarHeaderParameter = {} as any;
13681350
const localVarQueryParameter = {} as any;
13691351

1370-
1371-
13721352
localVarHeaderParameter['Content-Type'] = 'application/json';
13731353

13741354
setSearchParams(localVarUrlObj, localVarQueryParameter);

0 commit comments

Comments
 (0)