Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 15:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to nodemailer 2.0 syntax for smtpTransport

Browse Source 
Fixes #4193
This commit is contained in:
Terry Tate
2016-02-21 17:13:44 +00:00
parent d43a45d0b8
commit 3e75c6f6a3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -57,6 +57,7 @@
"nodebb-widget-essentials": "2.0.6", "nodebb-widget-essentials": "2.0.6",
"nodemailer": "2.0.0", "nodemailer": "2.0.0",
"nodemailer-sendmail-transport": "1.0.0", "nodemailer-sendmail-transport": "1.0.0",
"nodemailer-smtp-transport": "1.0.0",
"passport": "^0.3.0", "passport": "^0.3.0",
"passport-local": "1.0.0", "passport-local": "1.0.0",
"postcss": "^5.0.13", "postcss": "^5.0.13",

11
src/emailer.js
View File

@@ -1,11 +1,12 @@
"use strict"; "use strict";
var async = require('async'); var async = require('async');
var winston = require('winston'); var winston = require('winston');
var nconf = require('nconf'); var nconf = require('nconf');
var templates = require('templates.js'); var templates = require('templates.js');
var nodemailer = require('nodemailer'); var nodemailer = require('nodemailer');
var sendmailTransport = require('nodemailer-sendmail-transport'); var sendmailTransport = require('nodemailer-sendmail-transport');
var smtpTransport = require('nodemailer-smtp-transport');
var htmlToText = require('html-to-text'); var htmlToText = require('html-to-text');
var url = require('url'); var url = require('url');
@@ -28,13 +29,15 @@ var fallbackTransport;
// Enable Gmail transport if enabled in ACP // Enable Gmail transport if enabled in ACP
if (parseInt(meta.config['email:GmailTransport:enabled'], 10) === 1) { if (parseInt(meta.config['email:GmailTransport:enabled'], 10) === 1) {
fallbackTransport = transports.gmail = nodemailer.createTransport('SMTP', { fallbackTransport = transports.gmail = nodemailer.createTransport(smtpTransport({
service: 'Gmail', host: 'smtp.gmail.com',
port: 465,
secure: true,
auth: { auth: {
user: meta.config['email:GmailTransport:user'], user: meta.config['email:GmailTransport:user'],
pass: meta.config['email:GmailTransport:pass'] pass: meta.config['email:GmailTransport:pass']
} }
}); }));
} else { } else {
fallbackTransport = transports.sendmail; fallbackTransport = transports.sendmail;
} }