Skip to content

Commit 8440832

Browse files
committed
RE: fix empty server variables handling
1 parent e2a0a4d commit 8440832

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

reverse_engineering/api.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = {
2323

2424
validationHelper.validate(filterSchema(openAPISchema), { resolve: { external: false }})
2525
.then((messages) => {
26-
if (!Array.isArray(messages) || !messages.length) {
26+
if (!Array.isArray(messages) || !messages.length || (messages.length === 1 && messages[0].type === 'success')) {
2727
this.handleErrors(error, logger, callback);
2828
}
2929

@@ -41,8 +41,8 @@ module.exports = {
4141
},
4242

4343
handleErrors(errorObject, logger, callback) {
44-
const { error, title } = errorObject;
45-
const handledError = commonHelper.handleErrorObject(error, title);
44+
const { error, title, name } = errorObject;
45+
const handledError = commonHelper.handleErrorObject(error || errorObject, title || name);
4646
logger.log('error', handledError, title);
4747
callback(handledError);
4848
},

reverse_engineering/helpers/dataHelper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const getServersData = (servers) => {
6666
if (!server.url) {
6767
return accum;
6868
}
69-
69+
7070
const variables = server.variables ? getServersVariables(server.variables) : [];
7171
return [...accum, {
7272
serverURL: server.url,
@@ -82,7 +82,7 @@ const getServersVariables = (variables) => {
8282
const variableData = variables[variable];
8383
return {
8484
serverVariableName: variable,
85-
serverVariableEnum: variableData.enum.map(enumVal => ({serverVariableEnumValue: enumVal})),
85+
serverVariableEnum: (variableData.enum || []).map(enumVal => ({serverVariableEnumValue: enumVal})),
8686
serverVariableDefault: variableData.default,
8787
serverVariableDescription: variableData.description,
8888
scopesExtensions: getExtensions(variables)

0 commit comments

Comments
 (0)