@stamhoofd/backend 2.39.1 → 2.40.0

package/src/helpers/ForwardHandler.test.ts

@@ -1,187 +1,185 @@
-/* eslint-disable jest/expect-expect */
+import { EmailAddress } from '@stamhoofd/email';
+import { OrganizationFactory, UserFactory } from '@stamhoofd/models';
+import { OrganizationEmail, PermissionLevel, Permissions } from '@stamhoofd/structures';
 
-import { EmailAddress } from "@stamhoofd/email"
-import { OrganizationFactory, UserFactory } from "@stamhoofd/models"
-import { OrganizationEmail, PermissionLevel, Permissions } from "@stamhoofd/structures"
+import { ForwardHandler } from './ForwardHandler';
 
-import { ForwardHandler } from "./ForwardHandler"
-
-describe("ForwardHandler", () => {
-    it("should send to default e-mail", async () => {
-        const organization = await new OrganizationFactory({}).create()
+describe('ForwardHandler', () => {
+    it('should send to default e-mail', async () => {
+        const organization = await new OrganizationFactory({}).create();
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "First",
-            email: "first@example.com"
-        }))
+            name: 'First',
+            email: 'first@example.com',
+        }));
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "default",
-            email: "def@example.com",
-            default: true
-        }))
-        await organization.save()
-
-        const options = await ForwardHandler.handle("From: someone@example.com\nSubject: Hello\nTo: "+organization.uri + "@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: [organization.uri + "@stamhoofd.email"],
+            name: 'default',
+            email: 'def@example.com',
+            default: true,
+        }));
+        await organization.save();
+
+        const options = await ForwardHandler.handle('From: someone@example.com\nSubject: Hello\nTo: ' + organization.uri + '@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: [organization.uri + '@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
+        });
         expect(options).toMatchObject({
             to: [
                 {
-                    email: "def@example.com",
-                    name: "default",
-                }
+                    email: 'def@example.com',
+                    name: 'default',
+                },
             ],
-            subject: "Hello",
-            replyTo: "someone@example.com"
-        })
-        expect(options!.text).toContain("Content hier")
-    })
-
-    it("should send to first e-mail", async () => {
-        const organization = await new OrganizationFactory({}).create()
+            subject: 'Hello',
+            replyTo: 'someone@example.com',
+        });
+        expect(options!.text).toContain('Content hier');
+    });
+
+    it('should send to first e-mail', async () => {
+        const organization = await new OrganizationFactory({}).create();
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "First",
-            email: "first@example.com"
-        }))
+            name: 'First',
+            email: 'first@example.com',
+        }));
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "second",
-            email: "second@example.com",
-        }))
-        await organization.save()
+            name: 'second',
+            email: 'second@example.com',
+        }));
+        await organization.save();
 
-        const options = await ForwardHandler.handle("From: someone@example.com\nSubject: Hello\nTo: "+organization.uri + "@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: [organization.uri + "@stamhoofd.email"],
+        const options = await ForwardHandler.handle('From: someone@example.com\nSubject: Hello\nTo: ' + organization.uri + '@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: [organization.uri + '@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
+        });
         expect(options).toMatchObject({
             to: [
                 {
-                    email: "first@example.com",
-                    name: "First"
-                }
+                    email: 'first@example.com',
+                    name: 'First',
+                },
             ],
-            subject: "Hello",
-            replyTo: "someone@example.com"
-        })
-        expect(options!.text).toContain("Content hier")
-    })
-
-    it("should send to administrators if no emails defined", async () => {
-        const organization = await new OrganizationFactory({}).create()
-        const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create()
-
-        const options = await ForwardHandler.handle("From: someone@example.com\nSubject: Hello\nTo: "+organization.uri + "@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: [organization.uri + "@stamhoofd.email"],
+            subject: 'Hello',
+            replyTo: 'someone@example.com',
+        });
+        expect(options!.text).toContain('Content hier');
+    });
+
+    it('should send to administrators if no emails defined', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
+
+        const options = await ForwardHandler.handle('From: someone@example.com\nSubject: Hello\nTo: ' + organization.uri + '@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: [organization.uri + '@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
+        });
         expect(options).toMatchObject({
             to: [
                 {
                     email: user.email,
-                    name: null
-                }
+                    name: null,
+                },
             ],
-            subject: "Hello",
-            replyTo: "someone@example.com"
-        })
-        expect(options!.text).toContain("Content hier")
+            subject: 'Hello',
+            replyTo: 'someone@example.com',
+        });
+        expect(options!.text).toContain('Content hier');
 
         // Check notice
