diff options
Diffstat (limited to 'lib/awmail')
| -rw-r--r-- | lib/awmail/index.js | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/lib/awmail/index.js b/lib/awmail/index.js index d0f89d5..64bb9ac 100644 --- a/lib/awmail/index.js +++ b/lib/awmail/index.js @@ -13,7 +13,7 @@ var upload = require('../../node_modules/okcms/app/node_modules/okservices/oks3/ awmail: { lib: require("./lib/awmail"), apikey: process.env.MAILGUN_API_KEY, - domain: process.env.MAILGUN_DOMAIN, + domain: process.env.MAILGUN_DOMAIN, from: 'Postmaster <mail@example.com>', subject: 'Your Result', } @@ -45,11 +45,11 @@ function AWMail (options) { var email = req.body.email var track = req.body.track - var secret = req.body.secret + var secret = req.body.secret - if (secret !== config.secret) { - return res.sendStatus(500) - } + if (secret !== config.secret) { + return res.sendStatus(500) + } deferToNextTick().then(function(){ console.log("upload image") @@ -86,26 +86,22 @@ function AWMail (options) { res.sendStatus(200) }) - router.post('/feedback', function (req, res) { + router.post('/feedback', mult.array(), function (req, res) { res.header('Access-Control-Allow-Origin', '*') res.header('Access-Control-Allow-Headers', 'X-Requested-With') var email = req.body.email var message = req.body.message var track = req.body.track - var secret = req.body.secret + var secret = req.body.secret - if (secret !== config.secret) { - return res.sendStatus(500) - } + if (secret !== config.secret) { + return res.sendStatus(500) + } deferToNextTick().then(function(){ console.log("store message") - if (String(track) === 'true') { - return storeMessage(email, message) - } else { - return Q.Promise(function(resolve, reject, notify) { resolve() }) - } + return storeMessage(email, message) }).then(function(){ console.log("store email") if (String(track) === 'true') { @@ -229,12 +225,12 @@ function AWMail (options) { return Q.Promise(function(resolve, reject, notify) { var data = {} data['Email'] = mail - data['Message'] = message data['entry.1436672940'] = mail + data['Message'] = message data['entry.2103257301'] = message data['fvv'] = "1" - var url = "https://docs.google.com/forms/d/e/1FAIpQLSdWDnpy4ZF1dJwfAcX5CUITpjbLqLC7rS7nr2iSQrEeGXM1bQ/formResponse" + var url = "https://docs.google.com/forms/d/e/1FAIpQLSdWDnpy4ZF1dJwfAcX5CUITpjbLqLC7rS7nr2iSQrEeGXM1bQ/formResponse" request({ url: url, qs: data }, function (err, response, body) { if (err || response.statusCode !== 200) { |