[SER-647] Fix: Whitelabeling add emailing parameters

Author: pnrgenc

extend/mail.example.js

@@ -2,24 +2,27 @@
 //edit this script and put it in countly/extend/mail.js to overwrite existing email templates and settings
 var nodemailer = require('nodemailer');
 const pluginManager = require('../plugins/pluginManager.js');
-const plugins = pluginManager.getPlugins();
-//rename company
-var company = "Company";
-var email = "[email protected]";
 
-if (plugins.indexOf('white-labeling') > -1) {
-    try {
-        const pluginsConfig = pluginManager.getConfig("white-labeling");
-        const {emailFrom, emailCompany} = pluginsConfig;
-        email = emailFrom && emailFrom.length > 0 ? emailFrom : email;
-        company = emailCompany && emailCompany.length > 0 ? emailCompany : company;
-    }
-    catch (error) {
-        console.log('Error getting plugins config', error);
+function getPluginConfig() {
+    //rename company
+    var company = "Company";
+    var email = "[email protected]";
+
+    const plugins = pluginManager.getPlugins(true);
+    if (plugins.indexOf('white-labeling') > -1) {
+        try {
+            const pluginsConfig = pluginManager.getConfig("white-labeling");
+            const {emailFrom, emailCompany} = pluginsConfig;
+            email = emailFrom && emailFrom.length > 0 ? emailFrom : email;
+            company = emailCompany && emailCompany.length > 0 ? emailCompany : company;
+        }
+        catch (error) {
+            console.log('Error getting plugins config', error);
+        }
     }
+    return { email, company };
 }
 
-
 module.exports = function(mail) {
     //define this if you need to send email from some third party service
     mail.smtpTransport = nodemailer.createTransport({
@@ -33,6 +36,7 @@ module.exports = function(mail) {
     });
 
     mail.sendMail = function(message, callback) {
+        const { email, company } = getPluginConfig();
         message.from = company + " <" + email + ">";
         mail.smtpTransport.sendMail(message, function(error) {
             if (error) {
@@ -46,6 +50,7 @@ module.exports = function(mail) {
     };
 
     mail.sendMessage = function(to, subject, message, callback) {
+        const { email, company } = getPluginConfig();
         mail.sendMail({
             to: to,
             from: company + " <" + email + ">",
@@ -55,6 +60,7 @@ module.exports = function(mail) {
     };
 
     mail.sendToNewMember = function(member, memberPassword) {
+        const { company } = getPluginConfig();
         const password = mail.escapedHTMLString(memberPassword);
 
         mail.lookup(function(err, host) {
@@ -67,6 +73,7 @@ module.exports = function(mail) {
     };
 
     mail.sendToUpdatedMember = function(member, memberPassword) {
+        const { company } = getPluginConfig();
         const password = mail.escapedHTMLString(memberPassword);
 
         mail.lookup(function(err, host) {
@@ -78,6 +85,8 @@ module.exports = function(mail) {
     };
 
     mail.sendPasswordResetInfo = function(member, prid) {
+        const { company } = getPluginConfig();
+
         mail.lookup(function(err, host) {
             mail.sendMessage(member.email, "" + company + " Account - Password Reset", "Hi " + mail.getUserFirstName(member) + ",<br/><br/>\n" +
             "You can reset your " + company + " account password by following <a href='" + host + "/reset/" + prid + "'>this link</a>.<br/><br/>\n" +
@@ -87,6 +96,8 @@ module.exports = function(mail) {
     };
 
     mail.sendAutomatedMessageError = function(member, link) {
+        const { company } = getPluginConfig();
+
         mail.lookup(function(err, host) {
             link = host + '/' + link;
             mail.sendMessage(member.email, company + " Automated Push Problem", "Hi " + mail.getUserFirstName(member) + ",,<br/><br/>\n" +