From 97d23f61dee683d45a5ccf69d037928a3f9baea1 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Mon, 20 Oct 2014 07:27:06 -0700
Subject: [PATCH] fix for https://github.com/wordnik/swagger-ui/issues/644,
 verify path object by type

---
 dist/index.html            |  3 +-
 dist/lib/swagger-client.js | 94 +++++++++++++++++++-------------------
 lib/swagger-client.js      | 94 +++++++++++++++++++-------------------
 3 files changed, 98 insertions(+), 93 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 310e228f..ba339583 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -19,7 +19,7 @@
   <script src='lib/swagger-client.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
   <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-
+<script src='spec.js' type='text/javascript'></script>
   <!-- enabling this will enable oauth2 implicit scope support -->
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
   <script type="text/javascript">
@@ -32,6 +32,7 @@
       }
       window.swaggerUi = new SwaggerUi({
         url: url,
+        spec: spec,
         dom_id: "swagger-ui-container",
         supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
         onComplete: function(swaggerApi, swaggerUi){
diff --git a/dist/lib/swagger-client.js b/dist/lib/swagger-client.js
index cb1f6067..567dc8e9 100644
--- a/dist/lib/swagger-client.js
+++ b/dist/lib/swagger-client.js
@@ -412,56 +412,58 @@ SwaggerClient.prototype.buildFromSpec = function(response) {
   var path;
   var operations = [];
   for(path in response.paths) {
-    var httpMethod;
-    for(httpMethod in response.paths[path]) {
-      var operation = response.paths[path][httpMethod];
-      var tags = operation.tags;
-      if(typeof tags === 'undefined') {
-        operation.tags = [ 'default' ];
-        tags = operation.tags;
-      }
-      var operationId = this.idFromOp(path, httpMethod, operation);
-      var operationObject = new Operation (
-        this,
-        operationId,
-        httpMethod,
-        path,
-        operation,
-        this.definitions
-      );
-      // bind this operation's execute command to the api
-      if(tags.length > 0) {
-        var i;
-        for(i = 0; i < tags.length; i++) {
-          var tag = this.tagFromLabel(tags[i]);
-          var operationGroup = this[tag];
-          if(typeof operationGroup === 'undefined') {
-            this[tag] = [];
-            operationGroup = this[tag];
-            operationGroup.label = tag;
-            operationGroup.apis = [];
-            this[tag].help = this.help.bind(operationGroup);
-            this.apisArray.push(new OperationGroup(tag, operationObject));
-          }
-          operationGroup[operationId] = operationObject.execute.bind(operationObject);
-          operationGroup[operationId].help = operationObject.help.bind(operationObject);
-          operationGroup.apis.push(operationObject);
+    if(typeof response.paths[path] === 'object') {
+      var httpMethod;
+      for(httpMethod in response.paths[path]) {
+        var operation = response.paths[path][httpMethod];
+        var tags = operation.tags;
+        if(typeof tags === 'undefined') {
+          operation.tags = [ 'default' ];
+          tags = operation.tags;
+        }
+        var operationId = this.idFromOp(path, httpMethod, operation);
+        var operationObject = new Operation (
+          this,
+          operationId,
+          httpMethod,
+          path,
+          operation,
+          this.definitions
+        );
+        // bind this operation's execute command to the api
+        if(tags.length > 0) {
+          var i;
+          for(i = 0; i < tags.length; i++) {
+            var tag = this.tagFromLabel(tags[i]);
+            var operationGroup = this[tag];
+            if(typeof operationGroup === 'undefined') {
+              this[tag] = [];
+              operationGroup = this[tag];
+              operationGroup.label = tag;
+              operationGroup.apis = [];
+              this[tag].help = this.help.bind(operationGroup);
+              this.apisArray.push(new OperationGroup(tag, operationObject));
+            }
+            operationGroup[operationId] = operationObject.execute.bind(operationObject);
+            operationGroup[operationId].help = operationObject.help.bind(operationObject);
+            operationGroup.apis.push(operationObject);
 
-          // legacy UI feature
-          var j;
-          var api;
-          for(j = 0; j < this.apisArray.length; j++) {
-            if(this.apisArray[j].tag === tag) {
-              api = this.apisArray[j];
+            // legacy UI feature
+            var j;
+            var api;
+            for(j = 0; j < this.apisArray.length; j++) {
+              if(this.apisArray[j].tag === tag) {
+                api = this.apisArray[j];
+              }
+            }
+            if(api) {
+              api.operationsArray.push(operationObject);
             }
           }
-          if(api) {
-            api.operationsArray.push(operationObject);
-          }
         }
-      }
-      else {
-        log('no group to bind to');
+        else {
+          log('no group to bind to');
+        }
       }
     }
   }
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
index cb1f6067..567dc8e9 100644
--- a/lib/swagger-client.js
+++ b/lib/swagger-client.js
@@ -412,56 +412,58 @@ SwaggerClient.prototype.buildFromSpec = function(response) {
   var path;
   var operations = [];
   for(path in response.paths) {
-    var httpMethod;
-    for(httpMethod in response.paths[path]) {
-      var operation = response.paths[path][httpMethod];
-      var tags = operation.tags;
-      if(typeof tags === 'undefined') {
-        operation.tags = [ 'default' ];
-        tags = operation.tags;
-      }
-      var operationId = this.idFromOp(path, httpMethod, operation);
-      var operationObject = new Operation (
-        this,
-        operationId,
-        httpMethod,
-        path,
-        operation,
-        this.definitions
-      );
-      // bind this operation's execute command to the api
-      if(tags.length > 0) {
-        var i;
-        for(i = 0; i < tags.length; i++) {
-          var tag = this.tagFromLabel(tags[i]);
-          var operationGroup = this[tag];
-          if(typeof operationGroup === 'undefined') {
-            this[tag] = [];
-            operationGroup = this[tag];
-            operationGroup.label = tag;
-            operationGroup.apis = [];
-            this[tag].help = this.help.bind(operationGroup);
-            this.apisArray.push(new OperationGroup(tag, operationObject));
-          }
-          operationGroup[operationId] = operationObject.execute.bind(operationObject);
-          operationGroup[operationId].help = operationObject.help.bind(operationObject);
-          operationGroup.apis.push(operationObject);
+    if(typeof response.paths[path] === 'object') {
+      var httpMethod;
+      for(httpMethod in response.paths[path]) {
+        var operation = response.paths[path][httpMethod];
+        var tags = operation.tags;
+        if(typeof tags === 'undefined') {
+          operation.tags = [ 'default' ];
+          tags = operation.tags;
+        }
+        var operationId = this.idFromOp(path, httpMethod, operation);
+        var operationObject = new Operation (
+          this,
+          operationId,
+          httpMethod,
+          path,
+          operation,
+          this.definitions
+        );
+        // bind this operation's execute command to the api
+        if(tags.length > 0) {
+          var i;
+          for(i = 0; i < tags.length; i++) {
+            var tag = this.tagFromLabel(tags[i]);
+            var operationGroup = this[tag];
+            if(typeof operationGroup === 'undefined') {
+              this[tag] = [];
+              operationGroup = this[tag];
+              operationGroup.label = tag;
+              operationGroup.apis = [];
+              this[tag].help = this.help.bind(operationGroup);
+              this.apisArray.push(new OperationGroup(tag, operationObject));
+            }
+            operationGroup[operationId] = operationObject.execute.bind(operationObject);
+            operationGroup[operationId].help = operationObject.help.bind(operationObject);
+            operationGroup.apis.push(operationObject);
 
-          // legacy UI feature
-          var j;
-          var api;
-          for(j = 0; j < this.apisArray.length; j++) {
-            if(this.apisArray[j].tag === tag) {
-              api = this.apisArray[j];
+            // legacy UI feature
+            var j;
+            var api;
+            for(j = 0; j < this.apisArray.length; j++) {
+              if(this.apisArray[j].tag === tag) {
+                api = this.apisArray[j];
+              }
+            }
+            if(api) {
+              api.operationsArray.push(operationObject);
             }
           }
-          if(api) {
-            api.operationsArray.push(operationObject);
-          }
         }
-      }
-      else {
-        log('no group to bind to');
+        else {
+          log('no group to bind to');
+        }
       }
     }
   }