Merge branch 'master' into dependabot/npm_and_yarn/ini-1.3.8

Author: stoopidJSON

README.md

@@ -59,6 +59,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="#infra-mpiroc" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
     <td align="center"><a href="https://bellese.io/"><img src="https://avatars3.githubusercontent.com/u/61873300?v=4" width="100px;" alt=""/><br /><sub><b>Michael Schechter</b></sub></a><br /><a href="https://github.com/CodeForBaltimore/Bmore-Responsive/commits?author=mschechter-bellese" title="Code">💻</a></td>
     <td align="center"><a href="http://ianjadams.com"><img src="https://avatars1.githubusercontent.com/u/7966226?v=4" width="100px;" alt=""/><br /><sub><b>Ian Adams</b></sub></a><br /><a href="https://github.com/CodeForBaltimore/Bmore-Responsive/commits?author=ijadams" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.joshglazer.com"><img src="https://avatars1.githubusercontent.com/u/5789311?v=4" width="100px;" alt=""/><br /><sub><b>Josh Glazer</b></sub></a><br /><a href="https://github.com/CodeForBaltimore/Bmore-Responsive/commits?author=joshglazer" title="Code">💻</a></td>
   </tr>
 </table>
 

package-lock.json

@@ -33,7 +33,7 @@
   "homepage": "https://github.com/CodeForBaltimore/Bmore-Responsive#readme",
   "dependencies": {
     "@babel/core": "7.12.3",
-    "@babel/node": "7.12.1",
+    "@babel/node": "7.12.6",
     "casbin": "4.7.2",
     "casbin-sequelize-adapter": "2.1.0",
     "chai": "4.2.0",
@@ -45,7 +45,7 @@
     "express-rate-limit": "5.1.3",
     "express-request-id": "1.4.1",
     "helmet": "3.23.3",
-    "json2csv": "^5.0.3",
+    "json2csv": "^5.0.4",
     "jsonwebtoken": "8.5.1",
     "lodash": "^4.17.20",
     "mocha": "8.2.1",

package.json

@@ -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/email/index.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 => {