From aace2c7e6ccb6e74df83faac74c427d43bfaf79b Mon Sep 17 00:00:00 2001 From: Gavin Mogan Date: Wed, 23 Apr 2025 15:06:54 -0700 Subject: Fix ReferenceError: nodemailerTransporter is not defined Part of https://github.com/lowercasename/gathio/pull/200 was migrating more code to use the shared init email function, but all the local usages of nodemailerTransporter were missed --- src/routes.js | 568 ++++++++++++++++++++-------------------------------------- 1 file changed, 191 insertions(+), 377 deletions(-) (limited to 'src/routes.js') diff --git a/src/routes.js b/src/routes.js index e758e6b..f609f94 100755 --- a/src/routes.js +++ b/src/routes.js @@ -19,12 +19,13 @@ import { broadcastDeleteMessage, processInbox, } from "./activitypub.js"; +import { renderEmail } from "./lib/handlebars.js"; import Event from "./models/Event.js"; import EventGroup from "./models/EventGroup.js"; import path from "path"; import { activityPubContentType } from "./lib/activitypub.js"; import { hashString } from "./util/generator.js"; -import { initEmailService } from "./lib/email.js"; +import { initEmailService, sendEmail } from "./lib/email.js"; const config = getConfig(); const domain = config.general.domain; @@ -44,9 +45,7 @@ const nanoid = customAlphabet( const router = express.Router(); let sendEmails = false; -initEmailService().then((emailService) => { - sendEmails = emailService -}); +initEmailService().then((emailService) => (sendEmails = emailService)); router.use(fileUpload()); @@ -58,7 +57,10 @@ schedule.scheduleJob("59 23 * * *", function (fireDate) { return; } - const too_old = moment.tz("Etc/UTC").subtract(deleteAfterDays, "days").toDate(); + const too_old = moment + .tz("Etc/UTC") + .subtract(deleteAfterDays, "days") + .toDate(); console.log( "Old event deletion running! Deleting all events concluding before ", too_old, @@ -81,9 +83,9 @@ schedule.scheduleJob("59 23 * * *", function (fireDate) { "deleteOldEvents", "error", "Attempt to delete old event " + - id + - " failed with error: " + - err, + id + + " failed with error: " + + err, ); }); }; @@ -100,9 +102,9 @@ schedule.scheduleJob("59 23 * * *", function (fireDate) { "deleteOldEvents", "error", "Attempt to delete event image for old event " + - event.id + - " failed with error: " + - err, + event.id + + " failed with error: " + + err, ); } // Image removed @@ -149,9 +151,9 @@ schedule.scheduleJob("59 23 * * *", function (fireDate) { "deleteOldEvents", "error", "Attempt to delete old event " + - event.id + - " failed with error: " + - err, + event.id + + " failed with error: " + + err, ); }); @@ -204,9 +206,9 @@ router.post("/deleteimage/:eventID/:editToken", (req, res) => { "deleteEventImage", "error", "Attempt to delete event image for event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); } // Image removed @@ -227,9 +229,9 @@ router.post("/deleteimage/:eventID/:editToken", (req, res) => { "deleteEventImage", "error", "Attempt to delete event image for event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }, @@ -271,9 +273,9 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "deleteEvent", "error", "Attempt to delete event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); } }, @@ -293,9 +295,9 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "deleteEvent", "error", "Attempt to delete event image for event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); } // Image removed @@ -303,8 +305,8 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "deleteEvent", "success", "Event " + - req.params.eventID + - " deleted", + req.params.eventID + + " deleted", ); }, ); @@ -316,63 +318,29 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { // Send emails here otherwise they don't exist lol if (sendEmails) { - const attendeeEmails = event.attendees - .filter( + const attendeeEmails = event?.attendees?.filter( (o) => o.status === "attending" && o.email, ) - .map((o) => o.email); + .map((o) => o.email || '') || []; if (attendeeEmails.length) { console.log( "Sending emails to: " + - attendeeEmails, + attendeeEmails, ); - req.app.get("hbsInstance").renderView( - "./views/emails/deleteEvent/deleteEventHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "deleteEvent/deleteEvent", { - siteName, - siteLogo, - domain, - eventName: event.name, - cache: true, - layout: "email.handlebars", + eventName: event?.name, }, - function (err, html) { - const msg = { - to: attendeeEmails, - from: contactEmail, - subject: `${siteName}: ${event.name} was deleted`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail - .sendMultiple(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - } - }, - ); + ).then( + ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: ${event?.name} was deleted`, text, html) + ).catch((e) => { + console.error('error sending attendy email', e.toString()); + res.status(500).end(); + }); } else { console.log("Nothing to send!"); } @@ -381,15 +349,15 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { .catch((err) => { res.send( "Sorry! Something went wrong (error deleting): " + - err, + err, ); addToLog( "deleteEvent", "error", "Attempt to delete event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }, @@ -401,8 +369,8 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "deleteEvent", "error", "Attempt to delete event " + - req.params.eventID + - " failed with error: token does not match", + req.params.eventID + + " failed with error: token does not match", ); } }) @@ -412,9 +380,9 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "deleteEvent", "error", "Attempt to delete event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }); @@ -447,9 +415,9 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { "deleteEventGroup", "error", "Attempt to delete event group " + - req.params.eventGroupID + - " failed with error: " + - err, + req.params.eventGroupID + + " failed with error: " + + err, ); } }, @@ -469,9 +437,9 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { "deleteEventGroup", "error", "Attempt to delete event image for event group " + - req.params.eventGroupID + - " failed with error: " + - err, + req.params.eventGroupID + + " failed with error: " + + err, ); } }, @@ -487,8 +455,8 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { "deleteEventGroup", "success", "Event group " + - req.params.eventGroupID + - " deleted", + req.params.eventGroupID + + " deleted", ); res.writeHead(302, { Location: "/", @@ -498,30 +466,30 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { .catch((err) => { res.send( "Sorry! Something went wrong (error deleting): " + - err, + err, ); addToLog( "deleteEventGroup", "error", "Attempt to delete event group " + - req.params.eventGroupID + - " failed with error: " + - err, + req.params.eventGroupID + + " failed with error: " + + err, ); }); }) .catch((err) => { res.send( "Sorry! Something went wrong (error deleting): " + - err, + err, ); addToLog( "deleteEventGroup", "error", "Attempt to delete event group " + - req.params.eventGroupID + - " failed with error: " + - err, + req.params.eventGroupID + + " failed with error: " + + err, ); }); } else { @@ -531,8 +499,8 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { "deleteEventGroup", "error", "Attempt to delete event group " + - req.params.eventGroupID + - " failed with error: token does not match", + req.params.eventGroupID + + " failed with error: token does not match", ); } }) @@ -542,9 +510,9 @@ router.post("/deleteeventgroup/:eventGroupID/:editToken", (req, res) => { "deleteEventGroup", "error", "Attempt to delete event group " + - req.params.eventGroupID + - " failed with error: " + - err, + req.params.eventGroupID + + " failed with error: " + + err, ); }); }); @@ -562,9 +530,9 @@ router.post("/attendee/provision", async (req, res) => { "provisionEventAttendee", "error", "Attempt to provision attendee in event " + - req.query.eventID + - " failed with error: " + - e, + req.query.eventID + + " failed with error: " + + e, ); return res.sendStatus(500); }); @@ -580,9 +548,9 @@ router.post("/attendee/provision", async (req, res) => { "provisionEventAttendee", "error", "Attempt to provision attendee in event " + - req.query.eventID + - " failed with error: " + - e, + req.query.eventID + + " failed with error: " + + e, ); return res.sendStatus(500); }); @@ -618,9 +586,9 @@ router.post("/attendevent/:eventID", async (req, res) => { "attendEvent", "error", "Attempt to attend event " + - req.params.eventID + - " failed with error: " + - e, + req.params.eventID + + " failed with error: " + + e, ); return res.sendStatus(500); }); @@ -659,7 +627,9 @@ router.post("/attendevent/:eventID", async (req, res) => { "attendees.$.name": req.body.attendeeName, "attendees.$.email": req.body.attendeeEmail, "attendees.$.number": req.body.attendeeNumber, - "attendees.$.visibility": !!req.body.attendeeVisible ? "public" : "private", + "attendees.$.visibility": req.body.attendeeVisible + ? "public" + : "private", }, }, ) @@ -670,44 +640,23 @@ router.post("/attendevent/:eventID", async (req, res) => { "Attendee added to event " + req.params.eventID, ); if (sendEmails) { - if (req.body.attendeeEmail) { - req.app.get("hbsInstance").renderView( - "./views/emails/addEventAttendee/addEventAttendeeHtml.handlebars", + if (req.body.attendeeEmail) { + renderEmail( + req.app.get("hbsInstance"), + "addEventAttendee/addEventAttendee", { eventID: req.params.eventID, - siteName, - siteLogo, - domain, removalPassword: req.body.removalPassword, - removalPasswordHash: hashString(req.body.removalPassword), - cache: true, - layout: "email.handlebars", - }, - function (err, html) { - const msg = { - to: req.body.attendeeEmail, - from: contactEmail, - subject: `${siteName}: You're RSVPed to ${event.name}`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail.send(msg).catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - } + removalPasswordHash: hashString( + req.body.removalPassword, + ), }, - ); + ).then( + ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You're RSVPed to ${event.name}`, text, html) + ).catch((e) => { + console.error('error sending addEventAttendee email', e.toString()); + res.status(500).end(); + }); } } res.redirect(`/${req.params.eventID}`); @@ -718,9 +667,9 @@ router.post("/attendevent/:eventID", async (req, res) => { "addEventAttendee", "error", "Attempt to add attendee to event " + - req.params.eventID + - " failed with error: " + - error, + req.params.eventID + + " failed with error: " + + error, ); }); }); @@ -750,40 +699,18 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { if (sendEmails) { // currently this is never called because we don't have the email address if (req.body.attendeeEmail) { - req.app.get("hbsInstance").renderView( - "./views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "removeEventAttendee/removeEventAttendee", { eventName: req.params.eventName, - siteName, - domain, - cache: true, - layout: "email.handlebars", }, - function (err, html) { - const msg = { - to: req.body.attendeeEmail, - from: contactEmail, - subject: `${siteName}: You have been removed from an event`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail.send(msg).catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - } - }, - ); + ).then( + ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You have been removed from an event`, text, html) + ).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } } res.writeHead(302, { @@ -797,9 +724,9 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { "removeEventAttendee", "error", "Attempt to remove attendee by admin from event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }); @@ -818,41 +745,18 @@ router.post("/removeattendee/:eventID/:attendeeID", (req, res) => { if (sendEmails) { // currently this is never called because we don't have the email address if (req.body.attendeeEmail) { - req.app.get("hbsInstance").renderView( - "./views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "removeEventAttendee/removeEventAttendee", { eventName: req.params.eventName, - siteName, - siteLogo, - domain, - cache: true, - layout: "email.handlebars", - }, - function (err, html) { - const msg = { - to: req.body.attendeeEmail, - from: contactEmail, - subject: `${siteName}: You have been removed from an event`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail.send(msg).catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - } }, - ); + ).then( + ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You have been removed from an event`, text, html) + ).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } } res.writeHead(302, { @@ -866,9 +770,9 @@ router.post("/removeattendee/:eventID/:attendeeID", (req, res) => { "removeEventAttendee", "error", "Attempt to remove attendee by admin from event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }); @@ -894,43 +798,20 @@ router.post("/subscribe/:eventGroupID", (req, res) => { eventGroup.subscribers.push(subscriber); eventGroup.save(); if (sendEmails) { - req.app.get("hbsInstance").renderView( - "./views/emails/subscribed/subscribedHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "subscribed/subscribed", { eventGroupName: eventGroup.name, eventGroupID: eventGroup.id, emailAddress: encodeURIComponent(subscriber.email), - siteName, - siteLogo, - domain, - cache: true, - layout: "email.handlebars", }, - function (err, html) { - const msg = { - to: subscriber.email, - from: contactEmail, - subject: `${siteName}: You have subscribed to an event group`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail.send(msg).catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error(e.toString()); - res.status(500).end(); - }); - break; - } - }, - ); + ).then( + ({ html, text }) => sendEmail(subscriber.email, '', `${siteName}: You have subscribed to an event group`, text, html) + ).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } return res.redirect(`/group/${eventGroup.id}`); }) @@ -939,11 +820,11 @@ router.post("/subscribe/:eventGroupID", (req, res) => { "addSubscription", "error", "Attempt to subscribe " + - req.body.emailAddress + - " to event group " + - req.params.eventGroupID + - " failed with error: " + - error, + req.body.emailAddress + + " to event group " + + req.params.eventGroupID + + " failed with error: " + + error, ); return res.sendStatus(500); }); @@ -970,11 +851,11 @@ router.get("/unsubscribe/:eventGroupID", (req, res) => { "removeSubscription", "error", "Attempt to unsubscribe " + - req.query.email + - " from event group " + - req.params.eventGroupID + - " failed with error: " + - error, + req.query.email + + " from event group " + + req.params.eventGroupID + + " failed with error: " + + error, ); return res.sendStatus(500); }); @@ -1028,58 +909,24 @@ router.post("/post/comment/:eventID", (req, res) => { (o) => o.status === "attending" && o.email, ) - .map((o) => o.email); + .map((o) => o.email || '') || []; if (attendeeEmails.length) { console.log( "Sending emails to: " + attendeeEmails, ); - req.app.get("hbsInstance").renderView( - "./views/emails/addEventComment/addEventCommentHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "addEventComment/addEventComment", { - siteName, - siteLogo, - domain, eventID: req.params.eventID, - commentAuthor: - req.body.commentAuthor, - cache: true, - layout: "email.handlebars", - }, - function (err, html) { - const msg = { - to: attendeeEmails, - from: contactEmail, - subject: `${siteName}: New comment in ${event.name}`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail - .sendMultiple(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - } + commentAuthor: req.body.commentAuthor, }, - ); + ).then( + ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: New comment in ${event.name}`, text, html) + ).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } else { console.log("Nothing to send!"); } @@ -1097,9 +944,9 @@ router.post("/post/comment/:eventID", (req, res) => { "addEventComment", "error", "Attempt to add comment to event " + - req.params.eventID + - " failed with error: " + - err, + req.params.eventID + + " failed with error: " + + err, ); }); }, @@ -1130,9 +977,9 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { "addEventReply", "success", "Reply added to comment " + - commentID + - " in event " + - req.params.eventID, + commentID + + " in event " + + req.params.eventID, ); // broadcast an identical message to all followers, will show in their home timeline const guidObject = crypto.randomBytes(16).toString("hex"); @@ -1157,57 +1004,24 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { (o) => o.status === "attending" && o.email, ) - .map((o) => o.email); + .map((o) => o.email || '') || []; if (attendeeEmails.length) { console.log( "Sending emails to: " + attendeeEmails, ); - req.app.get("hbsInstance").renderView( - "./views/emails/addEventComment/addEventCommentHtml.handlebars", + renderEmail( + req.app.get("hbsInstance"), + "addEventComment/addEventComment", { - siteName, - siteLogo, - domain, eventID: req.params.eventID, commentAuthor: req.body.replyAuthor, - cache: true, - layout: "email.handlebars", }, - function (err, html) { - const msg = { - to: attendeeEmails, - from: contactEmail, - subject: `${siteName}: New comment in ${event.name}`, - html, - }; - switch (mailService) { - case "sendgrid": - sgMail - .sendMultiple(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - case "nodemailer": - nodemailerTransporter - .sendMail(msg) - .catch((e) => { - console.error( - e.toString(), - ); - res.status( - 500, - ).end(); - }); - break; - } - }, - ); + ).then( + ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: New comment in ${event.name}`, text, html) + ).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } else { console.log("Nothing to send!"); } @@ -1225,11 +1039,11 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { "addEventReply", "error", "Attempt to add reply to comment " + - commentID + - " in event " + - req.params.eventID + - " failed with error: " + - err, + commentID + + " in event " + + req.params.eventID + + " failed with error: " + + err, ); }); }, @@ -1265,17 +1079,17 @@ router.post("/deletecomment/:eventID/:commentID/:editToken", (req, res) => { .catch((err) => { res.send( "Sorry! Something went wrong (error deleting): " + - err, + err, ); addToLog( "deleteComment", "error", "Attempt to delete comment " + - req.params.commentID + - "from event " + - req.params.eventID + - " failed with error: " + - err, + req.params.commentID + + "from event " + + req.params.eventID + + " failed with error: " + + err, ); }); } else { @@ -1285,10 +1099,10 @@ router.post("/deletecomment/:eventID/:commentID/:editToken", (req, res) => { "deleteComment", "error", "Attempt to delete comment " + - req.params.commentID + - "from event " + - req.params.eventID + - " failed with error: token does not match", + req.params.commentID + + "from event " + + req.params.eventID + + " failed with error: token does not match", ); } }) @@ -1298,11 +1112,11 @@ router.post("/deletecomment/:eventID/:commentID/:editToken", (req, res) => { "deleteComment", "error", "Attempt to delete comment " + - req.params.commentID + - "from event " + - req.params.eventID + - " failed with error: " + - err, + req.params.commentID + + "from event " + + req.params.eventID + + " failed with error: " + + err, ); }); }); -- cgit v1.2.3 From a8a17443c2d070d2d23920ffff7e4a43c905698c Mon Sep 17 00:00:00 2001 From: Gavin Mogan Date: Wed, 23 Apr 2025 17:27:55 -0700 Subject: Refactor for everywhere to use sendEmailFromTemplate everywhere * Created a singleton to house handlebars so req doesn't need to be passed everywhere (should make unit testing easier later) * Subjectline for sendgrid and nodemailer are both always prefixed in sendEmail() * removed prefix subjectline from all other email places * added a couple if (!event) { return 404 } to help make typescript happy * some minor eslint auto fixes (looks like let => const where it can) --- src/routes.js | 112 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 51 deletions(-) (limited to 'src/routes.js') diff --git a/src/routes.js b/src/routes.js index f609f94..d5b5877 100755 --- a/src/routes.js +++ b/src/routes.js @@ -9,8 +9,6 @@ import crypto from "crypto"; import request from "request"; import niceware from "niceware"; import ical from "ical"; -import sgMail from "@sendgrid/mail"; -import nodemailer from "nodemailer"; import fileUpload from "express-fileupload"; import Jimp from "jimp"; import schedule from "node-schedule"; @@ -19,20 +17,15 @@ import { broadcastDeleteMessage, processInbox, } from "./activitypub.js"; -import { renderEmail } from "./lib/handlebars.js"; import Event from "./models/Event.js"; import EventGroup from "./models/EventGroup.js"; import path from "path"; import { activityPubContentType } from "./lib/activitypub.js"; import { hashString } from "./util/generator.js"; -import { initEmailService, sendEmail } from "./lib/email.js"; +import { initEmailService, sendEmailFromTemplate } from "./lib/email.js"; const config = getConfig(); const domain = config.general.domain; -const contactEmail = config.general.email; -const siteName = config.general.site_name; -const mailService = config.general.mail_service; -const siteLogo = config.general.email_logo_url; const isFederated = config.general.is_federated || true; // This alphabet (used to generate all event, group, etc. IDs) is missing '-' @@ -329,14 +322,14 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { "Sending emails to: " + attendeeEmails, ); - renderEmail( - req.app.get("hbsInstance"), - "deleteEvent/deleteEvent", + sendEmailFromTemplate( + attendeeEmails, + '', + `${event?.name} was deleted`, + "deleteEvent", { eventName: event?.name, }, - ).then( - ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: ${event?.name} was deleted`, text, html) ).catch((e) => { console.error('error sending attendy email', e.toString()); res.status(500).end(); @@ -634,6 +627,10 @@ router.post("/attendevent/:eventID", async (req, res) => { }, ) .then((event) => { + if (!event) { + return res.sendStatus(404); + } + addToLog( "addEventAttendee", "success", @@ -641,9 +638,11 @@ router.post("/attendevent/:eventID", async (req, res) => { ); if (sendEmails) { if (req.body.attendeeEmail) { - renderEmail( - req.app.get("hbsInstance"), - "addEventAttendee/addEventAttendee", + sendEmailFromTemplate( + req.body.attendeeEmail, + '', + `You're RSVPed to ${event.name}`, + "addEventAttendee", { eventID: req.params.eventID, removalPassword: req.body.removalPassword, @@ -651,8 +650,6 @@ router.post("/attendevent/:eventID", async (req, res) => { req.body.removalPassword, ), }, - ).then( - ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You're RSVPed to ${event.name}`, text, html) ).catch((e) => { console.error('error sending addEventAttendee email', e.toString()); res.status(500).end(); @@ -686,11 +683,14 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { ) { return res.sendStatus(200); } - Event.updateOne( + Event.findOneAndUpdate( { id: req.params.eventID }, { $pull: { attendees: { _id: req.params.attendeeID } } }, ) - .then((response) => { + .then((event) => { + if (!event) { + return res.sendStatus(404); + } addToLog( "oneClickUnattend", "success", @@ -699,14 +699,14 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { if (sendEmails) { // currently this is never called because we don't have the email address if (req.body.attendeeEmail) { - renderEmail( - req.app.get("hbsInstance"), - "removeEventAttendee/removeEventAttendee", + sendEmailFromTemplate( + req.body.attendeeEmail, + '', + `You have been removed from an event`, + "removeEventAttendee", { - eventName: req.params.eventName, + eventName: event.name, }, - ).then( - ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You have been removed from an event`, text, html) ).catch((e) => { console.error('error sending removeEventAttendeeHtml email', e.toString()); res.status(500).end(); @@ -732,11 +732,14 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { }); router.post("/removeattendee/:eventID/:attendeeID", (req, res) => { - Event.updateOne( + Event.findOneAndUpdate( { id: req.params.eventID }, { $pull: { attendees: { _id: req.params.attendeeID } } }, ) - .then((response) => { + .then((event) => { + if (!event) { + return res.sendStatus(404); + } addToLog( "removeEventAttendee", "success", @@ -745,14 +748,14 @@ router.post("/removeattendee/:eventID/:attendeeID", (req, res) => { if (sendEmails) { // currently this is never called because we don't have the email address if (req.body.attendeeEmail) { - renderEmail( - req.app.get("hbsInstance"), - "removeEventAttendee/removeEventAttendee", + sendEmailFromTemplate( + req.body.attendeeEmail, + '', + `You have been removed from an event`, + "removeEventAttendee", { - eventName: req.params.eventName, + eventName: event.name, }, - ).then( - ({ html, text }) => sendEmail(req.body.attendeeEmail, '', `${siteName}: You have been removed from an event`, text, html) ).catch((e) => { console.error('error sending removeEventAttendeeHtml email', e.toString()); res.status(500).end(); @@ -798,16 +801,16 @@ router.post("/subscribe/:eventGroupID", (req, res) => { eventGroup.subscribers.push(subscriber); eventGroup.save(); if (sendEmails) { - renderEmail( - req.app.get("hbsInstance"), - "subscribed/subscribed", + sendEmailFromTemplate( + subscriber.email, + '', + `You have subscribed to an event group`, + "subscribed", { eventGroupName: eventGroup.name, eventGroupID: eventGroup.id, emailAddress: encodeURIComponent(subscriber.email), }, - ).then( - ({ html, text }) => sendEmail(subscriber.email, '', `${siteName}: You have subscribed to an event group`, text, html) ).catch((e) => { console.error('error sending removeEventAttendeeHtml email', e.toString()); res.status(500).end(); @@ -875,7 +878,9 @@ router.post("/post/comment/:eventID", (req, res) => { id: req.params.eventID, }, function (err, event) { - if (!event) return; + if (!event) { + return res.sendStatus(404); + } event.comments.push(newComment); event .save() @@ -914,15 +919,15 @@ router.post("/post/comment/:eventID", (req, res) => { console.log( "Sending emails to: " + attendeeEmails, ); - renderEmail( - req.app.get("hbsInstance"), - "addEventComment/addEventComment", + sendEmailFromTemplate( + event?.creatorEmail || config.general.email, + attendeeEmails, + `New comment in ${event.name}`, + "addEventComment", { eventID: req.params.eventID, commentAuthor: req.body.commentAuthor, }, - ).then( - ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: New comment in ${event.name}`, text, html) ).catch((e) => { console.error('error sending removeEventAttendeeHtml email', e.toString()); res.status(500).end(); @@ -967,7 +972,9 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { id: req.params.eventID, }, function (err, event) { - if (!event) return; + if (!event) { + return res.sendStatus(404); + } var parentComment = event.comments.id(commentID); parentComment.replies.push(newReply); event @@ -999,6 +1006,9 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { if (sendEmails) { Event.findOne({ id: req.params.eventID }).then( (event) => { + if (!event) { + return res.sendStatus(404); + } const attendeeEmails = event.attendees .filter( (o) => @@ -1009,15 +1019,15 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { console.log( "Sending emails to: " + attendeeEmails, ); - renderEmail( - req.app.get("hbsInstance"), - "addEventComment/addEventComment", + sendEmailFromTemplate( + event?.creatorEmail || config.general.email, + attendeeEmails, + `New comment in ${event.name}`, + "addEventComment", { eventID: req.params.eventID, commentAuthor: req.body.replyAuthor, }, - ).then( - ({ html, text }) => sendEmail(attendeeEmails, '', `${siteName}: New comment in ${event.name}`, text, html) ).catch((e) => { console.error('error sending removeEventAttendeeHtml email', e.toString()); res.status(500).end(); -- cgit v1.2.3 From 14041a319cace03cfc23c0a919ed81fb141f88ce Mon Sep 17 00:00:00 2001 From: Gavin Mogan Date: Fri, 25 Apr 2025 21:43:39 -0700 Subject: Refactor to have email service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move hbsInstance back to app * Add email and hbs to req so typescript 🎉🎉🎉 * Init Email and config once --- src/routes.js | 313 +++++++++++++++++++++++++++------------------------------- 1 file changed, 147 insertions(+), 166 deletions(-) (limited to 'src/routes.js') diff --git a/src/routes.js b/src/routes.js index d5b5877..d0fd9fc 100755 --- a/src/routes.js +++ b/src/routes.js @@ -22,7 +22,7 @@ import EventGroup from "./models/EventGroup.js"; import path from "path"; import { activityPubContentType } from "./lib/activitypub.js"; import { hashString } from "./util/generator.js"; -import { initEmailService, sendEmailFromTemplate } from "./lib/email.js"; +import { EmailService } from "./lib/email.js"; const config = getConfig(); const domain = config.general.domain; @@ -36,10 +36,6 @@ const nanoid = customAlphabet( ); const router = express.Router(); - -let sendEmails = false; -initEmailService().then((emailService) => (sendEmails = emailService)); - router.use(fileUpload()); // SCHEDULED DELETION @@ -309,34 +305,30 @@ router.post("/deleteevent/:eventID/:editToken", (req, res) => { }); res.end(); - // Send emails here otherwise they don't exist lol - if (sendEmails) { - const attendeeEmails = event?.attendees?.filter( - (o) => - o.status === "attending" && - o.email, - ) - .map((o) => o.email || '') || []; - if (attendeeEmails.length) { - console.log( - "Sending emails to: " + - attendeeEmails, - ); - sendEmailFromTemplate( - attendeeEmails, - '', - `${event?.name} was deleted`, - "deleteEvent", - { - eventName: event?.name, - }, - ).catch((e) => { - console.error('error sending attendy email', e.toString()); - res.status(500).end(); - }); - } else { - console.log("Nothing to send!"); - } + const attendeeEmails = event?.attendees?.filter( + (o) => + o.status === "attending" && + o.email, + ) + .map((o) => o.email || '') || []; + if (attendeeEmails.length) { + console.log( + "Sending emails to: " + + attendeeEmails, + ); + req.emailService.sendEmailFromTemplate({ + to: attendeeEmails, + subject: `${event?.name} was deleted`, + templateName: "deleteEvent", + templateData: { + eventName: event?.name, + }, + }).catch((e) => { + console.error('error sending attendee email', e.toString()); + res.status(500).end(); + }); + } else { + console.log("Nothing to send!"); } }) .catch((err) => { @@ -636,25 +628,22 @@ router.post("/attendevent/:eventID", async (req, res) => { "success", "Attendee added to event " + req.params.eventID, ); - if (sendEmails) { - if (req.body.attendeeEmail) { - sendEmailFromTemplate( - req.body.attendeeEmail, - '', - `You're RSVPed to ${event.name}`, - "addEventAttendee", - { - eventID: req.params.eventID, - removalPassword: req.body.removalPassword, - removalPasswordHash: hashString( - req.body.removalPassword, - ), - }, - ).catch((e) => { - console.error('error sending addEventAttendee email', e.toString()); - res.status(500).end(); - }); - } + if (req.body.attendeeEmail) { + req.emailService.sendEmailFromTemplate({ + to: req.body.attendeeEmail, + subject: `You're RSVPed to ${event.name}`, + templateName: "addEventAttendee", + templateData:{ + eventID: req.params.eventID, + removalPassword: req.body.removalPassword, + removalPasswordHash: hashString( + req.body.removalPassword, + ), + }, + }).catch((e) => { + console.error('error sending addEventAttendee email', e.toString()); + res.status(500).end(); + }); } res.redirect(`/${req.params.eventID}`); }) @@ -696,22 +685,19 @@ router.get("/oneclickunattendevent/:eventID/:attendeeID", (req, res) => { "success", "Attendee removed via one click unattend " + req.params.eventID, ); - if (sendEmails) { - // currently this is never called because we don't have the email address - if (req.body.attendeeEmail) { - sendEmailFromTemplate( - req.body.attendeeEmail, - '', - `You have been removed from an event`, - "removeEventAttendee", - { - eventName: event.name, - }, - ).catch((e) => { - console.error('error sending removeEventAttendeeHtml email', e.toString()); - res.status(500).end(); - }); - } + // currently this is never called because we don't have the email address + if (req.body.attendeeEmail) { + req.emailService.sendEmailFromTemplate({ + to: req.body.attendeeEmail, + subject: `You have been removed from an event`, + templateName: "removeEventAttendee", + templateData:{ + eventName: event.name, + }, + }).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } res.writeHead(302, { Location: "/" + req.params.eventID, @@ -745,22 +731,19 @@ router.post("/removeattendee/:eventID/:attendeeID", (req, res) => { "success", "Attendee removed by admin from event " + req.params.eventID, ); - if (sendEmails) { - // currently this is never called because we don't have the email address - if (req.body.attendeeEmail) { - sendEmailFromTemplate( - req.body.attendeeEmail, - '', - `You have been removed from an event`, - "removeEventAttendee", - { - eventName: event.name, - }, - ).catch((e) => { - console.error('error sending removeEventAttendeeHtml email', e.toString()); - res.status(500).end(); - }); - } + // currently this is never called because we don't have the email address + if (req.body.attendeeEmail) { + req.emailService.sendEmailFromTemplate({ + to: req.body.attendeeEmail, + subject: `You have been removed from an event`, + templateName: "removeEventAttendee", + templateData: { + eventName: event.name, + }, + }).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); } res.writeHead(302, { Location: "/" + req.params.eventID, @@ -800,22 +783,20 @@ router.post("/subscribe/:eventGroupID", (req, res) => { } eventGroup.subscribers.push(subscriber); eventGroup.save(); - if (sendEmails) { - sendEmailFromTemplate( - subscriber.email, - '', - `You have subscribed to an event group`, - "subscribed", - { - eventGroupName: eventGroup.name, - eventGroupID: eventGroup.id, - emailAddress: encodeURIComponent(subscriber.email), - }, - ).catch((e) => { - console.error('error sending removeEventAttendeeHtml email', e.toString()); - res.status(500).end(); - }); - } + req.emailService.sendEmailFromTemplate({ + to: subscriber.email, + subject: "You have subscribed to an event group", + templateName: "subscribed", + templateData:{ + eventGroupName: eventGroup.name, + eventGroupID: eventGroup.id, + emailAddress: encodeURIComponent(subscriber.email), + }, + }).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); + return res.redirect(`/group/${eventGroup.id}`); }) .catch((error) => { @@ -906,38 +887,40 @@ router.post("/post/comment/:eventID", (req, res) => { event.followers, req.params.eventID, ); - if (sendEmails) { - Event.findOne({ id: req.params.eventID }).then( - (event) => { - const attendeeEmails = event.attendees - .filter( - (o) => - o.status === "attending" && o.email, - ) - .map((o) => o.email || '') || []; - if (attendeeEmails.length) { - console.log( - "Sending emails to: " + attendeeEmails, - ); - sendEmailFromTemplate( - event?.creatorEmail || config.general.email, - attendeeEmails, - `New comment in ${event.name}`, - "addEventComment", - { - eventID: req.params.eventID, - commentAuthor: req.body.commentAuthor, - }, - ).catch((e) => { - console.error('error sending removeEventAttendeeHtml email', e.toString()); - res.status(500).end(); - }); - } else { - console.log("Nothing to send!"); - } - }, - ); + if (!event) { + return res.sendStatus(404); } + + Event.findOne({ id: req.params.eventID }).then( + (event) => { + const attendeeEmails = event.attendees + .filter( + (o) => + o.status === "attending" && o.email, + ) + .map((o) => o.email || '') || []; + if (attendeeEmails.length) { + console.log( + "Sending emails to: " + attendeeEmails, + ); + req.emailService.sendEmailFromTemplate({ + to: event?.creatorEmail || config.general.email, + bcc: attendeeEmails, + subject: `New comment in ${event.name}`, + templateName: "addEventComment", + templateData:{ + eventID: req.params.eventID, + commentAuthor: req.body.commentAuthor, + }, + }).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); + } else { + console.log("Nothing to send!"); + } + }, + ); res.writeHead(302, { Location: "/" + req.params.eventID, }); @@ -1003,41 +986,39 @@ router.post("/post/reply/:eventID/:commentID", (req, res) => { event.followers, req.params.eventID, ); - if (sendEmails) { - Event.findOne({ id: req.params.eventID }).then( - (event) => { - if (!event) { - return res.sendStatus(404); - } - const attendeeEmails = event.attendees - .filter( - (o) => - o.status === "attending" && o.email, - ) - .map((o) => o.email || '') || []; - if (attendeeEmails.length) { - console.log( - "Sending emails to: " + attendeeEmails, - ); - sendEmailFromTemplate( - event?.creatorEmail || config.general.email, - attendeeEmails, - `New comment in ${event.name}`, - "addEventComment", - { - eventID: req.params.eventID, - commentAuthor: req.body.replyAuthor, - }, - ).catch((e) => { - console.error('error sending removeEventAttendeeHtml email', e.toString()); - res.status(500).end(); - }); - } else { - console.log("Nothing to send!"); - } - }, - ); - } + Event.findOne({ id: req.params.eventID }).then( + (event) => { + if (!event) { + return res.sendStatus(404); + } + const attendeeEmails = event.attendees + .filter( + (o) => + o.status === "attending" && o.email, + ) + .map((o) => o.email || '') || []; + if (attendeeEmails.length) { + console.log( + "Sending emails to: " + attendeeEmails, + ); + req.emailService.sendEmailFromTemplate({ + to: event?.creatorEmail || config.general.email, + bcc: attendeeEmails, + subject: `New comment in ${event.name}`, + templateName: "addEventComment", + templateData: { + eventID: req.params.eventID, + commentAuthor: req.body.replyAuthor, + }, + }).catch((e) => { + console.error('error sending removeEventAttendeeHtml email', e.toString()); + res.status(500).end(); + }); + } else { + console.log("Nothing to send!"); + } + }, + ); res.writeHead(302, { Location: "/" + req.params.eventID, }); -- cgit v1.2.3