Added download by id and support to send upload stream in req.filedata

lib/index.js

@@ -131,7 +131,15 @@ MongoStorage = (function() {
         return callback(null, res);
       })["catch"](callback);
     });
-    return req.pipe(busboy);
+    //return req.pipe(busboy);
+
+    // There may be a requirement to read the req stream before calling this function. e.g. to do virus scanning in temporary location.
+    // The file stream can again be attached to req.filedata and passed to this function in that case.
+    if (req.filedata) {
+		return req.filedata.pipe(busboy);
+	}else {
+		return req.pipe(busboy);
+	}
   };
 
   MongoStorage.prototype.uploadFile = function(container, file, options, callback) {
@@ -208,6 +216,46 @@ MongoStorage = (function() {
       return read.pipe(res);
     });
   };
+
+  MongoStorage.prototype.getFileById = function(container, fileId, callback) {
+	    return this.db.collection('fs.files').findOne({
+	      'metadata.mongo-storage': true,
+	      'metadata.container': container,
+	      '_id': new ObjectID(fileId)
+	    }, function(err, file) {
+	      if (err) {
+	        return callback(err);
+	      }
+	      if (!file) {
+	        err = new Error('File not found');
+	        err.status = 404;
+	        return callback(err);
+	      }
+	      return callback(null, file);
+	    });
+	  };
+  MongoStorage.prototype.downloadFileById = function(container, fileId, res, callback) {
+	    console.log("inside custom method");
+		var self;
+	    if (callback == null) {
+	      callback = (function() {});
+	    }
+	    self = this;
+	    return this.getFileById(container, fileId, function(err, file) {
+	      var gfs, read;
+	      if (err) {
+	        return callback(err);
+	      }
+	      gfs = Grid(self.db, mongodb);
+	      read = gfs.createReadStream({
+	        _id: file._id
+	      });
+	      res.set('Content-Disposition', "attachment; filename=\"" + file.filename + "\"");
+	      res.set('Content-Type', file.metadata.mimetype);
+	      res.set('Content-Length', file.length);
+	      return read.pipe(res);
+	    });
+	  };
 
   return MongoStorage;
 
@@ -377,11 +425,37 @@ MongoStorage.prototype.download.accepts = [
   }
 ];
 
+
+
 MongoStorage.prototype.download.http = {
   verb: 'get',
   path: '/:container/download/:file'
 };
 
+//New API endpoint to download file by id
+MongoStorage.prototype.downloadFileById.shared = true;
+
+MongoStorage.prototype.downloadFileById.accepts = [
+  {
+    arg: 'container',
+    type: 'string'
+  }, {
+    arg: 'fileId',
+    type: 'string'
+  }, {
+    arg: 'res',
+    type: 'object',
+    http: {
+      source: 'res'
+    }
+  }
+];
+
+MongoStorage.prototype.downloadFileById.http = {
+  verb: 'get',
+  path: '/:container/downloadFile/:fileId'
+};
+
 exports.initialize = function(dataSource, callback) {
   var connector, k, m, method, opt, ref, settings;
   settings = dataSource.settings || {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-component-storage-mongo",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "lib/index.js",
   "scripts": {