Use single email Mailersend endpoint for auth emails

site/gatsby-site/nextauth.config.ts

@@ -35,7 +35,7 @@ export const getAuthConfig = async (req: any): Promise<NextAuthOptions> => {
           if (user) {
 
             await sendEmail({
-              recipients: [{ email }],
+              recipient: { email },
               subject: 'Secure link to log in to AIID',
               templateId: 'Login',
               dynamicData: { magicLink: url },
@@ -44,7 +44,7 @@ export const getAuthConfig = async (req: any): Promise<NextAuthOptions> => {
           else {
 
             await sendEmail({
-              recipients: [{ email }],
+              recipient: { email },
               subject: 'Secure link to create your AIID account',
               templateId: 'Signup',
               dynamicData: { magicLink: url },

site/gatsby-site/server/emails/index.ts

@@ -5,7 +5,7 @@
 import assert from "assert";
 import { RateLimiter } from "limiter";
 
-interface SendEmailParams {
+export interface SendBulkEmailParams {
     recipients: {
         email: string;
         userId?: string;
@@ -87,7 +87,7 @@
     await mailersend.email.sendBulk(emails);
 }
 
-export const sendEmail = async ({ recipients, subject, dynamicData, templateId }: SendEmailParams) => {
+export const sendBulkEmails = async ({ recipients, subject, dynamicData, templateId }: SendBulkEmailParams) => {
 
     const emailTemplateBody = templates[templateId];
 
@@ -135,3 +135,66 @@
         throw error;
     }
 }
+
+export const mailersendSingleSend = async (email: EmailParams) => {
+
+    const mailersend = new MailerSend({
+        apiKey: config.MAILERSEND_API_KEY,
+    });
+
+    assert(email.to.length == 1, 'Email must have exactly one recipient');
+    assert(!email.cc, 'Should not use the "cc" field');
+
+    await mailersend.email.send(email);
+}
+
+export interface SendEmailParams {
+    recipient: {
+        email: string;
+        userId?: string;
+    };
+    subject: string;
+    dynamicData?: {
+        magicLink?: string;
+    };
+    templateId: string;
+}
+
+export const sendEmail = async ({ recipient, subject, dynamicData, templateId }: SendEmailParams) => {
+
+    const emailTemplateBody = templates[templateId];
+
+    if (!emailTemplateBody) {
+        throw new Error(`Template not found: ${templateId}`);
+    }
+
+    const personalization = {
+        email: recipient.email,
+        data: {
+            ...dynamicData,
+            email: recipient.email,
+            userId: recipient.userId,
+            siteUrl: config.SITE_URL,
+        }
+    }
+
+    const emailParams = new EmailParams()
+        .setFrom({ email: config.NOTIFICATIONS_SENDER, name: config.NOTIFICATIONS_SENDER_NAME })
+        .setTo([new Recipient(recipient.email)])
+        .setPersonalization([personalization])
+        .setSubject(subject)
+        .setHtml(emailTemplateBody);
+    //TODO: add a text version of the email
+    // .setText("Greetings from the team, you got this message through MailerSend.");
+
+    try {
+
+        await mailersendSingleSend(emailParams);
+
+    } catch (error: any) {
+        error.message = `[Send Email]: ${error.message}`;
+        reporter.error(error);
+
+        throw error;
+    }
+}

site/gatsby-site/server/tests/next-auth.spec.ts

@@ -138,11 +138,9 @@ describe('Auth', () => {
                 dynamicData: {
                     magicLink: expect.stringMatching(/^http:\/\/localhost:8000\/api\/auth\/callback\/http-email\?callbackUrl=http%3A%2F%2Flocalhost%3A8000%2F&token=.+&email=test.user%40incidentdatabase.ai$/),
                 },
-                recipients: [
-                    {
-                        email: "[email protected]",
-                    },
-                ],
+                recipient: {
+                    email: "[email protected]",
+                },
                 subject: "Secure link to log in to AIID",
                 templateId: "Login",
 
@@ -189,11 +187,9 @@ describe('Auth', () => {
                 dynamicData: {
                     magicLink: expect.stringMatching(/^http:\/\/localhost:8000\/api\/auth\/callback\/http-email\?callbackUrl=http%3A%2F%2Flocalhost%3A8000%2Fsome-path%2Fsome-page&token=.+&email=test.user%40incidentdatabase.ai$/),
                 },
-                recipients: [
-                    {
-                        email: "[email protected]",
-                    },
-                ],
+                recipient: {
+                    email: "[email protected]",
+                },
                 subject: "Secure link to log in to AIID",
                 templateId: "Login",
 
@@ -223,11 +219,9 @@ describe('Auth', () => {
                 dynamicData: {
                     magicLink: expect.stringMatching(/^http:\/\/localhost:8000\/api\/auth\/callback\/http-email\?callbackUrl=http%3A%2F%2Flocalhost%3A8000%2F&token=.+&email=test.user%40incidentdatabase.ai$/),
                 },
-                recipients: [
-                    {
-                        email: "[email protected]",
-                    },
-                ],
+                recipient: {
+                    email: "[email protected]",
+                },
                 subject: "Secure link to create your AIID account",
                 templateId: "Signup",
             });
@@ -270,11 +264,9 @@ describe('Auth', () => {
                 dynamicData: {
                     magicLink: expect.stringMatching(/^http:\/\/localhost:8000\/api\/auth\/callback\/http-email\?callbackUrl=http%3A%2F%2Flocalhost%3A8000%2F&token=.+&email=test.user%40incidentdatabase.ai$/),
                 },
-                recipients: [
-                    {
-                        email: "[email protected]",
-                    },
-                ],
+                recipient: {
+                    email: "[email protected]",
+                },
                 subject: "Secure link to log in to AIID",
                 templateId: "Login",
             });
@@ -313,11 +305,9 @@ describe('Auth', () => {
                 dynamicData: {
                     magicLink: expect.stringMatching(/^http:\/\/localhost:8000\/api\/auth\/callback\/http-email\?callbackUrl=http%3A%2F%2Flocalhost%3A8000%2Fsome-path%2Fsome-page&token=.+&email=test.user%40incidentdatabase.ai$/),
                 },
-                recipients: [
-                    {
-                        email: "[email protected]",
-                    },
-                ],
+                recipient: {
+                    email: "[email protected]",
+                },
                 subject: "Secure link to create your AIID account",
                 templateId: "Signup",
             });

site/gatsby-site/server/tests/notifications.spec.ts

@@ -43,7 +43,7 @@ describe(`Notifications`, () => {
 
 
         mockSession('123');
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
         await processNotifications();
 
@@ -149,7 +149,7 @@ describe(`Notifications`, () => {
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
 
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
 
         const result = await processNotifications();
@@ -277,7 +277,7 @@ describe(`Notifications`, () => {
 
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
         const result = await processNotifications();
 
@@ -403,7 +403,7 @@ describe(`Notifications`, () => {
 
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
         const result = await processNotifications();
 
@@ -523,7 +523,7 @@ describe(`Notifications`, () => {
 
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
         const result = await processNotifications();
 
@@ -644,7 +644,7 @@ describe(`Notifications`, () => {
 
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockResolvedValue();
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockResolvedValue();
 
         const result = await processNotifications();
 
@@ -1294,7 +1294,7 @@ describe(`Notifications`, () => {
             }
         });
 
-        jest.spyOn(emails, 'sendEmail').mockRestore();
+        jest.spyOn(emails, 'sendBulkEmails').mockRestore();
         jest.spyOn(common, 'getUserAdminData').mockResolvedValueOnce({ userId: 'user1', email: '[email protected]' })
         jest.spyOn(common, 'getUserAdminData').mockResolvedValueOnce({ userId: 'user2', email: '[email protected]' });
 
@@ -1503,7 +1503,7 @@ describe(`Notifications`, () => {
         mockSession('123');
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue({ userId: '123', email: '[email protected]' });
 
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockImplementation(() => {
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockImplementation(() => {
             throw new Error('Failed to send email');
         });
 
@@ -1634,7 +1634,7 @@ describe(`Notifications`, () => {
         // No recipients
         jest.spyOn(common, 'getUserAdminData').mockResolvedValue(null);
 
-        const sendEmailMock = jest.spyOn(emails, 'sendEmail').mockImplementation(() => {
+        const sendEmailMock = jest.spyOn(emails, 'sendBulkEmails').mockImplementation(() => {
             throw new Error('Failed to send email');
         });
 

site/gatsby-site/src/scripts/process-notifications.ts

@@ -3,7 +3,7 @@ import config from "../../server/config";
 import { Context, DBEntity, DBIncident, DBNotification, DBReport, DBSubscription } from "../../server/interfaces";
 import * as reporter from '../../server/reporter';
 import { MongoClient } from "mongodb";
-import { sendEmail } from "../../server/emails";
+import { SendBulkEmailParams, sendBulkEmails } from "../../server/emails";
 
 const usersCache: UserAdminData[] = [];
 
@@ -104,8 +104,8 @@ async function notificationsToNewIncidents(context: Context) {
                         const incident = await incidentsCollection.findOne({ incident_id: pendingNotification.incident_id });
 
                         if (incident && recipients.length > 0) {
-                            //Send email notification
-                            const sendEmailParams = {
+
+                            const sendEmailParams: SendBulkEmailParams = {
                                 recipients,
                                 subject: 'New Incident {{incidentId}} was created',
                                 dynamicData: {
@@ -122,7 +122,7 @@ async function notificationsToNewIncidents(context: Context) {
                                 templateId: 'NewIncident' // Template value from function name sufix from "site/realm/functions/config.json"
                             };
 
-                            await sendEmail(sendEmailParams);
+                            await sendBulkEmails(sendEmailParams);
                         }
 
 
@@ -203,7 +203,7 @@ async function notificationsToIncidentUpdates(context: Context) {
 
                         if (incident && recipients.length > 0) {
 
-                            const sendEmailParams = {
+                            const sendEmailParams: SendBulkEmailParams = {
                                 recipients,
                                 subject: 'Incident {{incidentId}} was updated',
                                 dynamicData: {
@@ -218,7 +218,7 @@ async function notificationsToIncidentUpdates(context: Context) {
                                 templateId: newReportNumber ? 'NewReportAddedToAnIncident' : 'IncidentUpdate',
                             };
 
-                            await sendEmail(sendEmailParams);
+                            await sendBulkEmails(sendEmailParams);
 
                             console.log(`Incident ${incident.incident_id} updates: Pending notification was processed.`);
                         }
@@ -294,7 +294,7 @@ async function notificationsToNewEntityIncidents(context: Context) {
 
                         if (incident && entity && recipients.length > 0) {
 
-                            const sendEmailParams = {
+                            const sendEmailParams: SendBulkEmailParams = {
                                 recipients,
                                 subject: isIncidentUpdate ? 'Update Incident for {{entityName}}' : 'New Incident for {{entityName}}',
                                 dynamicData: {
@@ -314,7 +314,7 @@ async function notificationsToNewEntityIncidents(context: Context) {
                                 templateId: isIncidentUpdate ? 'EntityIncidentUpdated' : 'NewEntityIncident'
                             };
 
-                            await sendEmail(sendEmailParams);
+                            await sendBulkEmails(sendEmailParams);
 
                             console.log(`New "${entity.name}" Entity Incidents: pending notification was processed.`);
                         }
@@ -373,8 +373,7 @@ async function notificationsToNewPromotions(context: Context) {
 
                     if (incident && recipients.length > 0) {
 
-                        //Send email notification
-                        const sendEmailParams = {
+                        const sendEmailParams: SendBulkEmailParams = {
                             recipients,
                             subject: 'Your submission has been approved!',
                             dynamicData: {
@@ -387,7 +386,7 @@ async function notificationsToNewPromotions(context: Context) {
                             templateId: 'SubmissionApproved' // Template value from function name sufix from "site/realm/functions/config.json"
                         };
 
-                        await sendEmail(sendEmailParams);
+                        await sendBulkEmails(sendEmailParams);
                     }
 
                 } catch (error: any) {

site/gatsby-site/src/scripts/sendEmailTest.js

@@ -1,4 +1,4 @@
-import { sendEmail } from '../../server/emails';
+import { sendBulkEmails } from '../../server/emails';
 
 // from site/gatsby-site, run with
 // TEST_EMAIL_TO_ADDRESS=<address> dotenv run <path to>/npx ts-node src/scripts/sendEmailTest.js
@@ -33,5 +33,5 @@ if (!email) {
 
   console.log(JSON.stringify(sendEmailArguments, null, 2));
 
-  sendEmail(sendEmailArguments);
+  sendBulkEmails(sendEmailArguments);
 }