Merge pull request #69 from nodetello/feature/smtp_send_template

send emails using mustache templates
stanleygomes · Nov 24, 2019 · cc4baad · cc4baad
2 parents 6f62bab + 1c2d33c
commit cc4baad
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 37 deletions.
diff --git a/.env.example b/.env.example
@@ -10,9 +10,9 @@ DB_SCHEMA=nodetello
 # smtp config
 SMTP_HOST="smtp.your-server.com"
 SMTP_PORT=587
-SMTP_USERNAME="your-email@your-server.com.br"
+SMTP_USERNAME="your-email@your-server.com"
 SMTP_PASSWORD="YourPassword"
-SMTP_FROM="<Your name 👻 <your-email@your-server.com.br>"
+SMTP_FROM="<Your name 👻 <your-email@your-server.com>"
 
 # firebase config
 # how to get your config: https://firebase.google.com/docs/admin/setup

diff --git a/src/api/sample/sampleRest.js b/src/api/sample/sampleRest.js
@@ -134,9 +134,13 @@ sampleRest.get('/httpRequest', (req, res) => {
 
 sampleRest.get('/sendMail', (req, res) => {
  const emailData = {
- to: ['recipient1@server.com', 'recipient2@server.com'],
+ to: ['stanleygomesdasilva@gmail.com', 'stanleygomess@hotmail.com'],
  subject: 'Hello ✔✔✔',
- html: '<b>Hello world ✔✔✔</b>'
+ template: 'helloWorld',
+ templateContainer: 'container',
+ params: {
+ name: 'Fulano'
+ }
  }
 
  smtpUtils.sendMail(emailData).then((response) => {

diff --git a/src/templates/smtp/container.html b/src/templates/smtp/container.html
@@ -7,5 +7,8 @@
 </head>
 <body>
 
+ <h1>Template</h1>
+ @childTemplate
+
 </body>
 </html>
diff --git a/src/templates/smtp/helloWorld.html b/src/templates/smtp/helloWorld.html
@@ -0,0 +1 @@
+<b>Hello world ✔✔✔ :name</b>
diff --git a/src/utils/database.js b/src/utils/database.js
@@ -29,9 +29,9 @@ const builder = () => {
  } else if (config.database.client === 'mysql') {
  resolve(k)
  }
- } catch (err) {
- loggerUtils.error(err.stack)
- reject(err)
+ } catch (error) {
+ loggerUtils.error(error.stack)
+ reject(error)
  }
  })
 }
@@ -43,9 +43,9 @@ const executeQuery = (query, params = []) => {
  .then(rows => {
  const resp = rows && rows.length ? rows[0] : null
  resolve(resp)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  })
  })
@@ -80,9 +80,9 @@ const basicCount = (tableName, conditions = {}, fields = '*') => {
  .then(rows => {
  const resp = rows && rows.length ? rows[0] : null
  resolve(resp)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  })
@@ -103,9 +103,9 @@ const basicSelect = (tableName, conditions = {}, fields = '*') => {
  .then(rows => {
  const resp = rows && rows.length ? rows : null
  resolve(resp)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  })
@@ -142,9 +142,9 @@ const basicPaginate = (tableName, conditions = {}, fields = '*', limit = 15, off
  .then(rows => {
  paginateResults.results = (rows && rows.length ? rows : null)
  resolve(paginateResults)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  }).catch(error => reject(error))
@@ -177,9 +177,9 @@ const basicUpdate = (tableName, conditions, fields, returning) => {
  .update(fields, returning)
  .then(rowsUpdated => {
  resolve(rowsUpdated)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  })
@@ -206,9 +206,9 @@ const basicDelete = (tableName, conditions) => {
  .del()
  .then(rowsUpdated => {
  resolve(rowsUpdated)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  })
@@ -234,9 +234,9 @@ const basicInsert = (tableName, fields, returning = []) => {
  .insert(fields)
  .then(rowsInserted => {
  resolve(rowsInserted)
- }).catch(err => {
- loggerUtils.error(err.stack)
- reject(err)
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  }).catch(error => reject(error))
  })

diff --git a/src/utils/mustache.js b/src/utils/mustache.js
@@ -2,6 +2,7 @@ const path = require('path')
 const Mustache = require('mustache')
 const config = require('../config')
 const fileUtils = require('./file')
+const loggerUtils = require('./logger')
 const showCompiledTemplateDefault = config.template.showCompiled
 
 const openFile = (templateConfig, name) => {
@@ -73,7 +74,10 @@ const getTemplate = (name, params = {}, templateConfig) => {
  }
 
  resolve(response)
- }).catch(error => reject(error))
+ }).catch(error => {
+ loggerUtils.error(error.stack)
+ reject(error)
+ })
  })
 }
 

diff --git a/src/utils/smtp.js b/src/utils/smtp.js
@@ -1,5 +1,7 @@
 const config = require('../config')
 const nodemailer = require('nodemailer')
+const mustacheUtils = require('./mustache')
+const loggerUtils = require('./logger')
 
 const validateParameters = (emailData) => {
  let errorMessage = null
@@ -11,8 +13,8 @@ const validateParameters = (emailData) => {
  if (!emailData.subject) {
  errorMessage = 'Invalid mail subject'
  }
- if (!emailData.html) {
- errorMessage = 'Invalid mail html'
+ if (!emailData.template) {
+ errorMessage = 'Invalid mail template'
  }
  } else {
  errorMessage = 'Invalid mail parameters'
@@ -28,6 +30,19 @@ const validateParameters = (emailData) => {
  }
 }
 
+const transpile = (emailData, transporter) => {
+ return new Promise((resolve, reject) => {
+ mustacheUtils.getTemplateSMTP(emailData.templateContainer, emailData.params).then(template => {
+ mustacheUtils.getTemplateSMTP(emailData.template, emailData.params).then(templateChild => {
+ const templateContainerRendered = template.rendered.replace('@childTemplate', templateChild.rendered)
+ emailData.html = templateContainerRendered
+ send(emailData, transporter).then(response => resolve(response))
+ }).catch(error => reject(error))
+ send(emailData, transporter).then(response => resolve(response))
+ }).catch(error => reject(error))
+ })
+}
+
 const send = (emailData, transporter) => {
  return new Promise((resolve, reject) => {
  emailData = Object.assign(emailData, config.smtp.send)
@@ -38,9 +53,7 @@ const send = (emailData, transporter) => {
  messageUrl: nodemailer.getTestMessageUrl(info)
  }
  resolve(response)
- }).catch((error) => {
- reject(error)
- })
+ }).catch(error => reject(error))
  })
 }
 
@@ -56,16 +69,16 @@ const sendMail = (emailData) => {
  emailData = Object.assign(emailData, params)
  const transporter = nodemailer.createTransport(config.smtp)
 
- send(emailData, transporter).then((resolved) => {
+ transpile(emailData, transporter).then((resolved) => {
  const response = {
  emailData: emailData,
  response: resolved
  }
 
  resolve(response)
  }).catch((error) => {
- const errorMessage = new Error(error)
- reject(errorMessage)
+ loggerUtils.error(error.stack)
+ reject(error)
  })
  })
 }