From 3118508e9c17993a2722b677e3ed9fde85da7231 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 14 Sep 2014 19:35:51 +0200 Subject: [PATCH] fix(emails): send only if email found --- src/controllers/payments.js | 70 ++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/src/controllers/payments.js b/src/controllers/payments.js index 3feaae6b11..6529e99635 100644 --- a/src/controllers/payments.js +++ b/src/controllers/payments.js @@ -64,24 +64,27 @@ function createSubscription(user, data) { email = user.auth.facebook.emails[0].value; name = user.auth.facebook.displayName || user.auth.facebook.username; } - request({ - url: nconf.get('EMAIL_SERVER_URL') + '/job', - method: 'POST', - auth: { - user: nconf.get('EMAIL_SERVER_AUTH_USER'), - pass: nconf.get('EMAIL_SERVER_AUTH_PASSWORD') - }, - json: { - type: 'email', - data: { - emailType: 'subscription-begins', - to: { - name: req.user.displayName || req.user.username, - email: req.user.emails[0].value + + if(email) + request({ + url: nconf.get('EMAIL_SERVER_URL') + '/job', + method: 'POST', + auth: { + user: nconf.get('EMAIL_SERVER_AUTH_USER'), + pass: nconf.get('EMAIL_SERVER_AUTH_PASSWORD') + }, + json: { + type: 'email', + data: { + emailType: 'subscription-begins', + to: { + name: req.user.displayName || req.user.username, + email: req.user.emails[0].value + } } } - } - }); + }); + } } ga.transaction(data.customerId, 5).item(5, 1, data.paymentMethod.toLowerCase() + '-subscription', data.paymentMethod + " > Stripe").send(); } @@ -112,24 +115,27 @@ function buyGems(user, data) { email = user.auth.facebook.emails[0].value; name = user.auth.facebook.displayName || user.auth.facebook.username; } - request({ - url: nconf.get('EMAIL_SERVER_URL') + '/job', - method: 'POST', - auth: { - user: nconf.get('EMAIL_SERVER_AUTH_USER'), - pass: nconf.get('EMAIL_SERVER_AUTH_PASSWORD') - }, - json: { - type: 'email', - data: { - emailType: 'donation', - to: { - name: req.user.displayName || req.user.username, - email: req.user.emails[0].value + + if(email){ + request({ + url: nconf.get('EMAIL_SERVER_URL') + '/job', + method: 'POST', + auth: { + user: nconf.get('EMAIL_SERVER_AUTH_USER'), + pass: nconf.get('EMAIL_SERVER_AUTH_PASSWORD') + }, + json: { + type: 'email', + data: { + emailType: 'donation', + to: { + name: req.user.displayName || req.user.username, + email: req.user.emails[0].value + } } } - } - }); + }); + } } }