-        expect(options!.text).toContain("naar alle beheerders")
-    })
-
-    it("should send to all full administrators if no emails defined", async () => {
-        const organization = await new OrganizationFactory({}).create()
-        const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create()
-        const user2 = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create()
-        
+        expect(options!.text).toContain('naar alle beheerders');
+    });
+
+    it('should send to all full administrators if no emails defined', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
+        const user2 = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
+
         // Admin that should get ignored
-        await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Read }) }).create()
+        await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Read }) }).create();
 
-        const options = await ForwardHandler.handle("From: someone@example.com\nSubject: Hello\nTo: "+organization.uri + "@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: [organization.uri + "@stamhoofd.email"],
+        const options = await ForwardHandler.handle('From: someone@example.com\nSubject: Hello\nTo: ' + organization.uri + '@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: [organization.uri + '@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
+        });
 
         expect(options).toMatchObject({
-            subject: "Hello",
-            replyTo: "someone@example.com"
-        })
+            subject: 'Hello',
+            replyTo: 'someone@example.com',
+        });
         expect(options!.to).toIncludeAllMembers([
             {
                 email: user.email,
-                name: null
+                name: null,
             },
             {
                 email: user2.email,
-                name: null
-            }
-        ])
-        expect(options!.text).toContain("Content hier")
+                name: null,
+            },
+        ]);
+        expect(options!.text).toContain('Content hier');
 
         // Check notice
-        expect(options!.text).toContain("naar alle beheerders")
-    })
+        expect(options!.text).toContain('naar alle beheerders');
+    });
 
-    it("should ignore aws bounce emails", async () => {
-        const organization = await new OrganizationFactory({}).create()
+    it('should ignore aws bounce emails', async () => {
+        const organization = await new OrganizationFactory({}).create();
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "First",
-            email: "first@example.com"
-        }))
+            name: 'First',
+            email: 'first@example.com',
+        }));
         organization.privateMeta.emails.push(OrganizationEmail.create({
-            name: "second",
-            email: "second@example.com",
-        }))
-        await organization.save()
+            name: 'second',
+            email: 'second@example.com',
+        }));
+        await organization.save();
 
-        const options = await ForwardHandler.handle("From: bounces@amazonses.com\nSubject: Hello\nTo: "+organization.uri + "@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: [organization.uri + "@stamhoofd.email"],
+        const options = await ForwardHandler.handle('From: bounces@amazonses.com\nSubject: Hello\nTo: ' + organization.uri + '@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: [organization.uri + '@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
-        expect(options).toBeUndefined()
-    })
+        });
+        expect(options).toBeUndefined();
+    });
 
