@stamhoofd/email 2.78.3 → 2.79.0

package/dist/classes/Email.d.ts

@@ -1,13 +1,12 @@
-import { I18n } from '@stamhoofd/backend-i18n';
 import Mail from 'nodemailer/lib/mailer';
 export type EmailInterfaceRecipient = {
     name?: string | null;
     email: string;
 };
 export type EmailInterfaceBase = {
-    to: string | EmailInterfaceRecipient[];
-    bcc?: string;
-    replyTo?: string;
+    to: EmailInterfaceRecipient[];
+    bcc?: EmailInterfaceRecipient[];
+    replyTo?: EmailInterfaceRecipient;
     subject: string;
     text?: string;
     html?: string;
@@ -24,7 +23,7 @@ export type EmailInterfaceBase = {
     callback?: (error: Error | null) => void;
 };
 export type EmailInterface = EmailInterfaceBase & {
-    from: string;
+    from: EmailInterfaceRecipient;
 };
 export type EmailBuilder = () => EmailInterface | undefined;
 export type InternalEmailData = {
@@ -61,13 +60,14 @@ declare class EmailStatic {
     private filterWhitelist;
     private doSend;
     private sendApi;
-    /**
-     * @deprecated
-     * Please use EmailBuilder.sendEmailTemplate
-     */
-    getInternalEmailFor(i18n: I18n): string;
-    getWebmasterFromEmail(): string;
-    getWebmasterToEmail(): string;
+    getWebmasterFromEmail(): {
+        name: string;
+        email: string;
+    };
+    getWebmasterToEmail(): {
+        name: string;
+        email: string;
+    };
     /**
      * Send an email to the webmaster
      */

package/dist/classes/Email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":"AAMA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAQzC,MAAM,MAAM,uBAAuB,GAAG;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,EAAE,EAAE,uBAAuB,EAAE,CAAC;IAC9B,GAAG,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,eAAe,GAAG,WAAW,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG;IAC9C,IAAI,EAAE,uBAAuB,CAAC;CACjC,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG,MAAM,cAAc,GAAG,SAAS,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAyBF,cAAM,WAAW;IACb,WAAW,EAAE,IAAI,CAAC;IAClB,wBAAwB,EAAE,IAAI,CAAC;IAC/B,GAAG,SAAM;IAET,YAAY,EAAE,YAAY,EAAE,CAAM;IAClC,OAAO,UAAS;IAEhB,aAAa;IAyDb,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,uBAAuB,EAAE,GAAG,uBAAuB,EAAE;IAS1E;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAmFzC,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,eAAe;YAUT,MAAM;YAyMN,OAAO;IAkCrB,qBAAqB;;;;IAOrB,mBAAmB;;;;IAOnB;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC;IAQlD,IAAI,CAAC,IAAI,EAAE,cAAc;IAYzB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAK9B,eAAe,CAAC,OAAO,EAAE,YAAY;CAIxC;AAED,eAAO,MAAM,KAAK,aAAoB,CAAC"}

package/dist/classes/Email.js

@@ -11,6 +11,25 @@ const nodemailer_1 = tslib_1.__importDefault(require("nodemailer"));
 const EmailAddress_1 = require("../models/EmailAddress");
 // Importing postmark returns undefined (this is a bug, so we need to use require)
 const postmark = require('postmark');
+function emailObjectToString(email) {
+    if (!email) {
+        return;
+    }
+    if (email.name) {
+        const cleaned = utility_1.Formatter.emailSenderName(email.name);
+        if (cleaned.length < 2) {
+            return email.email;
+        }
+        return '"' + email.name.replaceAll('"', '') + '" <' + email.email + '>';
+    }
+    return email.email;
+}
+function emailObjectsToString(emails) {
+    if (emails.length === 0) {
+        return;
+    }
+    return emails.map(emailObjectToString).join(', ');
+}
 class EmailStatic {
     transporter;
     transactionalTransporter;
@@ -204,12 +223,12 @@ class EmailStatic {
         return recipients;
     }
     async doSend(data) {
+        let recipients = data.to.filter(({ email }) => utility_1.DataValidator.isEmailValid(email));
         // Check if this email is not marked as spam
         // Filter recipients if bounced or spam
-        let recipients = this.parseTo(data.to);
         if (recipients.length === 0) {
             // Invalid string
-            console.warn('Invalid e-mail string: ' + JSON.stringify(data.to) + '. E-mail skipped');
+            console.warn('No recipients for email');
             try {
                 data.callback?.(new simple_errors_1.SimpleError({
                     code: 'all_filtered',
@@ -244,7 +263,8 @@ class EmailStatic {
             const whitelist = STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS ?? [];
             recipients = this.filterWhitelist(recipients, whitelist);
         }
-        if (recipients.length === 0) {
+        const to = emailObjectsToString(recipients);
+        if (!to || recipients.length === 0) {
             // Invalid string
             try {
                 data.callback?.(new simple_errors_1.SimpleError({
@@ -258,47 +278,23 @@ class EmailStatic {
             }
             return;
         }
-        // Rebuild to
-        const to = recipients.map((recipient) => {
-            if (!recipient.name) {
-                return recipient.email;
-            }
-            const cleanedName = utility_1.Formatter.emailSenderName(recipient.name);
-            if (cleanedName.length < 2) {
-                return recipient.email;
-            }
-            return '"' + cleanedName + '" <' + recipient.email + '>';
-        }).join(', ');
         // Clean bcc
         let bccRecipients = [];
         if (data.bcc) {
             // Filter
-            bccRecipients.push(...(await EmailAddress_1.EmailAddress.filterSendTo(this.parseTo(data.bcc))));
+            bccRecipients.push(...(await EmailAddress_1.EmailAddress.filterSendTo(data.bcc.filter(({ email }) => utility_1.DataValidator.isEmailValid(email)))));
             // Filter by environment
             if (STAMHOOFD.environment !== 'production' || (STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS && STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS.length > 0)) {
                 const whitelist = STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS ?? [];
                 bccRecipients = this.filterWhitelist(bccRecipients, whitelist);
             }
         }
-        // Rebuild to
-        const bcc = bccRecipients.length === 0
-            ? undefined
-            : bccRecipients.map((recipient) => {
-                if (!recipient.name) {
-                    return recipient.email;
-                }
-                const cleanedName = utility_1.Formatter.emailSenderName(recipient.name);
-                if (cleanedName.length < 2) {
-                    return recipient.email;
-                }
-                return '"' + cleanedName + '" <' + recipient.email + '>';
-            }).join(', ');
         this.setupIfNeeded();
         // send mail with defined transport object
         const mail = {
-            from: data.from, // sender address
-            bcc,
-            replyTo: data.replyTo,
+            from: emailObjectToString(data.from), // sender address
+            bcc: emailObjectsToString(bccRecipients),
+            replyTo: data.replyTo ? emailObjectToString(data.replyTo) : undefined,
             to,
             subject: data.subject.substring(0, 1000), // Subject line
             text: data.text, // plain text body
@@ -318,14 +314,13 @@ class EmailStatic {
                 });
             }
         }
-        const parsedFrom = this.parseEmailStr(data.from);
-        if (parsedFrom.length !== 1) {
-            throw new Error('Invalid from email ' + data.from);
+        if (!utility_1.DataValidator.isEmailValid(data.from.email)) {
+            throw new Error('Invalid from email ' + data.from.email);
         }
         try {
             // Can we send from the transactional email server?
             if (STAMHOOFD.TRANSACTIONAL_WHITELIST !== undefined && data.type === 'transactional') {
-                if (!this.matchWhitelist(parsedFrom[0], STAMHOOFD.TRANSACTIONAL_WHITELIST)) {
+                if (!this.matchWhitelist(data.from.email, STAMHOOFD.TRANSACTIONAL_WHITELIST)) {
                     // Not supported
                     data.type = 'broadcast';
                 }
@@ -385,10 +380,10 @@ class EmailStatic {
                 }
                 // Email address is not verified.
                 if (STAMHOOFD.environment === 'production') {
-                    if (data.from !== this.getWebmasterFromEmail()) {
+                    if (data.from.email !== this.getWebmasterFromEmail().email) {
                         this.sendWebmaster({
                             subject: 'E-mail kon niet worden verzonden',
-                            text: 'Een e-mail vanaf ' + data.from + ' kon niet worden verstuurd aan ' + mail.to + ': \n\n' + e + '\n\n' + (mail.text ?? ''),
+                            text: 'Een e-mail vanaf ' + data.from.email + ' kon niet worden verstuurd aan ' + mail.to + ': \n\n' + e + '\n\n' + (mail.text ?? ''),
                             type: (data.type === 'transactional') ? 'broadcast' : 'transactional',
                         });
                     }
@@ -426,19 +421,17 @@ class EmailStatic {
             throw e;
         }
     }
-    /**
-     * @deprecated
-     * Please use EmailBuilder.sendEmailTemplate
-     */
-    getInternalEmailFor(i18n) {
-        // todo: use default email in platform settings
-        return '"' + (STAMHOOFD.platformName ?? 'Stamhoofd') + ' " <hallo@' + (i18n.localizedDomains.defaultTransactionalEmail()) + '>';
-    }
     getWebmasterFromEmail() {
-        return '"' + (STAMHOOFD.platformName ?? 'Stamhoofd') + ' " <webmaster@' + (new backend_i18n_1.I18n('nl', structures_1.Country.Belgium).localizedDomains.defaultTransactionalEmail()) + '>';
+        return {
+            name: STAMHOOFD.platformName ?? 'Stamhoofd',
+            email: 'webmaster@' + (new backend_i18n_1.I18n('nl', structures_1.Country.Belgium).localizedDomains.defaultTransactionalEmail()),
+        };
     }
     getWebmasterToEmail() {
-        return 'hallo@stamhoofd.be';
+        return {
+            name: 'Stamhoofd',
+            email: 'hallo@stamhoofd.be',
+        };
     }
     /**
      * Send an email to the webmaster
@@ -446,7 +439,7 @@ class EmailStatic {
     sendWebmaster(data) {
         const mail = Object.assign(data, {
             from: this.getWebmasterFromEmail(),
-            to: this.getWebmasterToEmail(),
+            to: [this.getWebmasterToEmail()],
         });
         this.send(mail);
     }

package/dist/classes/Email.js.map

@@ -1 +1 @@
-{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":"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"}

package/dist/classes/EmailMocker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailMocker.d.ts","sourceRoot":"","sources":["../../src/classes/EmailMocker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGnD,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACxE,KAAK,cAAc,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC;AAG1E,qBAAa,WAAW;IACpB,UAAU,EAAE,iBAAiB,EAAE,CAAM;IACrC,YAAY,EAAE,iBAAiB,EAAE,CAAM;IAEvC,aAAa,EAAE,cAAc,EAAE,CAAM;IACrC,IAAI,EAAE,eAAe,GAAG,WAAW,CAAmB;gBAE1C,IAAI,GAAE,eAAe,GAAG,WAA6B;IAIjE,MAAM,CAAC,aAAa,cAAoC;IACxD,MAAM,CAAC,SAAS,cAAgC;IAEhD,MAAM,CAAC,MAAM;IAiDb,MAAM,CAAC,QAAQ;IAMf,KAAK;IAOL,MAAM,CAAC,QAAQ,EAAE,cAAc;IAI/B,WAAW;IAIX,QAAQ,CAAC,KAAK,EAAE,KAAK;IAKrB,iBAAiB;IAIjB,cAAc;IAId,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAI/B,kBAAkB;CAGrB"}
+{"version":3,"file":"EmailMocker.d.ts","sourceRoot":"","sources":["../../src/classes/EmailMocker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGnD,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACxE,KAAK,cAAc,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC;AAE1E,qBAAa,WAAW;IACpB,UAAU,EAAE,iBAAiB,EAAE,CAAM;IACrC,YAAY,EAAE,iBAAiB,EAAE,CAAM;IAEvC,aAAa,EAAE,cAAc,EAAE,CAAM;IACrC,IAAI,EAAE,eAAe,GAAG,WAAW,CAAmB;gBAE1C,IAAI,GAAE,eAAe,GAAG,WAA6B;IAIjE,MAAM,CAAC,aAAa,cAAoC;IACxD,MAAM,CAAC,SAAS,cAAgC;IAEhD,MAAM,CAAC,MAAM;IAsDb,MAAM,CAAC,QAAQ;IAMf,KAAK;IAOL,MAAM,CAAC,QAAQ,EAAE,cAAc;IAI/B,WAAW;IAIX,QAAQ,CAAC,KAAK,EAAE,KAAK;IAKrB,iBAAiB;IAIjB,cAAc;IAId,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAI/B,kBAAkB;CAGrB"}

package/dist/classes/EmailMocker.js

@@ -1,10 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailMocker = void 0;
-const tslib_1 = require("tslib");
 const Email_1 = require("./Email");
 const test_utils_1 = require("@stamhoofd/test-utils");
-const sinon_1 = tslib_1.__importDefault(require("sinon"));
 class EmailMocker {
     sentEmails = [];
     failedEmails = [];
@@ -40,17 +61,21 @@ class EmailMocker {
                 messageId: 'mocked-' + mocker.sentEmails.length,
             };
         };
-        sinon_1.default.stub(Email_1.Email, 'setupIfNeeded').callsFake(function () {
-            this.transporter = {
-                sendMail: async (data) => {
-                    return handler(EmailMocker.broadcast, data);
-                },
-            };
-            this.transactionalTransporter = {
-                sendMail: async (data) => {
-                    return handler(EmailMocker.transactional, data);
-                },
-            };
+        test_utils_1.TestUtils.addBeforeAll(async () => {
+            // We load async here because this is a dev dependency (otherwise Node will reach this and complain, breaking the boot)
+            const sinon = await Promise.resolve().then(() => __importStar(require('sinon')));
+            sinon.stub(Email_1.Email, 'setupIfNeeded').callsFake(function () {
+                this.transporter = {
+                    sendMail: async (data) => {
+                        return handler(EmailMocker.broadcast, data);
+                    },
+                };
+                this.transactionalTransporter = {
+                    sendMail: async (data) => {
+                        return handler(EmailMocker.transactional, data);
+                    },
+                };
+            });
         });
         test_utils_1.TestUtils.addAfterEach(() => {
             EmailMocker.afterAll();

package/dist/classes/EmailMocker.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailMocker.js","sourceRoot":"","sources":["../../src/classes/EmailMocker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EmailMocker.js","sourceRoot":"","sources":["../../src/classes/EmailMocker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/email",
-    "version": "2.78.3",
+    "version": "2.79.0",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
@@ -25,5 +25,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "272bfbb259109530326ec2fd8c83af5f69d6268b"
+    "gitHead": "1ba7d80ded3676ecdc63741f3e8972bd378b5ea6"
 }

package/src/classes/Email.ts

@@ -18,9 +18,9 @@ export type EmailInterfaceRecipient = {
 };
 
 export type EmailInterfaceBase = {
-    to: string | EmailInterfaceRecipient[];
-    bcc?: string;
-    replyTo?: string;
+    to: EmailInterfaceRecipient[];
+    bcc?: EmailInterfaceRecipient[];
+    replyTo?: EmailInterfaceRecipient;
     subject: string;
     text?: string;
     html?: string;
@@ -32,7 +32,7 @@ export type EmailInterfaceBase = {
 };
 
 export type EmailInterface = EmailInterfaceBase & {
-    from: string;
+    from: EmailInterfaceRecipient;
 };
 
 /// An email builder is called until it returns undefined. This allows to reduce memory usage for an e-mail with multiple recipients
@@ -50,6 +50,29 @@ export type InternalEmailData = {
     headers?: Record<string, string>;
 };
 
+function emailObjectToString(email: null | undefined): undefined;
+function emailObjectToString(email: EmailInterfaceRecipient): string;
+function emailObjectToString(email: EmailInterfaceRecipient | null | undefined): string | undefined {
+    if (!email) {
+        return;
+    }
+    if (email.name) {
+        const cleaned = Formatter.emailSenderName(email.name);
+        if (cleaned.length < 2) {
+            return email.email;
+        }
+        return '"' + email.name.replaceAll('"', '') + '" <' + email.email + '>';
+    }
+    return email.email;
+}
+
+function emailObjectsToString(emails: EmailInterfaceRecipient[]): string | undefined {
+    if (emails.length === 0) {
+        return;
+    }
+    return emails.map(emailObjectToString).join(', ');
+}
+
 class EmailStatic {
     transporter: Mail;
     transactionalTransporter: Mail;
@@ -274,12 +297,13 @@ class EmailStatic {
     }
 
     private async doSend(data: EmailInterface) {
+        let recipients = data.to.filter(({ email }) => DataValidator.isEmailValid(email));
+
         // Check if this email is not marked as spam
         // Filter recipients if bounced or spam
-        let recipients = this.parseTo(data.to);
         if (recipients.length === 0) {
             // Invalid string
-            console.warn('Invalid e-mail string: ' + JSON.stringify(data.to) + '. E-mail skipped');
+            console.warn('No recipients for email');
 
             try {
                 data.callback?.(
@@ -324,7 +348,9 @@ class EmailStatic {
             recipients = this.filterWhitelist(recipients, whitelist);
         }
 
-        if (recipients.length === 0) {
+        const to = emailObjectsToString(recipients);
+
+        if (!to || recipients.length === 0) {
             // Invalid string
             try {
                 data.callback?.(
@@ -341,23 +367,11 @@ class EmailStatic {
             return;
         }
 
-        // Rebuild to
-        const to = recipients.map((recipient) => {
-            if (!recipient.name) {
-                return recipient.email;
-            }
-            const cleanedName = Formatter.emailSenderName(recipient.name);
-            if (cleanedName.length < 2) {
-                return recipient.email;
-            }
-            return '"' + cleanedName + '" <' + recipient.email + '>';
-        }).join(', ');
-
         // Clean bcc
         let bccRecipients: EmailInterfaceRecipient[] = [];
         if (data.bcc) {
             // Filter
-            bccRecipients.push(...(await EmailAddress.filterSendTo(this.parseTo(data.bcc))));
+            bccRecipients.push(...(await EmailAddress.filterSendTo(data.bcc.filter(({ email }) => DataValidator.isEmailValid(email)))));
 
             // Filter by environment
             if (STAMHOOFD.environment !== 'production' || (STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS && STAMHOOFD.WHITELISTED_EMAIL_DESTINATIONS.length > 0)) {
@@ -365,28 +379,13 @@ class EmailStatic {
                 bccRecipients = this.filterWhitelist(bccRecipients, whitelist);
             }
         }
-
-        // Rebuild to
-        const bcc = bccRecipients.length === 0
-            ? undefined
-            : bccRecipients.map((recipient) => {
-                if (!recipient.name) {
-                    return recipient.email;
-                }
-                const cleanedName = Formatter.emailSenderName(recipient.name);
-                if (cleanedName.length < 2) {
-                    return recipient.email;
-                }
-                return '"' + cleanedName + '" <' + recipient.email + '>';
-            }).join(', ');
-
         this.setupIfNeeded();
 
         // send mail with defined transport object
         const mail: InternalEmailData = {
-            from: data.from, // sender address
-            bcc,
-            replyTo: data.replyTo,
+            from: emailObjectToString(data.from), // sender address
+            bcc: emailObjectsToString(bccRecipients),
+            replyTo: data.replyTo ? emailObjectToString(data.replyTo) : undefined,
             to,
             subject: data.subject.substring(0, 1000), // Subject line
             text: data.text, // plain text body
@@ -411,15 +410,14 @@ class EmailStatic {
             }
         }
 
-        const parsedFrom = this.parseEmailStr(data.from);
-        if (parsedFrom.length !== 1) {
-            throw new Error('Invalid from email ' + data.from);
+        if (!DataValidator.isEmailValid(data.from.email)) {
+            throw new Error('Invalid from email ' + data.from.email);
         }
 
         try {
             // Can we send from the transactional email server?
             if (STAMHOOFD.TRANSACTIONAL_WHITELIST !== undefined && data.type === 'transactional') {
-                if (!this.matchWhitelist(parsedFrom[0], STAMHOOFD.TRANSACTIONAL_WHITELIST)) {
+                if (!this.matchWhitelist(data.from.email, STAMHOOFD.TRANSACTIONAL_WHITELIST)) {
                     // Not supported
                     data.type = 'broadcast';
                 }
@@ -487,10 +485,10 @@ class EmailStatic {
 
                 // Email address is not verified.
                 if (STAMHOOFD.environment === 'production') {
-                    if (data.from !== this.getWebmasterFromEmail()) {
+                    if (data.from.email !== this.getWebmasterFromEmail().email) {
                         this.sendWebmaster({
                             subject: 'E-mail kon niet worden verzonden',
-                            text: 'Een e-mail vanaf ' + data.from + ' kon niet worden verstuurd aan ' + mail.to + ': \n\n' + e + '\n\n' + (mail.text ?? ''),
+                            text: 'Een e-mail vanaf ' + data.from.email + ' kon niet worden verstuurd aan ' + mail.to + ': \n\n' + e + '\n\n' + (mail.text ?? ''),
                             type: (data.type === 'transactional') ? 'broadcast' : 'transactional',
                         });
                     }
@@ -533,21 +531,18 @@ class EmailStatic {
         }
     }
 
-    /**
-     * @deprecated
-     * Please use EmailBuilder.sendEmailTemplate
-     */
-    getInternalEmailFor(i18n: I18n) {
-        // todo: use default email in platform settings
-        return '"' + (STAMHOOFD.platformName ?? 'Stamhoofd') + ' " <hallo@' + (i18n.localizedDomains.defaultTransactionalEmail()) + '>';
-    }
-
     getWebmasterFromEmail() {
-        return '"' + (STAMHOOFD.platformName ?? 'Stamhoofd') + ' " <webmaster@' + (new I18n('nl', Country.Belgium).localizedDomains.defaultTransactionalEmail()) + '>';
+        return {
+            name: STAMHOOFD.platformName ?? 'Stamhoofd',
+            email: 'webmaster@' + (new I18n('nl', Country.Belgium).localizedDomains.defaultTransactionalEmail()),
+        };
     }
 
     getWebmasterToEmail() {
-        return 'hallo@stamhoofd.be';
+        return {
+            name: 'Stamhoofd',
+            email: 'hallo@stamhoofd.be',
+        };
     }
 
     /**
@@ -556,7 +551,7 @@ class EmailStatic {
     sendWebmaster(data: Omit<EmailInterfaceBase, 'to'>) {
         const mail = Object.assign(data, {
             from: this.getWebmasterFromEmail(),
-            to: this.getWebmasterToEmail(),
+            to: [this.getWebmasterToEmail()],
         });
         this.send(mail);
     }

package/src/classes/EmailMocker.ts

@@ -3,7 +3,6 @@ import { TestUtils } from '@stamhoofd/test-utils';
 
 type MockedCallback = (data: InternalEmailData) => Promise<void> | void;
 type MockedResponse = { error?: Error | null; callback?: MockedCallback };
-import sinon from 'sinon';
 
 export class EmailMocker {
     sentEmails: InternalEmailData[] = [];
@@ -49,18 +48,23 @@ export class EmailMocker {
             };
         };
 
-        sinon.stub(Email, 'setupIfNeeded').callsFake(function (this: typeof Email) {
-            this.transporter = {
-                sendMail: async (data: InternalEmailData) => {
-                    return handler(EmailMocker.broadcast, data);
-                },
-            } as any;
-
-            this.transactionalTransporter = {
-                sendMail: async (data: InternalEmailData) => {
-                    return handler(EmailMocker.transactional, data);
-                },
-            } as any;
+        TestUtils.addBeforeAll(async () => {
+            // We load async here because this is a dev dependency (otherwise Node will reach this and complain, breaking the boot)
+            const sinon = await import('sinon');
+
+            sinon.stub(Email, 'setupIfNeeded').callsFake(function (this: typeof Email) {
+                this.transporter = {
+                    sendMail: async (data: InternalEmailData) => {
+                        return handler(EmailMocker.broadcast, data);
+                    },
+                } as any;
+
+                this.transactionalTransporter = {
+                    sendMail: async (data: InternalEmailData) => {
+                        return handler(EmailMocker.transactional, data);
+                    },
+                } as any;
+            });
         });
 
         TestUtils.addAfterEach(() => {