swagger-client 2.1.29 → 2.2.21

package/lib/http.js

@@ -38,10 +38,6 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   }
   client.opts = opts || {};
 
-  if (opts && opts.requestAgent) {
-    request = opts.requestAgent;
-  }
-
   // legacy support
   var hasJQuery = false;
   if(typeof window !== 'undefined') {
@@ -73,14 +69,14 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
 
   var responseInterceptor = function(data) {
     if(opts && opts.responseInterceptor) {
-      data = opts.responseInterceptor.apply(data, [obj]);
+      data = opts.responseInterceptor.apply(data);
     }
     return success(data);
   };
 
   var errorInterceptor = function(data) {
     if(opts && opts.responseInterceptor) {
-      data = opts.responseInterceptor.apply(data, [obj]);
+      data = opts.responseInterceptor.apply(data);
     }
     error(data);
   };
@@ -90,12 +86,7 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   };
 
   obj.on.response = function(data) {
-    if(data && data.status >= 400) {
-      errorInterceptor(data);
-    }
-    else {
-      responseInterceptor(data);
-    }
+    responseInterceptor(data);
   };
 
   if (_.isObject(obj) && _.isObject(obj.body)) {
@@ -223,13 +214,8 @@ SuperagentHttpClient.prototype.execute = function (obj) {
     method = 'del';
   }
   var headers = obj.headers || {};
-
   var r = request[method](obj.url);
 
-  if (obj.connectionAgent) {
-    r.agent(obj.connectionAgent);
-  }
-
   if (timeout) {
     r.timeout(timeout);
   }
@@ -254,7 +240,33 @@ SuperagentHttpClient.prototype.execute = function (obj) {
       if (contentType.indexOf('multipart/form-data') === 0) {
         delete headers['Content-Type'];
         if({}.toString.apply(obj.body) === '[object FormData]') {
-          r.send(obj.body);
+          var itr = obj.body.keys();
+          var p = [];
+          while(true) {
+            var v = itr.next();
+            if(v.done) {
+              break;
+            }
+            var key = v.value;
+            // only once
+            if(p.indexOf(key) === -1) {
+              p.push(key);
+              var value = obj.body.getAll(key);
+              if({}.toString.apply(value) === '[object File]') {
+                r.attach(key, value);
+              }
+              else {
+                if (Array.isArray(value)) {
+                  for (var t in value) {
+                    r.field(key, value[t]);
+                  }
+                }
+                else {
+                  r.field(key, value);
+                }
+              }
+            }
+          }
         }
         else {
           var keyname, value, v;
@@ -272,7 +284,6 @@ SuperagentHttpClient.prototype.execute = function (obj) {
         }
       }
       else if (_.isObject(obj.body)) {
-        // non multipart/form-data
         obj.body = JSON.stringify(obj.body);
         r.send(obj.body);
       }
@@ -367,7 +378,5 @@ SuperagentHttpClient.prototype. binaryRequest = function (accept) {
   if(!accept) {
     return false;
   }
-  return (/^image/i).test(accept)
-    || (/^application\/pdf/).test(accept)
-    || (/^application\/octet-stream/).test(accept);
+  return (/^image/i).test(accept) || (/^application\/pdf/).test(accept);
 };

package/lib/resolver.js

@@ -44,7 +44,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     callback = arg1;
     scope = arg2;
   }
-  var _root = root, modelName;
+  var _root = root;
   this.scope = (scope || this);
   this.iteration = this.iteration || 0;
 
@@ -56,7 +56,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     opts.responseInterceptor = this.scope.options.responseInterceptor;
   }
 
-  var name, path, property, propertyName, parameter, done, counter;
+  var name, path, property, propertyName;
   var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};
   var resolutionTable = []; // store objects for dereferencing
 
