Skip to content

Commit ec7f06e

Browse files
Merge pull request #134 from luckymarmot/133-improve-validation-swagger
133 improve validation swagger
2 parents 004c58e + 3f40445 commit ec7f06e

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/loaders/swagger/Loader.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,22 @@ methods.fixRemotePaths = (options, uri, swagger) => {
159159
})
160160
}
161161

162+
methods.fixImplicitHost = (uri) => {
163+
if (!uri) {
164+
return 'localhost'
165+
}
166+
167+
const host = parse(uri).host
168+
if (!host) {
169+
return 'localhost'
170+
}
171+
172+
return host
173+
}
174+
162175
methods.fixImplicitUriReferences = (options, uri, swagger) => {
163176
if (!swagger.host) {
164-
swagger.host = uri ? parse(uri).host : 'localhost'
177+
swagger.host = methods.fixImplicitHost(uri)
165178
}
166179

167180
if (!swagger.schemes || !swagger.schemes.length) {

src/parsers/swagger/v2.0/Parser.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ methods.handleUnkownFormat = () => {
8989
* @returns {void}
9090
*/
9191
methods.handleInvalidSwagger = () => {
92-
const message = 'Invalid Swagger File (invalid schema / version < 2.0)\n' + tv4.error
92+
const message = 'Invalid Swagger File (invalid schema / version < 2.0)\n' +
93+
tv4.error + '\n' +
94+
'Potential culprit: ' + tv4.error.dataPath
9395
const error = new __errors__.NotASwaggerV2(message)
9496
throw error
9597
}

0 commit comments

Comments
 (0)