bugfix/DEVSU-2778-pori-report-updates-emails-are-not-sending

app/libs/email.js

@@ -1,31 +1,8 @@
-const nodemailer = require('nodemailer');
 const CONFIG = require('../config');
 const db = require('../models');
 const {addJobToEmailQueue} = require('../queue');
 
-const {email, password, domain, ehost} = CONFIG.get('email');
-
-const sendEmail = async (subject, text, toEmail) => {
-  const transporter = nodemailer.createTransport({
-    host: ehost,
-    auth: {
-      user: email,
-      pass: password,
-    },
-    tls: {
-      rejectUnauthorized: false,
-    },
-  });
-
-  const mailOptions = {
-    from: `${email}${domain}`,
-    to: toEmail,
-    subject,
-    text,
-  };
-
-  return transporter.sendMail(mailOptions);
-};
+const {email, domain} = CONFIG.get('email');
 
 const getEmailList = async (triggers) => {
   const notifs = await db.models.notification.scope('extended').findAll({
@@ -69,4 +46,4 @@ const notifyUsers = async (subject, text, triggers) => {
   }
 };
 
-module.exports = {sendEmail, getEmailList, notifyUsers};
+module.exports = {getEmailList, notifyUsers};

app/libs/mailer.js

@@ -0,0 +1,26 @@
+const nodemailer = require('nodemailer');
+const CONFIG = require('../config');
+
+const {email, password, domain, ehost} = CONFIG.get('email');
+
+const sendEmail = async ({to, subject, text}) => {
+  const transporter = nodemailer.createTransport({
+    host: ehost,
+    auth: {
+      user: email,
+      pass: password,
+    },
+    tls: {
+      rejectUnauthorized: false,
+    },
+  });
+
+  return transporter.sendMail({
+    from: `${email}${domain}`,
+    to,
+    subject,
+    text,
+  });
+};
+
+module.exports = {sendEmail};

app/queue.js

@@ -4,7 +4,7 @@ const {graphkbGetReadonlyGroupId, graphkbAddUser} = require('./api/graphkb');
 const conf = require('./config');
 const createReport = require('./libs/createReport');
 const db = require('./models');
-const {sendEmail} = require('./libs/email');
+const {sendEmail} = require('./libs/mailer');
 
 const {host, port, enableQueue} = conf.get('redis_queue');
 const logger = require('./log');

app/routes/report/reportUser.js

@@ -153,7 +153,6 @@ router.route('/')
             projectId: reportProject.project_id,
           },
         );
-        logger.info('Email sent successfully');
       } catch (error) {
         logger.error(`Email not sent successfully: ${error}`);
       }