@@ -64,7 +64,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   // definitions
   for (name in spec.definitions) {
     var definition = spec.definitions[name];
-    if(definition.$ref) {
+    if(definition['$ref']) {
       this.resolveInline(root, spec, definition, resolutionTable, unresolvedRefs, definition);
     }
     else {
@@ -87,25 +87,25 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   // shared parameters
   spec.parameters = spec.parameters || {};
   for(name in spec.parameters) {
-    parameter = spec.parameters[name];
+    var parameter = spec.parameters[name];
     if (parameter.in === 'body' && parameter.schema) {
       if(_.isArray(parameter.schema.allOf)) {
         // move to a definition
-        modelName = 'inline_model';
-        var _name = modelName;
-        done = false; counter = 0;
+        var modelName = 'inline_model';
+        var name = modelName;
+        var done = false; var counter = 0;
         while(!done) {
-          if(typeof spec.definitions[_name] === 'undefined') {
+          if(typeof spec.definitions[name] === 'undefined') {
             done = true;
             break;
           }
-          _name = modelName + '_' + counter;
+          name = modelName + '_' + counter;
           counter ++;
         }
-        spec.definitions[_name] = { allOf: parameter.schema.allOf };
+        spec.definitions[name] = { allOf: parameter.schema.allOf };
         delete parameter.schema.allOf;
-        parameter.schema.$ref = '#/definitions/' + _name;
-        this.processAllOf(root, _name, spec.definitions[_name], resolutionTable, unresolvedRefs, spec);
+        parameter.schema.$ref = '#/definitions/' + name;
+        this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
       }
       else {
         this.resolveTo(root, parameter.schema, resolutionTable, location);
@@ -123,110 +123,106 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     var method, operation, responseCode;
     path = spec.paths[name];
 
-    if(typeof path === 'object') {
-      for (method in path) {
-        // operation reference
-        if (method === '$ref') {
-          // location = path[method];
-          location = '/paths' + name;
-          this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);
+    for (method in path) {
+      // operation reference
+      if(method === '$ref') {
+        // location = path[method];
+        location = '/paths' + name;
+        this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);
+      }
+      else {
+        operation = path[method];
+        var sharedParameters = path.parameters || [];
+        var parameters = operation.parameters || [];
+
+        for (i in sharedParameters) {
+          var parameter = sharedParameters[i];
+          parameters.unshift(parameter);
+        }
+        if(method !== 'parameters' && _.isObject(operation)) {
+          operation.parameters = operation.parameters || parameters;
         }
-        else {
-          operation = path[method];
-          var sharedParameters = path.parameters || [];
-          var parameters = operation.parameters || [];
 
-          sharedParameters.forEach(function(parameter) {
-            parameters.unshift(parameter);
-          });
+        for (i in parameters) {
+          var parameter = parameters[i];
+          location = '/paths' + name + '/' + method + '/parameters';
+
+          if (parameter.in === 'body' && parameter.schema) {
+            if(_.isArray(parameter.schema.allOf)) {
+              // move to a definition
+              var modelName = 'inline_model';
+              var name = modelName;
+              var done = false; var counter = 0;
+              while(!done) {
+                if(typeof spec.definitions[name] === 'undefined') {
+                  done = true;
+                  break;
+                }
+                name = modelName + '_' + counter;
+                counter ++;
+              }
+              spec.definitions[name] = { allOf: parameter.schema.allOf };
+              delete parameter.schema.allOf;
+              parameter.schema.$ref = '#/definitions/' + name;
+              this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
+            }
+            else {
+              this.resolveTo(root, parameter.schema, resolutionTable, location);
+            }
+          }
 
-          if (method !== 'parameters' && _.isObject(operation)) {
-            operation.parameters = operation.parameters || parameters;
+          if (parameter.$ref) {
+            // parameter reference
+            this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
           }
+        }
 
-          for (i in parameters) {
-            parameter = parameters[i];
-            location = '/paths' + name + '/' + method + '/parameters';
+        for (responseCode in operation.responses) {
+          var response = operation.responses[responseCode];
+          location = '/paths' + name + '/' + method + '/responses/' + responseCode;
 
-            if (parameter.in === 'body' && parameter.schema) {
-              if (_.isArray(parameter.schema.allOf)) {
+          if(_.isObject(response)) {
+            if(response.$ref) {
+              // response reference
+              this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
+            }
+            if (response.schema) {
+              var responseObj = response;
+              if(_.isArray(responseObj.schema.allOf)) {
                 // move to a definition
-                modelName = 'inline_model';
-                name = modelName;
-                done = false;
-                counter = 0;
-                while (!done) {
-                  if (typeof spec.definitions[name] === 'undefined') {
+                var modelName = 'inline_model';
+                var name = modelName;
+                var done = false; var counter = 0;
+                while(!done) {
+                  if(typeof spec.definitions[name] === 'undefined') {
                     done = true;
                     break;
                   }
                   name = modelName + '_' + counter;
-                  counter++;
+                  counter ++;
                 }
-                spec.definitions[name] = {allOf: parameter.schema.allOf};
-                delete parameter.schema.allOf;
-                parameter.schema.$ref = '#/definitions/' + name;
+                spec.definitions[name] = { allOf: responseObj.schema.allOf };
+                delete responseObj.schema.allOf;
+                delete responseObj.schema.type;
+                responseObj.schema.$ref = '#/definitions/' + name;
                 this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
               }
-              else {
-                this.resolveTo(root, parameter.schema, resolutionTable, location);
-              }
-            }
-
-            if (parameter.$ref) {
-              // parameter reference
-              this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
-            }
-          }
-
-          for (responseCode in operation.responses) {
-            var response = operation.responses[responseCode];
-            location = '/paths' + name + '/' + method + '/responses/' + responseCode;
-
-            if (_.isObject(response)) {
-              if (response.$ref) {
-                // response reference
-                this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
-              }
-              if (response.schema) {
-                var responseObj = response;
-                if (_.isArray(responseObj.schema.allOf)) {
-                  // move to a definition
-                  modelName = 'inline_model';
-                  name = modelName;
-                  done = false;
-                  counter = 0;
-                  while (!done) {
-                    if (typeof spec.definitions[name] === 'undefined') {
-                      done = true;
-                      break;
-                    }
-                    name = modelName + '_' + counter;
-                    counter++;
-                  }
-                  spec.definitions[name] = {allOf: responseObj.schema.allOf};
-                  delete responseObj.schema.allOf;
-                  delete responseObj.schema.type;
-                  responseObj.schema.$ref = '#/definitions/' + name;
-                  this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
-                }
-                else if ('array' === responseObj.schema.type) {
-                  if (responseObj.schema.items && responseObj.schema.items.$ref) {
-                    // response reference
-                    this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);
-                  }
-                }
-                else {
-                  this.resolveTo(root, response.schema, resolutionTable, location);
+              else if('array' === responseObj.schema.type) {
+                if(responseObj.schema.items && responseObj.schema.items.$ref) {
+                  // response reference
+                  this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);
                 }
               }
+              else {
+                this.resolveTo(root, response.schema, resolutionTable, location);
+              }
             }
           }
         }
       }
-      // clear them out to avoid multiple resolutions
-      path.parameters = [];
     }
+    // clear them out to avoid multiple resolutions
+    path.parameters = [];
   }
 
   var expectedCalls = 0, toResolve = [];
@@ -389,7 +385,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
             else {
               var cached = self.resolverCache[obj.url];
               if (_.isObject(cached)) {
-                obj.on.response({obj: cached});
+                obj.on.response({obj: cached}), 1;
               }
               else {
                 lock[obj.url] = true;
@@ -467,7 +463,7 @@ Resolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedR
 
 Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {
   // walk resolution table and replace with resolved refs
-  var ref, abs;
+  var ref;
   for (ref in resolutionTable) {
     var item = resolutionTable[ref];
 
@@ -479,7 +475,7 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
         if (localResolve !== true) {
           // don't retain root for local definitions
           for (key in resolvedTo.obj) {
-            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
+            var abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
             resolvedTo.obj[key] = abs;
           }
         }
@@ -491,7 +487,7 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
         delete targetObj.$ref;
 
         for (key in resolvedTo.obj) {
-          abs = resolvedTo.obj[key];
+          var abs = resolvedTo.obj[key];
 
           if (localResolve !== true) {
             // don't retain root for local definitions
@@ -670,7 +666,7 @@ Resolver.prototype.resolveInline = function (root, spec, property, resolutionTab
   var key = property.$ref, ref = property.$ref, i, p, p2, rs;
   var rootTrimmed = false;
 
-  root = root || ''; // Guard against .split. @fehguy, you'll need to check if this logic fits
+  root = root || '' // Guard against .split. @fehguy, you'll need to check if this logic fits
   // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?
 
   if (ref) {
@@ -810,7 +806,7 @@ Resolver.prototype.resolveTo = function (root, property, resolutionTable, locati
       }
       delete property.title;
       this.spec.definitions[name] = _.cloneDeep(property);
-      property.$ref = '#/definitions/' + name;
+      property['$ref'] = '#/definitions/' + name;
       delete property.type;
       delete property.properties;
     }

package/lib/schema-markup.js

@@ -15,11 +15,17 @@ var _ = {
   forEach: require('lodash-compat/collection/forEach')
 };
 
-var optionHtml = module.exports.optionHtml = function  (label, value) {
+module.exports.optionHtml = optionHtml;
+module.exports.typeFromJsonSchema = typeFromJsonSchema;
+module.exports.getStringSignature = getStringSignature;
+module.exports.schemaToHTML = schemaToHTML;
+module.exports.schemaToJSON = schemaToJSON;
+
+function optionHtml(label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-};
+}
 
-module.exports.typeFromJsonSchema = function (type, format) {
+function typeFromJsonSchema(type, format) {
   var str;
 
   if (type === 'integer' && format === 'int32') {
@@ -45,9 +51,9 @@ module.exports.typeFromJsonSchema = function (type, format) {
   }
 
   return str;
-};
+}
 
-var getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {
+function getStringSignature(obj, baseComponent) {
   var str = '';
 
   if (typeof obj.$ref !== 'undefined') {
@@ -89,9 +95,9 @@ var getStringSignature = module.exports.getStringSignature = function (obj, base
   }
 
   return str;
-};
+}
 
-var schemaToJSON = module.exports.schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {
+function schemaToJSON(schema, models, modelsToIgnore, modelPropertyMacro) {
   // Resolve the schema (Handle nested schemas)
   schema = Helpers.resolveSchema(schema);
 
@@ -176,9 +182,10 @@ var schemaToJSON = module.exports.schemaToJSON = function (schema, models, model
   }
 
   return output;
-};
+}
+
+function schemaToHTML(name, schema, models, modelPropertyMacro) {
 
-module.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro) {
   var strongOpen = '<span class="strong">';
   var strongClose = '</span>';
 
@@ -523,4 +530,4 @@ module.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro)
 
     return html + strongOpen + (isArray ? ']' : '}') + strongClose;
   }
-};
+}

package/lib/spec-converter.js

@@ -557,9 +557,7 @@ SwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {
     var name;
     for(name in obj.authorizations) {
       var isValid = false;
-      var securityDefinition = {
-        vendorExtensions: {}
-      };
+      var securityDefinition = {};
       var definition = obj.authorizations[name];
       if(definition.type === 'apiKey') {
         securityDefinition.type = 'apiKey';