wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-17 11:27:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from coralproject/pw-reset-logs

Browse Source 
Pw reset logs
This commit is contained in:
Kim Gardner
2016-12-07 14:09:32 -10:00
committed by GitHub
parent 0d97b91903 a4af29cfa0
commit bbf476a7ee
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -6,6 +6,7 @@ dist/coral-admin/bundle.js
tests/e2e/reports tests/e2e/reports
.DS_Store .DS_Store
*.iml *.iml
*.swp
dump.rdb dump.rdb
.env .env
gaba.cfg gaba.cfg
services/mailer.js
+10 -3
View File
@@ -1,10 +1,17 @@
const nodemailer = require('nodemailer'); const nodemailer = require('nodemailer');
if (!process.env.TALK_SMTP_CONNECTION_URL) { if (!process.env.TALK_SMTP_USERNAME || !process.env.TALK_SMTP_PASSWORD) {
console.error('TALK_SMTP_CONNECTION_URL should be defined if you would like to send password reset emails from Talk'); console.error('TALK_SMTP_USERNAME and TALK_SMTP_PASSWORD should be defined if you would like to send password reset emails from Talk');
} }
const defaultTransporter = nodemailer.createTransport(process.env.TALK_SMTP_CONNECTION_URL); const defaultTransporter = nodemailer.createTransport({
// https://github.com/nodemailer/nodemailer-wellknown#supported-services
service: 'SendGrid',
auth: {
user: process.env.TALK_SMTP_USERNAME,
pass: process.env.TALK_SMTP_PASSWORD
}
});
const mailer = { const mailer = {