-    it("should ignore aws bounce emails for unknown organizations", async () => {
-        const options = await ForwardHandler.handle("From: bounces@amazonses.com\nSubject: Hello\nTo: ksjdgsdgkjlsdg@stamhoofd.email\nContent-Type: text/plain\n\nContent hier", {
-            recipients: ["ksjdgsdgkjlsdg@stamhoofd.email"],
+    it('should ignore aws bounce emails for unknown organizations', async () => {
+        const options = await ForwardHandler.handle('From: bounces@amazonses.com\nSubject: Hello\nTo: ksjdgsdgkjlsdg@stamhoofd.email\nContent-Type: text/plain\n\nContent hier', {
+            recipients: ['ksjdgsdgkjlsdg@stamhoofd.email'],
             spamVerdict: { status: 'PASS' },
             virusVerdict: { status: 'PASS' },
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
-        expect(options).toBeUndefined()
-    })
-
-    it("should unsubscribe email addresses that send to unsubscribe", async () => {
-        const address = new EmailAddress()
-        address.email = "exampleaddress-unsusbcribe-test@example.com";
-        address.organizationId = null
+        });
+        expect(options).toBeUndefined();
+    });
+
+    it('should unsubscribe email addresses that send to unsubscribe', async () => {
+        const address = new EmailAddress();
+        address.email = 'exampleaddress-unsusbcribe-test@example.com';
+        address.organizationId = null;
         address.token = null;
-        await address.save()
+        await address.save();
 
-        const id = address.id
+        const id = address.id;
 
         const options = await ForwardHandler.handle(`From: bounces@amazonses.com\nSubject: Hello\nTo: unsubscribe+${id}@stamhoofd.email\nContent-Type: text/plain\n\nContent hier`, {
             recipients: [`unsubscribe+${id}@stamhoofd.email`],
@@ -190,16 +188,16 @@ describe("ForwardHandler", () => {
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
-        expect(options).toBeUndefined()
+        });
+        expect(options).toBeUndefined();
 
         // Refresh adress and check unsubscribed for all
-        const updatedAddress = await EmailAddress.getByID(id)
-        expect(updatedAddress).toBeDefined()
+        const updatedAddress = await EmailAddress.getByID(id);
+        expect(updatedAddress).toBeDefined();
         expect(updatedAddress!.unsubscribedAll).toEqual(true);
-    })
+    });
 
-    it("should forward unsubscribe emails to unrecognized id", async () => {
+    it('should forward unsubscribe emails to unrecognized id', async () => {
         const options = await ForwardHandler.handle(`From: bounces@amazonses.com\nSubject: Hello\nTo: unsubscribe+testid@stamhoofd.email\nContent-Type: text/plain\n\nContent hier`, {
             recipients: [`unsubscribe+testid@stamhoofd.email`],
             spamVerdict: { status: 'PASS' },
@@ -207,10 +205,10 @@ describe("ForwardHandler", () => {
             spfVerdict: { status: 'PASS' },
             dkimVerdict: { status: 'PASS' },
             dmarcVerdict: { status: 'PASS' },
-        })
+        });
         expect(options).toMatchObject({
-             to: "hallo@stamhoofd.be",
-            subject: "E-mail unsubscribe mislukt",
+            to: 'hallo@stamhoofd.be',
+            subject: 'E-mail unsubscribe mislukt',
         });
-    })
-})
+    });
+});

package/src/helpers/ForwardHandler.ts

