Merge pull request swagger-api#665 from jonocodes/https-scheme-fix

fehguy · fehguy · commit 1b5af99e6b5f · 2015-12-18T16:13:44.000-08:00
Https resolution based on url
diff --git a/lib/client.js b/lib/client.js
@@ -277,7 +277,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
     if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {
       this.scheme = location.scheme || 'http';
     } else if (typeof this.scheme === 'undefined') {
-      this.scheme = this.schemes[0];
+      this.scheme = this.schemes[0] || location.scheme;
     }
 
     if (typeof this.host === 'undefined' || this.host === '') {

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {`
`277`	`277`	`if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' \|\| this.schemes.length === 0) {`
`278`	`278`	`this.scheme = location.scheme \|\| 'http';`
`279`	`279`	`} else if (typeof this.scheme === 'undefined') {`
`280`		`- this.scheme = this.schemes[0];`
	`280`	`+ this.scheme = this.schemes[0] \|\| location.scheme;`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`if (typeof this.host === 'undefined' \|\| this.host === '') {`