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

JS Client - Add support for empty enum in server object (#2853)

Browse Source 
* Add support for empty enum in server object

* Updated samples
This commit is contained in:
Jonas DOREL
2019-05-13 08:21:43 +02:00
committed by William Cheng
parent 9d3c1f2262
commit 305f78c52b
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache vendored
View File

@@ -137,6 +137,7 @@
} }
var url = this.basePath + path; var url = this.basePath + path;
// use API (operation, path) base path if defined // use API (operation, path) base path if defined
if (apiBasePath !== null && apiBasePath !== undefined) { if (apiBasePath !== null && apiBasePath !== undefined) {
url = apiBasePath + path; url = apiBasePath + path;
@@ -664,7 +665,8 @@
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");

3
modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache vendored
View File

@@ -645,7 +645,8 @@ class ApiClient {
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");

3
samples/client/petstore/javascript-es6/src/ApiClient.js
View File

@@ -576,7 +576,8 @@ class ApiClient {
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");

3
samples/client/petstore/javascript-promise-es6/src/ApiClient.js
View File

@@ -575,7 +575,8 @@ class ApiClient {
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");

4
samples/client/petstore/javascript-promise/src/ApiClient.js
View File

@@ -136,6 +136,7 @@
} }
var url = this.basePath + path; var url = this.basePath + path;
// use API (operation, path) base path if defined // use API (operation, path) base path if defined
if (apiBasePath !== null && apiBasePath !== undefined) { if (apiBasePath !== null && apiBasePath !== undefined) {
url = apiBasePath + path; url = apiBasePath + path;
@@ -611,7 +612,8 @@
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");

4
samples/client/petstore/javascript/src/ApiClient.js
View File

@@ -136,6 +136,7 @@
} }
var url = this.basePath + path; var url = this.basePath + path;
// use API (operation, path) base path if defined // use API (operation, path) base path if defined
if (apiBasePath !== null && apiBasePath !== undefined) { if (apiBasePath !== null && apiBasePath !== undefined) {
url = apiBasePath + path; url = apiBasePath + path;
@@ -622,7 +623,8 @@
// go through variable and assign a value // go through variable and assign a value
for (var variable_name in server['variables']) { for (var variable_name in server['variables']) {
if (variable_name in variables) { if (variable_name in variables) {
if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) { let variable = server['variables'][variable_name];
if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
url = url.replace("{" + variable_name + "}", variables[variable_name]); url = url.replace("{" + variable_name + "}", variables[variable_name]);
} else { } else {
throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + "."); throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");