Merge branch 'master' into snyk-upgrade-8e33556e94037e848c3538599c66fb37

Author: blakenan-bellese

src/email/index.js

@@ -55,17 +55,18 @@ const sendForgotPassword = async (userEmail, resetPasswordToken) => {
   }
 }
 
-const sendContactCheckInEmail = async (info) => {
+const sendContactCheckInEmail = async (info, origin) => {
+  const url = origin ? origin : process.env.VUE_APP_URL
   try {
-    const entityLink = `${process.env.URL}/checkin/${info.entityId}?token=${info.token}`
+    const entityLink = `${url}/checkin/${info.entityId}?token=${info.token}`
     const emailTitle = `${info.entityName} Healthcare Rollcall Check In`
     const emailContents = `Hello ${info.name}! It is time to update the status of ${info.entityName}. Please click the link below to check in.`
     const template = (info.entityType === 'Assisted Living Facility') ? 'assisted_living_checkin' : 'contact_check_in'
     await sendMail(
       info.email,
       emailTitle,
-      nunjucks.render(`${template}_html.njk`, { emailTitle, emailContents, entityLink }),
-      nunjucks.render(`${template}_text.njk`, { emailTitle, emailContents, entityLink })
+      nunjucks.render(`${template}_html.njk`, {emailTitle, emailContents, entityLink}),
+      nunjucks.render(`${template}_text.njk`, {emailTitle, emailContents, entityLink})
     )
 
     return true
@@ -74,4 +75,4 @@ const sendContactCheckInEmail = async (info) => {
   }
 }
 
-export default {sendForgotPassword, sendContactCheckInEmail}
+export default {sendForgotPassword, sendContactCheckInEmail, sendMail}

src/routes/contact.js

@@ -212,7 +212,7 @@ router.post('/send', async (req, res) => {
     }
 
     emails.forEach(async (e) => {
-      email.sendContactCheckInEmail(e)
+      email.sendContactCheckInEmail(e, req.headers.origin)
     })
 
     const uniqueEntities = [...new Set(emails.map(email => email.entityId))]
@@ -239,6 +239,7 @@ router.post('/send/:type/:id', async (req, res) => {
 
   try {
     let entity
+
     if (req.params.type.toLowerCase() === 'entity') {
       entity = await models.Entity.findById(req.params.id)
     } else if (req.params.type.toLowerCase() === 'contact') {
@@ -261,7 +262,7 @@ router.post('/send/:type/:id', async (req, res) => {
         entityId: entity.id,
         token: temporaryToken
       }
-      email.sendContactCheckInEmail(e).then(() => {
+      email.sendContactCheckInEmail(e, req.headers.origin).then(() => {
         response.setMessage(`${entity.name} emailed sent.`)
         response.setCode(200)
       }, err => {