From ad42b93438225e3cd7518998bd7f067abf4cb756 Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 13 May 2017 19:00:24 +0000 Subject: handle upload correctly --- lib/awmail/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/awmail/index.js b/lib/awmail/index.js index 138e6ca..5ef6840 100644 --- a/lib/awmail/index.js +++ b/lib/awmail/index.js @@ -6,7 +6,7 @@ var textTemplate = fs.readFileSync('templates/email.txt', 'utf8') var mailgun = require('mailgun.js') var request = require('request') var multer = require('multer') -var Readable = require('stream').Readable +var PassThrough = require('stream').PassThrough var upload = require('../../node_modules/okcms/app/node_modules/okservices/oks3/upload') /* @@ -78,7 +78,7 @@ function AWMail (options) { }).then(function(){ console.log("all done") }).catch(function(err){ - console.log(err) + console.error(err.stack) }) res.sendStatus(200) @@ -120,6 +120,8 @@ function AWMail (options) { function uploadImage (data){ return Q.Promise(function(resolve, reject, notify) { + console.log(data.file) + upload.put({ file: data.file, preserveFilename: false, @@ -154,11 +156,9 @@ function AWMail (options) { } function sendMail (content){ - var s = new Readable() - s._read = function noop() {} - s.path = 'face.jpg' - s.push(content.image) - s.push(null) + var image = new PassThrough() + image.path = 'face.jpg' + image.end(content.image.buffer) return mg.messages.create(config.domain, { from: config.from, -- cgit v1.2.3-70-g09d2