From 550069c58248b4a6a650a6c0bfb75f3cd22b7d07 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 28 Oct 2019 11:15:12 +0100 Subject: [PATCH 1/4] add check on response --- .../main/resources/Javascript/es6/ApiClient.mustache | 12 +++++++----- .../petstore/javascript-promise-es6/src/ApiClient.js | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache index 15cc588f06b4..e4fe18c46945 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache @@ -372,7 +372,7 @@ class ApiClient { * @param {Array.} accepts An array of acceptable response MIME types. * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the * constructor for a complex type. - * @param {String} apiBasePath base path defined in the operation/path level to override the default one + * @param {String} apiBasePath base path defined in the operation/path level to override the default one {{^usePromises}} * @param {module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}ApiClient~callApiCallback} callback The callback function. {{/usePromises}} @@ -469,10 +469,12 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; - err.status = response.status; - err.statusText = response.statusText; - err.body = response.body; - err.response = response; + if(response && response.status && response.statusText && response.body){ + err.status = response.status; + err.statusText = response.statusText; + err.body = response.body; + err.response = response; + } err.error = error; reject(err); diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js index 828ec6b5c9c5..85267d2ec5d7 100644 --- a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js +++ b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js @@ -3,7 +3,7 @@ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * The version of the OpenAPI document: 1.0.0 - * + * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech @@ -355,7 +355,7 @@ class ApiClient { * @param {Array.} accepts An array of acceptable response MIME types. * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the * constructor for a complex type. - * @param {String} apiBasePath base path defined in the operation/path level to override the default one + * @param {String} apiBasePath base path defined in the operation/path level to override the default one * @returns {Promise} A {@link https://www.promisejs.org/|Promise} object. */ callApi(path, httpMethod, pathParams, @@ -447,10 +447,12 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; + if(response && response.status && response.statusText && response.body){ err.status = response.status; err.statusText = response.statusText; err.body = response.body; err.response = response; + } err.error = error; reject(err); From 152c19212e09696964c1ae216e9b3ab8b905c8d2 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 28 Oct 2019 14:34:35 +0100 Subject: [PATCH 2/4] improve check on response --- .../src/main/resources/Javascript/es6/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache index e4fe18c46945..0d193b0c6514 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache @@ -469,7 +469,7 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; - if(response && response.status && response.statusText && response.body){ + if(response){ err.status = response.status; err.statusText = response.statusText; err.body = response.body; From a1e12e7ef983784cca9a254948353f03e92637e3 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 28 Oct 2019 14:50:47 +0100 Subject: [PATCH 3/4] update sample --- .../petstore/javascript-promise-es6/src/ApiClient.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js index 85267d2ec5d7..f3adbbfcfdb3 100644 --- a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js +++ b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js @@ -3,7 +3,7 @@ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * * The version of the OpenAPI document: 1.0.0 - * + * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech @@ -447,11 +447,11 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; - if(response && response.status && response.statusText && response.body){ - err.status = response.status; - err.statusText = response.statusText; - err.body = response.body; - err.response = response; + if(response){ + err.status = response.status; + err.statusText = response.statusText; + err.body = response.body; + err.response = response; } err.error = error; From db984dbda25b1e0ce2b19b0df3cc07a575d29ec6 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 28 Oct 2019 15:02:47 +0100 Subject: [PATCH 4/4] fix spaces --- .../src/main/resources/Javascript/es6/ApiClient.mustache | 2 +- samples/client/petstore/javascript-promise-es6/src/ApiClient.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache index 0d193b0c6514..fd4fb57e7d95 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache @@ -469,7 +469,7 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; - if(response){ + if (response) { err.status = response.status; err.statusText = response.statusText; err.body = response.body; diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js index f3adbbfcfdb3..dc4ff8062266 100644 --- a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js +++ b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js @@ -447,7 +447,7 @@ class ApiClient { request.end((error, response) => { if (error) { var err = {}; - if(response){ + if (response) { err.status = response.status; err.statusText = response.statusText; err.body = response.body;