Fixed SMTP by reverting MAIL_SERVICE changes.

Thanks to xet7 !

Fixes #4022,
fixes #4001,
fixes https://github.com/wekan/wekan/discussions/4030
This commit is contained in:
Lauri Ojansivu 2021-10-07 08:47:10 +03:00
parent 28d515436e
commit 9c99c5c3ae
6 changed files with 281 additions and 238 deletions

View file

@ -1,4 +1,4 @@
var nodemailer = require('nodemailer');
//var nodemailer = require('nodemailer');
RulesHelper = {
executeRules(activity) {
@ -125,6 +125,7 @@ RulesHelper = {
const text = action.emailMsg || '';
const subject = action.emailSubject || '';
try {
/*
if (process.env.MAIL_SERVICE !== '') {
let transporter = nodemailer.createTransport({
service: process.env.MAIL_SERVICE,
@ -147,6 +148,13 @@ RulesHelper = {
text,
});
}
*/
Email.send({
to,
from: Accounts.emailTemplates.from,
subject,
text,
});
} catch (e) {
// eslint-disable-next-line no-console
console.error(e);