mailer

commit fb699c69d02749ab83a426c80eb41dc4db550532

Author: Connor Etherington <[email protected]>

Date:   Fri Apr 14 07:48:08 2023 +0200

    Auto-Commit Update 14.04.2023 - 07:48:08

---

 .../inputs => .bkp}/affiliate-register.json        |  0

 .../freepaid/templates => .bkp}/postPayment.html   |  0

 .env                                               |  2 +-

 clients/freepaid/templates/welcomeMail.js          | 23 --------

 methods/main.js                                    | 18 +++---

 methods/mkMail.js                                  |  6 +-

 methods/updateDB.js                                | 25 +++++---

 models/template.js                                 |  4 +-

 routes/api.js                                      | 66 +++++++++++++++++++---

 9 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/clients/freepaid/inputs/affiliate-register.json b/.bkp/affiliate-register.json

similarity index 100%

rename from clients/freepaid/inputs/affiliate-register.json

rename to .bkp/affiliate-register.json

diff --git a/clients/freepaid/templates/postPayment.html b/.bkp/postPayment.html

similarity index 100%

rename from clients/freepaid/templates/postPayment.html

rename to .bkp/postPayment.html

diff --git a/.env b/.env

index 9b30338..befb26d 100644

--- a/.env

+++ b/.env

@@ -1,4 +1,4 @@

 URI="mongodb+srv://a4to:c1b120d56bb97eb37fbc45f009e33f03f2840@mycondb.bt5st8l.mongodb.net/mailer?retryWrites=true"

-token='oiouoiok'

+TOKEN='oiouoiok'

diff --git a/clients/freepaid/templates/welcomeMail.js b/clients/freepaid/templates/welcomeMail.js

deleted file mode 100644

index a752a4f..0000000

--- a/clients/freepaid/templates/welcomeMail.js

+++ /dev/null

@@ -1,23 +0,0 @@

-

-

