From eaec4bab885be1f5f3c1a0b8f5fbd8e983cb1721 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Fri, 27 Sep 2019 15:35:43 +1200 Subject: [PATCH 1/3] [typescript][node]: Add accept header if produces is not empty Uses the correct Accept media types as specified in the OpenApi specifications. Related to #3944 --- .../src/main/resources/typescript-node/api-single.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache index 5c96b388c5a1..0449dfc1cd5d 100644 --- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache @@ -134,6 +134,9 @@ export class {{classname}} { .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}}; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); +{{#hasProduces}} + localVarHeaderParams.Accept = '{{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}'; +{{/hasProduces}} let localVarFormParams: any = {}; {{#allParams}} From 032636aab7e2c2e16220cd0005c8bf0bed62580b Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 30 Sep 2019 09:07:29 +1300 Subject: [PATCH 2/3] Update samples files --- samples/client/petstore/typescript-node/default/api/petApi.ts | 4 ++++ .../client/petstore/typescript-node/default/api/storeApi.ts | 3 +++ .../client/petstore/typescript-node/default/api/userApi.ts | 2 ++ samples/client/petstore/typescript-node/npm/api/petApi.ts | 4 ++++ samples/client/petstore/typescript-node/npm/api/storeApi.ts | 3 +++ samples/client/petstore/typescript-node/npm/api/userApi.ts | 2 ++ 6 files changed, 18 insertions(+) diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts index c8b43c5a7621..77f1fc5f49a9 100644 --- a/samples/client/petstore/typescript-node/default/api/petApi.ts +++ b/samples/client/petstore/typescript-node/default/api/petApi.ts @@ -205,6 +205,7 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'status' is not null or undefined @@ -266,6 +267,7 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByTags'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'tags' is not null or undefined @@ -328,6 +330,7 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined @@ -512,6 +515,7 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/json'; let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts index d8f6013e7c26..20a6b6db84bc 100644 --- a/samples/client/petstore/typescript-node/default/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts @@ -137,6 +137,7 @@ export class StoreApi { const localVarPath = this.basePath + '/store/inventory'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/json'; let localVarFormParams: any = {}; (Object).assign(localVarHeaderParams, options.headers); @@ -190,6 +191,7 @@ export class StoreApi { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'orderId' is not null or undefined @@ -245,6 +247,7 @@ export class StoreApi { const localVarPath = this.basePath + '/store/order'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'body' is not null or undefined diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts index eab57a38e453..2f4dc000535b 100644 --- a/samples/client/petstore/typescript-node/default/api/userApi.ts +++ b/samples/client/petstore/typescript-node/default/api/userApi.ts @@ -301,6 +301,7 @@ export class UserApi { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined @@ -357,6 +358,7 @@ export class UserApi { const localVarPath = this.basePath + '/user/login'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts index c8b43c5a7621..77f1fc5f49a9 100644 --- a/samples/client/petstore/typescript-node/npm/api/petApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts @@ -205,6 +205,7 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'status' is not null or undefined @@ -266,6 +267,7 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByTags'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'tags' is not null or undefined @@ -328,6 +330,7 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined @@ -512,6 +515,7 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/json'; let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts index d8f6013e7c26..20a6b6db84bc 100644 --- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts @@ -137,6 +137,7 @@ export class StoreApi { const localVarPath = this.basePath + '/store/inventory'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/json'; let localVarFormParams: any = {}; (Object).assign(localVarHeaderParams, options.headers); @@ -190,6 +191,7 @@ export class StoreApi { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'orderId' is not null or undefined @@ -245,6 +247,7 @@ export class StoreApi { const localVarPath = this.basePath + '/store/order'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'body' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts index eab57a38e453..2f4dc000535b 100644 --- a/samples/client/petstore/typescript-node/npm/api/userApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts @@ -301,6 +301,7 @@ export class UserApi { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined @@ -357,6 +358,7 @@ export class UserApi { const localVarPath = this.basePath + '/user/login'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); + localVarHeaderParams.Accept = 'application/xml,application/json'; let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined From c355352de2f9475710a1fe359d11cba217f50210 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 2 Oct 2019 10:57:57 +1300 Subject: [PATCH 3/3] [typescript][node]: Give presedence to 'application/json' The endpoint may support multiple formats, e.g. 'application/xml', 'application/json'. However, we don't really support xml. In this case only accept 'application/json'. --- .../typescript-node/api-single.mustache | 8 ++++- .../typescript-node/default/api/petApi.ts | 32 ++++++++++++++++--- .../typescript-node/default/api/storeApi.ts | 24 ++++++++++++-- .../typescript-node/default/api/userApi.ts | 16 ++++++++-- .../typescript-node/npm/api/petApi.ts | 32 ++++++++++++++++--- .../typescript-node/npm/api/storeApi.ts | 24 ++++++++++++-- .../typescript-node/npm/api/userApi.ts | 16 ++++++++-- 7 files changed, 133 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache index 0449dfc1cd5d..88a2bf92dfe1 100644 --- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache @@ -135,7 +135,13 @@ export class {{classname}} { let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); {{#hasProduces}} - localVarHeaderParams.Accept = '{{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}'; + const produces = [{{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}}]; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } {{/hasProduces}} let localVarFormParams: any = {}; diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts index 77f1fc5f49a9..4bf54529880b 100644 --- a/samples/client/petstore/typescript-node/default/api/petApi.ts +++ b/samples/client/petstore/typescript-node/default/api/petApi.ts @@ -205,7 +205,13 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'status' is not null or undefined @@ -267,7 +273,13 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByTags'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'tags' is not null or undefined @@ -330,7 +342,13 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined @@ -515,7 +533,13 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/json'; + const produces = ['application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts index 20a6b6db84bc..d2a42eaa9bbb 100644 --- a/samples/client/petstore/typescript-node/default/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts @@ -137,7 +137,13 @@ export class StoreApi { const localVarPath = this.basePath + '/store/inventory'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/json'; + const produces = ['application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; (Object).assign(localVarHeaderParams, options.headers); @@ -191,7 +197,13 @@ export class StoreApi { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'orderId' is not null or undefined @@ -247,7 +259,13 @@ export class StoreApi { const localVarPath = this.basePath + '/store/order'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'body' is not null or undefined diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts index 2f4dc000535b..8efbe0d55687 100644 --- a/samples/client/petstore/typescript-node/default/api/userApi.ts +++ b/samples/client/petstore/typescript-node/default/api/userApi.ts @@ -301,7 +301,13 @@ export class UserApi { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined @@ -358,7 +364,13 @@ export class UserApi { const localVarPath = this.basePath + '/user/login'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts index 77f1fc5f49a9..4bf54529880b 100644 --- a/samples/client/petstore/typescript-node/npm/api/petApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts @@ -205,7 +205,13 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'status' is not null or undefined @@ -267,7 +273,13 @@ export class PetApi { const localVarPath = this.basePath + '/pet/findByTags'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'tags' is not null or undefined @@ -330,7 +342,13 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined @@ -515,7 +533,13 @@ export class PetApi { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/json'; + const produces = ['application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'petId' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts index 20a6b6db84bc..d2a42eaa9bbb 100644 --- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts @@ -137,7 +137,13 @@ export class StoreApi { const localVarPath = this.basePath + '/store/inventory'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/json'; + const produces = ['application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; (Object).assign(localVarHeaderParams, options.headers); @@ -191,7 +197,13 @@ export class StoreApi { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'orderId' is not null or undefined @@ -247,7 +259,13 @@ export class StoreApi { const localVarPath = this.basePath + '/store/order'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'body' is not null or undefined diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts index 2f4dc000535b..8efbe0d55687 100644 --- a/samples/client/petstore/typescript-node/npm/api/userApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts @@ -301,7 +301,13 @@ export class UserApi { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined @@ -358,7 +364,13 @@ export class UserApi { const localVarPath = this.basePath + '/user/login'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); - localVarHeaderParams.Accept = 'application/xml,application/json'; + const produces = ['application/xml', 'application/json']; + // give precedence to 'application/json' + if (produces.indexOf('application/json') >= 0) { + localVarHeaderParams.Accept = 'application/json'; + } else { + localVarHeaderParams.Accept = produces.join(','); + } let localVarFormParams: any = {}; // verify required parameter 'username' is not null or undefined