swagger-client 2.1.32 → 2.2.21

package/lib/types/operation.js

@@ -21,7 +21,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     this.client = parent.options.client || null;
     this.requestInterceptor = parent.options.requestInterceptor || null;
     this.responseInterceptor = parent.options.responseInterceptor || null;
-    this.requestAgent = parent.options.requestAgent;
   }
   this.authorizations = args.security;
   this.basePath = parent.basePath || '/';
@@ -50,8 +49,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
   this.jqueryAjaxCache = parent.jqueryAjaxCache;
   this.enableCookies = parent.enableCookies;
 
-  var key;
-
   if(!this.host) {
     if(typeof window !== 'undefined') {
       this.host = window.location.host;
@@ -90,6 +87,8 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
 
   if (definitions) {
     // add to global models
+    var key;
+
     for (key in definitions) {
       model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);
 
@@ -103,7 +102,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
   }
 
   for (i = 0; i < this.parameters.length; i++) {
-    var d, param = this.parameters[i];
+    var param = this.parameters[i];
 
     // Allow macro to set the default value
     param.default = this.parameterMacro(this, param);
@@ -111,6 +110,10 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     if (param.type === 'array') {
       param.isList = true;
       param.allowMultiple = true;
+      // the enum can be defined at the items level
+      //if (param.items && param.items.enum) {
+      //  param['enum'] = param.items.enum;
+      //}
     }
 
     var innerType = this.getType(param);
@@ -121,15 +124,12 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
       param['enum'] = [true, false]; // use actual primitives
     }
 
-    for(key in param) {
-      helpers.extractExtensions(key, param);
-    }
     if(typeof param['x-example'] !== 'undefined') {
-      d = param['x-example'];
+      var d = param['x-example'];
       param.default = d;
     }
     if(param['x-examples']) {
-      d = param['x-examples'].default;
+      var d = param['x-examples'].default;
       if(typeof d !== 'undefined') {
         param.default = d;
       }
@@ -170,7 +170,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     param.responseClassSignature = param.signature;
   }
 
-  var keyname, defaultResponseCode, response, responses = this.responses;
+  var defaultResponseCode, response, responses = this.responses;
 
   if (responses['200']) {
     response = responses['200'];
@@ -198,30 +198,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     defaultResponseCode = 'default';
   }
 
-  for(keyname in responses) {
-    helpers.extractExtensions(keyname, responses);
-    if(typeof keyname === 'string' && keyname.indexOf('x-') === -1) {
-      var responseObject = responses[keyname];
-      if(typeof responseObject === 'object' && typeof responseObject.headers === 'object') {
-        var headers = responseObject.headers;
-        for(var headerName in headers) {
-          var header = headers[headerName];
-          if(typeof header === 'object') {
-            for(var headerKey in header) {
-              helpers.extractExtensions(headerKey, header);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (response) {
-    for(keyname in response) {
-      helpers.extractExtensions(keyname, response);
-    }
-  }
-
   if (response && response.schema) {
     var resolvedModel = this.resolveModel(response.schema, definitions);
     var successResponse;
@@ -242,7 +218,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     }
 
     if (successResponse) {
-      successResponse.vendorExtensions = response.vendorExtensions;
       // Attach response properties
       if (response.description) {
         successResponse.description = response.description;
@@ -491,7 +466,7 @@ Operation.prototype.getHeaderParams = function (args) {
   return headers;
 };
 
-Operation.prototype.urlify = function (args, maskPasswords) {
+Operation.prototype.urlify = function (args) {
   var formParams = {};
   var requestUrl = this.path.replace(/#.*/, ''); // remove URL fragment
   var querystring = ''; // grab params from the args, build the querystring along the way
@@ -500,21 +475,14 @@ Operation.prototype.urlify = function (args, maskPasswords) {
     var param = this.parameters[i];
 
     if (typeof args[param.name] !== 'undefined') {
-      var isPassword;
-      if(param.type === 'string' && param.format === 'password' && maskPasswords) {
-        isPassword = true;
-      }
-
       if (param.in === 'path') {
         var reg = new RegExp('\{' + param.name + '\}', 'gi');
         var value = args[param.name];
 
         if (Array.isArray(value)) {
-          value = this.encodePathCollection(param.collectionFormat, param.name, value, isPassword);
+          value = this.encodePathCollection(param.collectionFormat, param.name, value);
         } else {
-          if((typeof(param['x-escape']) === 'undefined') || (param['x-escape'] === true)) {
-            value = this.encodePathParam(value, isPassword);
-          }
+          value = this.encodePathParam(value);
         }
 
         requestUrl = requestUrl.replace(reg, value);
@@ -529,36 +497,16 @@ Operation.prototype.urlify = function (args, maskPasswords) {
           var qp = args[param.name];
 
           if (Array.isArray(qp)) {
-            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp, isPassword);
+            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp);
           } else {
-            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
+            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name]);
           }
         } else {
-          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
+          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name]);
         }
       } else if (param.in === 'formData') {
         formParams[param.name] = args[param.name];
       }
-    } else if(param.in === 'query' && typeof args[param.name] === 'undefined' && param.allowEmptyValue === true) {
-      if (querystring === '' && requestUrl.indexOf('?') < 0) {
-        querystring += '?';
-      } else {
-        querystring += '&';
-      }
-
-      if (typeof param.collectionFormat !== 'undefined' || param.type === 'array') {
-        var qp;
-        var collectionFormat = param.collectionFormat || 'multi';
-
-        if (Array.isArray(qp)) {
-          querystring += this.encodeQueryCollection(collectionFormat, param.name, qp, isPassword);
-        } else {
-          querystring += this.encodeQueryCollection(collectionFormat, param.name, [qp], isPassword);
-        }
-      } else {
-        querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam('', isPassword);
-      }
-
     }
   }
   var url = this.scheme + '://' + this.host;
@@ -587,23 +535,18 @@ Operation.prototype.getMissingParams = function (args) {
 };
 
 Operation.prototype.getBody = function (headers, args, opts) {
-  var formParams = {}, hasFormParams, param, body, key, value, hasBody = false;
+  var formParams = {}, hasFormParams, body, key, value, hasBody = false;
 
   // look at each param and put form params in an object
   for (var i = 0; i < this.parameters.length; i++) {
-    param = this.parameters[i];
+    var param = this.parameters[i];
     if (typeof args[param.name] !== 'undefined') {
-      var isPassword;
-      if(param.type === 'string' && param.format === 'password') {
-        isPassword = 'password';
-      }
       if (param.in === 'body') {
         body = args[param.name];
       } else if (param.in === 'formData') {
         formParams[param.name] = {
           param: param,
-          value: args[param.name],
-          password: isPassword
+          value: args[param.name]
         };
         hasFormParams = true;
       }
@@ -633,27 +576,22 @@ Operation.prototype.getBody = function (headers, args, opts) {
     var encoded = '';
 
     for (key in formParams) {
-      param = formParams[key].param;
+      var param = formParams[key].param;
       value = formParams[key].value;
-      var password;
-
-      if(opts && opts.maskPasswords) {
-        password = formParams[key].password;
-      }
 
       if (typeof value !== 'undefined') {
         if (Array.isArray(value)) {
           if (encoded !== '') {
             encoded += '&';
           }
-          encoded += this.encodeQueryCollection(param.collectionFormat, key, value, password);
+          encoded += this.encodeQueryCollection(param.collectionFormat, key, value);
         }
         else {
           if (encoded !== '') {
             encoded += '&';
           }
 
-          encoded += encodeURIComponent(key) + '=' + mask(encodeURIComponent(value), password);
+          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
         }
       }
     }
@@ -667,7 +605,7 @@ Operation.prototype.getBody = function (headers, args, opts) {
       bodyParam.type = 'formData';
 
       for (key in formParams) {
-        param = formParams[key].param;
+        var param = formParams[key].param;
         value = args[key];
 
         if (typeof value !== 'undefined') {
@@ -805,16 +743,14 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     error = arg4;
   }
 
-  timeout = typeof opts.timeout !== 'undefined' ? opts.timeout : this.timeout;
+  timeout = typeof opts.timeout !== 'undefined'
+    ? opts.timeout
+    : this.timeout;
 
   if(this.client) {
     opts.client = this.client;
   }
 
-  if(this.requestAgent) {
-    opts.requestAgent = this.requestAgent;
-  }
-
   // add the request interceptor from parent, if none sent from client
   if(!opts.requestInterceptor && this.requestInterceptor ) {
     opts.requestInterceptor = this.requestInterceptor ;
@@ -872,7 +808,7 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
   for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
 
   var body = this.getBody(contentTypeHeaders, args, opts);
-  var url = this.urlify(args, opts.maskPasswords);
+  var url = this.urlify(args);
 
   if(url.indexOf('.{format}') > 0) {
     if(headers) {
@@ -896,8 +832,6 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     deferred: deferred,
     headers: headers,
     clientAuthorizations: opts.clientAuthorizations,
-    operation: this,
-    connectionAgent: this.connectionAgent,
     on: {
       response: function (response) {
         if (deferred) {
@@ -924,9 +858,6 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
 
   this.clientAuthorizations.apply(obj, this.operation.security);
   if (opts.mock === true) {
-    if(opts.requestInterceptor) {
-      opts.requestInterceptor.apply(obj);
-    }
     return obj;
   } else {
     return new SwaggerHttp().execute(obj, opts);
@@ -1057,7 +988,7 @@ Operation.prototype.matchesAccept = function(accepts) {
 };
 
 Operation.prototype.asCurl = function (args1, args2) {
-  var opts = {mock: true, maskPasswords: true};
+  var opts = {mock: true};
   if (typeof args2 === 'object') {
     for (var argKey in args2) {
       opts[argKey] = args2[argKey];
@@ -1124,14 +1055,14 @@ Operation.prototype.asCurl = function (args1, args2) {
                 if (Array.isArray(paramValue)) {
                   if(parameter.collectionFormat === 'multi') {
                     for(var v in paramValue) {
-                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue[v], parameter.format) + ' ';
+                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + paramValue[v] + ' ';
                     }
                   }
                   else {
-                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, mask(paramValue, parameter.format)) + ' ';
+                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, paramValue) + ' ';
                   }
                 } else {
-                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue, parameter.format) + ' ';
+                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + paramValue + ' ';
                 }
               }
             }
@@ -1162,7 +1093,7 @@ Operation.prototype.asCurl = function (args1, args2) {
   return 'curl ' + (results.join(' ')) + ' \'' + obj.url + '\'';
 };
 
-Operation.prototype.encodePathCollection = function (type, name, value, maskPasswords) {
+Operation.prototype.encodePathCollection = function (type, name, value) {
   var encoded = '';
   var i;
   var separator = '';
@@ -1179,16 +1110,16 @@ Operation.prototype.encodePathCollection = function (type, name, value, maskPass
 
   for (i = 0; i < value.length; i++) {
     if (i === 0) {
-      encoded = this.encodeQueryParam(value[i], maskPasswords);
+      encoded = this.encodeQueryParam(value[i]);
     } else {
-      encoded += separator + this.encodeQueryParam(value[i], maskPasswords);
+      encoded += separator + this.encodeQueryParam(value[i]);
     }
   }
 
   return encoded;
 };
 
-Operation.prototype.encodeQueryCollection = function (type, name, value, maskPasswords) {
+Operation.prototype.encodeQueryCollection = function (type, name, value) {
   var encoded = '';
   var i;
 
@@ -1197,7 +1128,7 @@ Operation.prototype.encodeQueryCollection = function (type, name, value, maskPas
     for (i = 0; i < value.length; i++) {
       if (i > 0) {encoded += '&';}
 
-      encoded += this.encodeQueryKey(name) + '=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
+      encoded += this.encodeQueryKey(name) + '=' + this.encodeQueryParam(value[i]);
     }
   } else {
     var separator = '';
@@ -1215,7 +1146,8 @@ Operation.prototype.encodeQueryCollection = function (type, name, value, maskPas
         if (i !== 0) {
           encoded += '&';
         }
-        encoded += this.encodeQueryKey(name) + '[]=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
+
+        encoded += this.encodeQueryKey(name) + '[]=' + this.encodeQueryParam(value[i]);
       }
     }
 
@@ -1238,28 +1170,13 @@ Operation.prototype.encodeQueryKey = function (arg) {
       .replace('%5B','[').replace('%5D', ']').replace('%24', '$');
 };
 
-Operation.prototype.encodeQueryParam = function (arg, maskPasswords) {
-  if(maskPasswords) {
-    return "******";
-  }
-  if(arg !== undefined && arg !== null) {
-    return encodeURIComponent(arg);
-  }
-  else {
-    return '';
-  }
+Operation.prototype.encodeQueryParam = function (arg) {
+  return encodeURIComponent(arg);
 };
 
 /**
  * TODO revisit, might not want to leave '/'
  **/
-Operation.prototype.encodePathParam = function (pathParam, maskPasswords) {
-  return encodeURIComponent(pathParam, maskPasswords);
+Operation.prototype.encodePathParam = function (pathParam) {
+  return encodeURIComponent(pathParam);
 };
-
-var mask = function(value, format) {
-  if(typeof format === 'string' && format === 'password') {
-    return '******';
-  }
-  return value;
-}

package/package.json

@@ -8,7 +8,7 @@
     }
   ],
   "description": "swagger-client is a javascript client for use with swaggering APIs.",
-  "version": "2.1.32",
+  "version": "2.2.21",
   "homepage": "http://swagger.io",
   "repository": {
     "type": "git",
@@ -55,7 +55,6 @@
     "gulp-istanbul": "^0.5.0",
     "gulp-jshint": "^1.9.0",
     "gulp-mocha": "^2.0.0",
-    "gulp-sourcemaps": "^1.0.0",
     "http-server": "^0.8.0",
     "jshint-stylish": "^1.0.1",
     "karma": "^0.13.0",