-module.exports = async (recipient, link, html) => {

-

-  let baseName = recipient.agency.replace(/^/, 'https://').replace(/https?:\/\//g, '').replace(/\/$/, '');

-  let from = baseName.slice(0, 1).toString().toUpperCase() + baseName.slice(1).split('.')[0].replace('data', ' Data').replace('gbservices', 'GB Services');

-  let subject  = `Welcome to the ${from} family!`;

-  let { name, surname } = recipient;

-

-  const baseUrl = recipient.agency.replace(/^/, 'https://');

-  let logo;

-

-  logo = baseName + '.png';

-  logo = `${baseUrl}/img/logos/${logo}`;

-

-

-

-const mailOptions = {

-  from: `"${from}" <[email protected]>`,

-  to: recipient.email,

-  subject,

-  html

-};

diff --git a/methods/main.js b/methods/main.js

index ed25cda..dfde0a0 100644

--- a/methods/main.js

+++ b/methods/main.js

@@ -3,7 +3,7 @@ const Client = require('../models/client');

 const Template = require('../models/template');

 const nodemailer = require('nodemailer');

 const { mkConfig, mkMail } = require('./mkMail');

-const { updateCliets, updateTemplates } = require('./updateDB');

+const { updateClients, updateTemplates, singleClient } = require('./updateDB');

 require('colors');

 const getClient = (name, token) => {

@@ -66,23 +66,25 @@ const mail = async (recipient, link, name, token, type) => {

 const test = async (recipient, link, name, token, type) => {

+  console.log('TESTING'.cyan + ` ${type}`.yellow + ' EMAIL'.cyan);

+

   const { html, requires } = await getTemplate(name, token, type);

-  if(!html || !requires) return false;

+  if(!html || !requires) return console.log('No template found'.red);

   const client = await getClient(name, token);

-  if(!client) return false;

+  if(!client) return console.log('No client found'.red);

   const transporter = nodemailer.createTransport(client.config);

-  if(!transporter) return false;

+  if(!transporter) return console.log('No transporter found'.red);

   const inputs = mkConfig(client, recipient, link);

-  if(!inputs) return false;

+  if(!inputs) return console.log('No inputs found'.red);

   const mail = mkMail(client, type, inputs);

-  if(!mail) return false;

+  if(!mail) return console.log('No mail found'.red);

   const { from, to, subject, Html	} = mail;

-  if(!from || !to || !subject || !Html) return false;

+  if(!from || !to || !subject || !Html) return  console.log('No mail found'.red);

   console.log('From: '.green + from);

   console.log('To: '.green + to);

@@ -93,5 +95,5 @@ const test = async (recipient, link, name, token, type) => {

 }

-module.exports = { getClient, getTemplate, mail, test, updateCliets, updateTemplates };

+module.exports = { getClient, getTemplate, mail, test, updateClients, updateTemplates, singleClient };

diff --git a/methods/mkMail.js b/methods/mkMail.js

index 857af98..49cab08 100644

--- a/methods/mkMail.js

+++ b/methods/mkMail.js

@@ -3,6 +3,8 @@ const Template = require('../models/template');

 const mkConfig = (client, recipient, link) => {

+  console.log(`\nMKCONFIG STARTED FOR ${client.name}\n`);

+

   try {

     if (client.name == 'FREEPAID') {

       let { name, surname, agency } = recipient,

@@ -27,7 +29,9 @@ const mkConfig = (client, recipient, link) => {

 }

-const mkMail = (client, type, inputs) => {

+const mkMail = async (client, type, inputs) => {

+

+  console.log(`\nMKMAIL STARTED FOR ${client.name}\nTYPE:${type}\n`);

   try {

     if (client.name == 'FREEPAID') {

diff --git a/methods/updateDB.js b/methods/updateDB.js

index 6daaa4f..113fb18 100644

--- a/methods/updateDB.js

+++ b/methods/updateDB.js

@@ -7,6 +7,8 @@ require('colors');

 const getClients = async () => {

+  let TS = [];

+

   await fs.readdir(path.join(__dirname, '../clients'), (err, files) => {

     if (err) { console.log(err); }

     for (let i = 0; i < files.length; i++) {

@@ -22,6 +24,8 @@ const getClients = async () => {

 const singleClient = async (clientName) => {

+  console.log(clientName);

+

   const CLIENTS = Array.from(await getClients());

   const client = await Client.findOne({ name: clientName.toUpperCase() });

@@ -42,7 +46,7 @@ const singleClient = async (clientName) => {

         const templateInputs = path.join(__dirname, `../clients/${clientName.toLowerCase()}/inputs/${file.replace(/.html/, '')}.json`);

         const templateContent = fs.readFileSync(templatePath, 'utf8');

-        const template = await Template.findOne({ client: client._id, });

+        const template = await Template.findOne({ name: client.clientName });

         if (!template) {

           const newTemplate = new Template({

@@ -62,8 +66,7 @@ const singleClient = async (clientName) => {

         } else {

           if (template.emails.filter(email => email.name === templateName).length === 0) {

-            template.emails.push({ name: templateName, html: templateContent, requires: JSON.parse(fs.readFileSync(templateInputs, 'utf8')) });

-            await template.save().then(() => {

+            await Template.findOneAndUpdate({ client: client._id }, { $push: { emails: { name: templateName, html: templateContent, requires: JSON.parse(fs.readFileSync(templateInputs, 'utf8')) } } }).then(() => {

               console.log(`[+] `.green + `${templateName.yellow} template added to ${clientName.green} client`);

             });

@@ -84,8 +87,16 @@ const updateTemplates = async () => {

   console.log(`\nAdding templates to all clients...`);

   console.log('');

-  await singleClient('CONCISE');

-  await singleClient('FREEPAID');

+  await singleClient('CONCISE').then(() => {

+    console.log('Concise client updated');

+  }).finally(async () => {

+    await singleClient('FREEPAID').then(() => {

+      console.log('Freepaid client updated');

+    })

+  });

+

+

+  return true;

 }

@@ -98,11 +109,11 @@ const updateClients = async () => {

     await Client.deleteMany();

     await Client.insertMany(clients);

     console.log('Clients imported...'.green.inverse);

-    process.exit();

+    return true;

   } catch (error) {

     console.error(error);

   }

 }

-module.exports = { updateTemplates, updateClients };

+module.exports = { updateTemplates, updateClients, singleClient };

diff --git a/models/template.js b/models/template.js

index 035d32e..ee517bf 100644

--- a/models/template.js

+++ b/models/template.js

@@ -2,8 +2,8 @@

 const mongoose = require('mongoose');

 const TemplateSchema = new mongoose.Schema({

-  client: { type: mongoose.Schema.Types.ObjectId, ref: 'Client', unique: true },

-  clientName: { type: String, unique: true },

+  client: { type: mongoose.Schema.Types.ObjectId, ref: 'Client' },

+  clientName: { type: String },

   emails: [Object],

 });

diff --git a/routes/api.js b/routes/api.js

index d438c25..471e699 100644

--- a/routes/api.js

+++ b/routes/api.js

@@ -1,6 +1,7 @@

 const router = require('express').Router();

-const { getClient, getTemplate, mail, test, updateCliets, updateTemplates } = require('../methods/main');

+const { getClient, getTemplate, mail, test, updateClients, updateTemplates, singleClient } = require('../methods/main');

+

 // getClient (name, token)

 // getTemplate (name, token, type)

@@ -13,32 +14,83 @@ router.post('/sendmail', async (req, res) => {

   const { recipient, link, name, token, type } = req.body;

   if (!recipient || !link || !name || !token || !type) {

+    console.log(`Unauthorized mail attempt from ${req.headers['x-forwarded-for'] || req.connection.remoteAddress}`);

+    return res.status(400).json({ error: 'Missing parameters' });

+  } else {

+    await mail(recipient, link, name, token, type);

+    res.status(200).json({ status: 'success', message: 'Mail sent' });

+  }

+

+});

+

+router.post('/test', async (req, res) => {

+

+  const { recipient, link, name, token, type } = req.body;

+

+  if (!recipient || !link || !name || !token || !type) {

+    console.log(`Unauthorized test attempt from ${req.headers['x-forwarded-for'] || req.connection.remoteAddress}`);

     return res.status(400).json({ error: 'Missing parameters' });

   } else {

-    await test(recipient, link, name, token, type);

-    res.send('\nMail sent\n');

+    await test(recipient, link, name, token, type).then(() => {

+      res.status(200).json({ status: 'success', message: 'Mail sent' });

+    }).catch((err) => {

+      res.status(500).json({ status: 'error', message: err });

+    });

+

   }

 });

-router.post('/update', (req, res) => {

+router.post('/updateC', async (req, res) => {

   const { token } = req.body;

   if (!token) {

     return res.status(400).json({ error: 'Missing parameters' });

   } else if (token !== process.env.TOKEN) {

+    console.log(`Unauthorized update attempt from ${req.headers['x-forwarded-for'] || req.connection.remoteAddress}`);

     return res.status(401).json({ error: 'Unauthorized' });

   }

-  updateCliets();

-  updateTemplates();

+  await updateClients();

-  res.status(200).send(`\nClients and templates updated successfully\n`);

+  res.status(200).json({ status: 'success', message: 'Clients and templates updated successfully'});

 });

+router.post('/updateT', async (req, res) => {

+

+  const { token } = req.body;

+  if (!token) {

+    return res.status(400).json({ error: 'Missing parameters' });

+  } else if (token !== process.env.TOKEN) {

+    console.log(`Unauthorized update attempt from ${req.headers['x-forwarded-for'] || req.connection.remoteAddress}`);

+    return res.status(401).json({ error: 'Unauthorized' });

+  }

+

+  await updateTemplates();

+

+  res.status(200).json({ status: 'success', message: 'Clients and templates updated successfully'});

+

+});

+

+router.post('/updateS', async (req, res) => {

+

+  const { token, client } = req.body;

+

+  if (!token) {

+    return res.status(400).json({ error: 'Missing parameters' });

+  } else if (token !== process.env.TOKEN) {

+    console.log(`Unauthorized update attempt from ${req.headers['x-forwarded-for'] || req.connection.remoteAddress}`);

+    return res.status(401).json({ error: 'Unauthorized' });

+  }

+

+  await singleClient(client);

+

+  res.status(200).json({ status: 'success', message: 'Clients and templates updated successfully'});

+

+});

 module.exports = router;