get base lib updates in

Author: jphenow

lib/param-parser.js

@@ -56,7 +56,12 @@ function parseFormDataParams (req, res, next) {
 
       if (param.type === "file") {
         // Validate the file (min/max size, etc.)
-        req.files[param.name] = parseParameter(param, req.files[param.name], param);
+        let file;
+        if (req.files && req.files[param.name] && req.files[param.name][0]) {
+          file = req.files[param.name][0];
+        }
+        const parsed = parseParameter(param, file, param);
+        req.files[param.name] = parsed;
       }
       else {
         // Parse the body parameter

lib/request-parser.js

@@ -7,10 +7,39 @@ const bodyParser = require("body-parser");
 const cookieParser = require("cookie-parser");
 const multer = require("multer");
 const tmp = require("tmp");
+const util = require("./helpers/util");
 
 // Clean-up the temp directory, even if the app crashes
 tmp.setGracefulCleanup();
 
+/**
+ * Generates a middleware that parses multipart/form-data
+ */
+function generateMultipartFormDataMiddleware (uploader) {
+  return function multipartFormData (req, res, next) {
+    if (util.isSwaggerRequest(req) && req.swagger.params.length > 0) {
+      let fileFields = [];
+
+      // Get all the "file" params
+      req.swagger.params.forEach((param) => {
+        if (param.in === "formData" && param.type === "file") {
+          fileFields.push({
+            name: param.name,
+            maxCount: 1
+          });
+        }
+      });
+
+      // Handle the multipart/form-data (even if it doesn't have any file fields)
+      let upload = uploader.fields(fileFields);
+      upload(req, res, next);
+    }
+    else {
+      next();
+    }
+  };
+}
+
 /**
  * Parses the HTTP request into useful objects.
  * This middleware populates {@link Request#params}, {@link Request#headers}, {@link Request#cookies},
@@ -29,37 +58,8 @@ function requestParser (options) {
     bodyParser.text(options.text),
     bodyParser.urlencoded(options.urlencoded),
     bodyParser.raw(options.raw),
-    multer(options.multipart)
+    generateMultipartFormDataMiddleware(multer(options.multipart))
   ];
-
-  //
-  // This code is for Multer 1.x.  But we're still using Multer 0.x until this bug is fixed:
-  // https://github.com/expressjs/multer/issues/212
-  //
-  // // Create a Multer uploader
-  // let uploader = multer(options.multipart);
-  //
-  // /**
-  // * Parses multipart/form-data
-  // */
-  // function multipartFormData(req, res, next) {
-  //  if (util.isSwaggerRequest(req) && req.swagger.params.length > 0) {
-  //    let fileFields = [];
-  //
-  //    // Get all the "file" params
-  //    req.swagger.params.forEach(function(param) {
-  //      if (param.in === 'formData' && param.type === 'file') {
-  //        fileFields.push({name: param.name, maxCount: 1});
-  //      }
-  //    });
-  //
-  //    // Handle the multipart/form-data (even if it doesn't have any file fields)
-  //    let upload = uploader.fields(fileFields);
-  //    upload(req, res, next);
-  //  }
-  //
-  //  next();
-  // }
 }
 
 requestParser.defaultOptions = {