@@ -1,119 +1,125 @@
-import { Email, EmailAddress, EmailInterfaceRecipient } from "@stamhoofd/email";
-import { Organization } from "@stamhoofd/models";
-import { Formatter } from "@stamhoofd/utility";
-import { simpleParser } from "mailparser";
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
+import { Email, EmailAddress, EmailInterfaceRecipient } from '@stamhoofd/email';
+import { Organization } from '@stamhoofd/models';
+import { Formatter } from '@stamhoofd/utility';
+import { simpleParser } from 'mailparser';
 
 export class ForwardHandler {
     static async handle(content: any, receipt: {
-            recipients: string[];
-            spamVerdict: { status: 'PASS' | string };
-            virusVerdict: { status: 'PASS' | string };
-            spfVerdict: { status: 'PASS' | string };
-            dkimVerdict: { status: 'PASS' | string };
-            dmarcVerdict: { status: 'PASS' | string };
-        }
+        recipients: string[];
+        spamVerdict: { status: 'PASS' | string };
+        virusVerdict: { status: 'PASS' | string };
+        spfVerdict: { status: 'PASS' | string };
+        dkimVerdict: { status: 'PASS' | string };
+        dmarcVerdict: { status: 'PASS' | string };
+    },
     ) {
-        const recipients = receipt.recipients
-        const email: string | undefined = recipients[0]
-        const organization: Organization | undefined = email ? await Organization.getByEmail(email) : undefined
+        const recipients = receipt.recipients;
+        const email: string | undefined = recipients[0];
+        const organization: Organization | undefined = email ? await Organization.getByEmail(email) : undefined;
 
         const parsed = await simpleParser(content);
-        const from = parsed.from?.value[0]?.address
+        const from = parsed.from?.value[0]?.address;
 
-        if (from && from.endsWith("amazonses.com") && organization) {
-            console.log("Bounce e-mails from AWS SES for organizations are not forwarded. Received from "+from+", to "+email)
+        if (from && from.endsWith('amazonses.com') && organization) {
+            console.log('Bounce e-mails from AWS SES for organizations are not forwarded. Received from ' + from + ', to ' + email);
             return;
         }
 
         // Unsubscribe email?
         for (const domain of Object.values(STAMHOOFD.domains.defaultBroadcastEmail ?? {})) {
-            if (email && email?.startsWith("unsubscribe+") && email.endsWith('@' + domain)) {
+            if (email && email?.startsWith('unsubscribe+') && email.endsWith('@' + domain)) {
                 // Get id
-                const id = email.substring("unsubscribe+".length, email.indexOf('@' + domain))
-                const model = await EmailAddress.getByID(id)
-                
+                const id = email.substring('unsubscribe+'.length, email.indexOf('@' + domain));
+                const model = await EmailAddress.getByID(id);
+
                 if (model) {
-                    console.log('[Unsubscribe] Received an unsubscribe request for ' + model.email + ' from ' + from)
+                    console.log('[Unsubscribe] Received an unsubscribe request for ' + model.email + ' from ' + from);
                     if (model.unsubscribedAll) {
                         // Ignore
                         return;
                     }
-                    model.unsubscribedAll = true
-                    await model.save()
-                } else {
-                    console.error('[Unsubscribe] Received an unsubscribe request for unknown ID ' + id + ' from ' + from)
+                    model.unsubscribedAll = true;
+                    await model.save();
+                }
+                else {
+                    console.error('[Unsubscribe] Received an unsubscribe request for unknown ID ' + id + ' from ' + from);
 
                     // Forward
                     return {
                         from: Email.getWebmasterFromEmail(),
                         to: Email.getWebmasterToEmail(),
-                        subject: "E-mail unsubscribe mislukt",
-                        text: "Beste,\n\nEr werd een unsubscribe gemeld op "+email+" die niet kon worden verwerkt. Gelieve dit na te kijken.\n\nStamhoofd"
-                    }
-
+                        subject: 'E-mail unsubscribe mislukt',
+                        text: 'Beste,\n\nEr werd een unsubscribe gemeld op ' + email + ' die niet kon worden verwerkt. Gelieve dit na te kijken.\n\nStamhoofd',
+                    };
                 }
                 return;
             }
         }
 
-        if (receipt.spamVerdict.status != "PASS" || receipt.virusVerdict.status != "PASS" || !(receipt.spfVerdict.status == "PASS" || receipt.dkimVerdict.status == "PASS")) {
-            console.error("Received spam or virus e-mail. Ignoring", 'to', recipients, 'from', email, 'subject', parsed.subject)
+        if (receipt.spamVerdict.status !== 'PASS' || receipt.virusVerdict.status !== 'PASS' || !(receipt.spfVerdict.status == 'PASS' || receipt.dkimVerdict.status == 'PASS')) {
+            console.error('Received spam or virus e-mail. Ignoring', 'to', recipients, 'from', email, 'subject', parsed.subject);
             return;
         }
 
         // Send a new e-mail
-        let defaultEmail: EmailInterfaceRecipient[]|string = Email.getWebmasterToEmail()
-        let organizationEmails: EmailInterfaceRecipient[] = []
-        const extraDescription = "Dit bericht werd verstuurd naar "+email+", en werd automatisch doorgestuurd naar alle beheerders. Stel in Stamhoofd de e-mailadressen in om ervoor te zorgen dat antwoorden naar een specifiek e-mailadres worden verstuurd."
-        
+        let defaultEmail: EmailInterfaceRecipient[] | string = Email.getWebmasterToEmail();
+        let organizationEmails: EmailInterfaceRecipient[] = [];
+        const extraDescription = 'Dit bericht werd verstuurd naar ' + email + ', en werd automatisch doorgestuurd naar alle beheerders. Stel in Stamhoofd de e-mailadressen in om ervoor te zorgen dat antwoorden naar een specifiek e-mailadres worden verstuurd.';
+
         function doBounce() {
             if (!from) {
-                return
+                return;
             }
 
-            if (from.endsWith("@amazonses.com")) {
+            if (from.endsWith('@amazonses.com')) {
                 // Ignore
-                return
+                return;
             }
 
             // Send back to receiver without including the original message to avoid spam
             return {
                 from: email ?? Email.getWebmasterToEmail(),
                 to: from,
-                subject: "Ongeldig e-mailadres",
-                text: "Beste,\n\nDe vereniging die je probeert te bereiken via "+email+" is helaas niet bereikbaar via dit e-mailadres. Dit e-mailadres wordt enkel gebruikt voor het versturen van automatische e-mails in naam van een vereniging. Probeer de vereniging te contacteren via een ander e-mailadres.\n\nBedankt."
-            }
+                subject: 'Ongeldig e-mailadres',
+                text: 'Beste,\n\nDe vereniging die je probeert te bereiken via ' + email + ' is helaas niet bereikbaar via dit e-mailadres. Dit e-mailadres wordt enkel gebruikt voor het versturen van automatische e-mails in naam van een vereniging. Probeer de vereniging te contacteren via een ander e-mailadres.\n\nBedankt.',
+            };
         }
-        
+
         if (organization) {
-            organizationEmails = await organization.getReplyEmails()
+            organizationEmails = await organization.getReplyEmails();
             if (!organizationEmails) {
-                if (STAMHOOFD.environment === "test") {
+                if (STAMHOOFD.environment === 'test') {
                     // ignore
-                } else {
-                    console.error("Missing reply emails for organization "+organization.id)
+                }
+                else {
+                    console.error('Missing reply emails for organization ' + organization.id);
                 }
                 return doBounce();
-            } else {
-                defaultEmail = organizationEmails
             }
-        } else {
+            else {
+                defaultEmail = organizationEmails;
+            }
+        }
+        else {
             return doBounce();
         }
 
-        console.log("Forward to "+defaultEmail)       
-        
-        let html: string | undefined = undefined
+        console.log('Forward to ' + defaultEmail);
+
+        let html: string | undefined = undefined;
 
         if (parsed.html !== false) {
             // Search for body
-            const body = parsed.html.toLowerCase().indexOf("<body")
+            const body = parsed.html.toLowerCase().indexOf('<body');
 
-            if (body != -1) {
-                const endTag = parsed.html.indexOf(">", body)
-                html = parsed.html.substring(0, endTag + 1) + "<p><i>"+Formatter.escapeHtml(extraDescription)+"<br><br></i></p>"+parsed.html.substring(endTag + 1)
-            } else {
-                html = "<p><i>"+Formatter.escapeHtml(extraDescription)+"<br><br></i></p>"+parsed.html
+            if (body !== -1) {
+                const endTag = parsed.html.indexOf('>', body);
+                html = parsed.html.substring(0, endTag + 1) + '<p><i>' + Formatter.escapeHtml(extraDescription) + '<br><br></i></p>' + parsed.html.substring(endTag + 1);
+            }
+            else {
+                html = '<p><i>' + Formatter.escapeHtml(extraDescription) + '<br><br></i></p>' + parsed.html;
             }
         }
 
@@ -121,22 +127,22 @@ export class ForwardHandler {
             from: email ?? Email.getWebmasterToEmail(),
             to: defaultEmail,
             replyTo: parsed.from?.text,
-            subject: parsed.subject ?? "Doorgestuurd bericht",
-            text: parsed.text ? extraDescription + "\n\n" + parsed.text : undefined,
+            subject: parsed.subject ?? 'Doorgestuurd bericht',
+            text: parsed.text ? extraDescription + '\n\n' + parsed.text : undefined,
             html: html,
-            attachments: parsed.attachments.flatMap(a => {
+            attachments: parsed.attachments.flatMap((a) => {
                 if (a.cid) {
                     // Already done inline in html
-                    return []
+                    return [];
                 }
                 return [{
-                    filename: a.filename ?? "",
-                    content: a.content.toString("utf-8"),
-                    contentType: a.contentType
-                }]
-            })
-        }
+                    filename: a.filename ?? '',
+                    content: a.content.toString('utf-8'),
+                    contentType: a.contentType,
+                }];
+            }),
+        };
 
-        return options
+        return options;
     }
 }