Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added MAIL_SERVICE settings for Well Known Email Services https://github.com/wekan/wekan/wiki/Troubleshooting-Mail . Please test.

Browse source 
Thanks to xet7 !

Fixes #3702
This commit is contained in:
Lauri Ojansivu 2021-08-21 16:32:07 +03:00
parent 2f33a1ecff
commit ab8e56e16a
14 changed files with 175 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/notifications/email.js
View file

@ -1,3 +1,5 @@
var nodemailer = require('nodemailer');
// buffer each user's email text in a queue, then flush them in single email
Meteor.startup(() => {
Notifications.subscribe('email', (user, title, description, params) => {
@ -38,12 +40,28 @@ Meteor.startup(() => {
const html = texts.join('<br/>\n\n');
user.clearEmailBuffer();
try {
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject,
html,
});
if (process.env.MAIL_SERVICE !== '') {
let transporter = nodemailer.createTransport({
service: process.env.MAIL_SERVICE,
auth: {
user: process.env.MAIL_SERVICE_USER,
pass: process.env.MAIL_SERVICE_PASSWORD
},
})
let info = transporter.sendMail({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject,
html,
})
} else {
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject,
html,
});
}
} catch (e) {
return;
}

30
server/rulesHelper.js
View file

@ -1,3 +1,5 @@
var nodemailer = require('nodemailer');
RulesHelper = {
executeRules(activity) {
const matchingRules = this.findMatchingRules(activity);
@ -119,12 +121,28 @@ RulesHelper = {
const text = action.emailMsg || '';
const subject = action.emailSubject || '';
try {
Email.send({
to,
from: Accounts.emailTemplates.from,
subject,
text,
});
if (process.env.MAIL_SERVICE !== '') {
let transporter = nodemailer.createTransport({
service: process.env.MAIL_SERVICE,
auth: {
user: process.env.MAIL_SERVICE_USER,
pass: process.env.MAIL_SERVICE_PASSWORD
},
})
let info = transporter.sendMail({
to,
from: Accounts.emailTemplates.from,
subject,
text,
})
} else {
Email.send({
to,
from: Accounts.emailTemplates.from,
subject,
text,
});
}
} catch (e) {
// eslint-disable-next-line no-console
console.error(e);