@stamhoofd/models 2.78.1 → 2.78.3

package/dist/src/models/Email.test.js

@@ -0,0 +1,461 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const structures_1 = require("@stamhoofd/structures");
+const Email_1 = require("./Email");
+const EmailRecipient_1 = require("./EmailRecipient");
+const email_1 = require("@stamhoofd/email");
+const test_utils_1 = require("@stamhoofd/test-utils");
+const OrganizationFactory_1 = require("../factories/OrganizationFactory");
+const Platform_1 = require("./Platform");
+async function buildEmail(data) {
+    Email_1.Email.recipientLoaders.set(structures_1.EmailRecipientFilterType.Members, {
+        fetch: async (query) => {
+            return Promise.resolve(new structures_1.PaginatedResponse({
+                results: data.recipients,
+                next: undefined,
+            }));
+        },
+        count: async (query) => {
+            return data.recipients.length;
+        },
+    });
+    const model = new Email_1.Email();
+    model.userId = null;
+    model.organizationId = data.organizationId ?? null;
+    model.recipientFilter = structures_1.EmailRecipientFilter.create({
+        filters: [
+            structures_1.EmailRecipientSubfilter.create({
+                type: structures_1.EmailRecipientFilterType.Members,
+                filter: { id: { $in: ['test'] } },
+            }),
+        ],
+    });
+    model.subject = data.subject ?? 'This is a test email';
+    model.html = data.html ?? '<p>This is a test email</p>';
+    model.text = data.text ?? 'This is a test email';
+    model.json = data.json ?? {};
+    model.status = data.status ?? structures_1.EmailStatus.Draft;
+    model.attachments = [];
+    model.fromAddress = data.fromAddress ?? 'test@stamhoofd.be';
+    model.fromName = data.fromName ?? 'Stamhoofd Test Suite';
+    await model.save();
+    return model;
+}
+describe('Model.Email', () => {
+    it('Correctly whitelists email recipients', async () => {
+        test_utils_1.TestUtils.setEnvironment('WHITELISTED_EMAIL_DESTINATIONS', ['*@stamhoofd-allowed-domain-tests.be']);
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example@not-whitelisted-domain.be',
+                }),
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example2@stamhoofd-allowed-domain-tests.be',
+                }),
+            ],
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(2);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0); // never tried to send any failed emails (whitelist)
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                email: 'example2@stamhoofd-allowed-domain-tests.be',
+                sentAt: expect.any(Date),
+                failCount: 0,
+                failErrorMessage: null,
+                firstFailedAt: null,
+                lastFailedAt: null,
+            }),
+            expect.objectContaining({
+                email: 'example@not-whitelisted-domain.be',
+                sentAt: null,
+                failCount: 1,
+                failErrorMessage: 'All recipients are filtered due to environment',
+                firstFailedAt: expect.any(Date),
+                lastFailedAt: expect.any(Date),
+            }),
+        ]);
+    }, 15_000);
+    it('Retries emails on network errors', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example@domain.be',
+                }),
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example2@domain.be',
+                }),
+            ],
+        });
+        // Only one failure (the first email)
+        // It should automatically retry to send the email
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error'));
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(2);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(2);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(1); // One retry
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                email: 'example@domain.be',
+                sentAt: expect.any(Date),
+                failCount: 0,
+            }),
+            expect.objectContaining({
+                email: 'example2@domain.be',
+                sentAt: expect.any(Date),
+                failCount: 0,
+            }),
+        ]);
+    }, 15_000);
+    it('Marks email recipient as failed if fails three times', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example@domain.be',
+                }),
+                structures_1.EmailRecipient.create({
+                    firstName: 'Test',
+                    lastName: 'Test',
+                    email: 'example2@domain.be',
+                }),
+            ],
+        });
+        // Only one failure (the first email)
+        // It should automatically retry to send the email
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 1'));
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 2'));
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 3'));
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 4'));
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 5'));
+        email_1.EmailMocker.broadcast.failNext(new Error('This is a simulated network error 6'));
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(2);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(0);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(6); // Two retries for each recipient
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                email: 'example@domain.be',
+                sentAt: null,
+                failCount: 1,
+                firstFailedAt: expect.any(Date),
+                lastFailedAt: expect.any(Date),
+            }),
+            expect.objectContaining({
+                email: 'example2@domain.be',
+                sentAt: null,
+                failCount: 1,
+                firstFailedAt: expect.any(Date),
+                lastFailedAt: expect.any(Date),
+            }),
+        ]);
+    }, 15_000);
+    it('Can handle recipients without name', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    email: 'example@domain.be',
+                }),
+            ],
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                email: 'example@domain.be',
+                sentAt: expect.any(Date),
+                failCount: 0,
+            }),
+        ]);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('example@domain.be');
+    }, 15_000);
+    it('Includes recipient names in mail header', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: 'John',
+                    lastName: 'Von Doe',
+                    email: 'example@domain.be',
+                }),
+            ],
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                firstName: 'John',
+                lastName: 'Von Doe',
+                email: 'example@domain.be',
+                sentAt: expect.any(Date),
+                failCount: 0,
+            }),
+        ]);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('"John Von Doe" <example@domain.be>');
+    }, 15_000);
+    it('Skips invalid email addresses', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: 'John',
+                    lastName: 'Von Doe',
+                    email: 'invalid',
+                }),
+            ],
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(0);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                firstName: 'John',
+                lastName: 'Von Doe',
+                email: 'invalid',
+                failCount: 1,
+                failErrorMessage: 'Invalid email address',
+                firstFailedAt: expect.any(Date),
+                lastFailedAt: expect.any(Date),
+            }),
+        ]);
+    }, 15_000);
+    it('Skips empty email addresses while creating recipients', async () => {
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    firstName: '',
+                    lastName: '',
+                    email: '',
+                }),
+                structures_1.EmailRecipient.create({
+                    firstName: '',
+                    lastName: '',
+                    email: 'valid@example.com',
+                }),
+            ],
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Load recipietns
+        const recipients = await EmailRecipient_1.EmailRecipient.select().where('emailId', model.id).fetch();
+        expect(recipients).toIncludeSameMembers([
+            expect.objectContaining({
+                email: 'valid@example.com',
+                sentAt: expect.any(Date),
+            }),
+        ]);
+    }, 15_000);
+    it('Platform can send from default domain', async () => {
+        test_utils_1.TestUtils.setEnvironment('domains', {
+            ...STAMHOOFD.domains,
+            defaultTransactionalEmail: {
+                '': 'my-platform.com',
+            },
+            defaultBroadcastEmail: {
+                '': 'broadcast.my-platform.com',
+            },
+        });
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    email: 'example@domain.be',
+                }),
+            ],
+            fromAddress: 'info@my-platform.com',
+            fromName: 'My Platform',
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            to: 'example@domain.be',
+            from: '"My Platform" <info@my-platform.com>',
+            replyTo: undefined,
+        });
+    }, 15_000);
+    it('Platform cannot send from unsupported domain', async () => {
+        test_utils_1.TestUtils.setEnvironment('domains', {
+            ...STAMHOOFD.domains,
+            defaultTransactionalEmail: {
+                '': 'my-platform.com',
+            },
+            defaultBroadcastEmail: {
+                '': 'broadcast.my-platform.com',
+            },
+        });
+        const model = await buildEmail({
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    email: 'example@domain.be',
+                }),
+            ],
+            fromAddress: 'info@other-platform.com',
+            fromName: 'My Platform',
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            to: 'example@domain.be',
+            from: '"My Platform" <noreply@broadcast.my-platform.com>', // domain has changed here
+            replyTo: '"My Platform" <info@other-platform.com>', // Reply to should be set
+        });
+    }, 15_000);
+    it('Organization cannot send from platform domain', async () => {
+        test_utils_1.TestUtils.setEnvironment('domains', {
+            ...STAMHOOFD.domains,
+            defaultTransactionalEmail: {
+                '': 'my-platform.com',
+            },
+            defaultBroadcastEmail: {
+                '': 'broadcast.my-platform.com',
+            },
+        });
+        const organization = await new OrganizationFactory_1.OrganizationFactory({
+            uri: 'uritest',
+        }).create();
+        const model = await buildEmail({
+            organizationId: organization.id,
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    email: 'example@domain.be',
+                }),
+            ],
+            fromAddress: 'info@my-platform.com',
+            fromName: 'My Platform',
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            to: 'example@domain.be',
+            from: '"My Platform" <noreply-uritest@broadcast.my-platform.com>', // domain has changed here
+            replyTo: '"My Platform" <info@my-platform.com>', // Reply to should be set
+        });
+    }, 15_000);
+    it('Organization can send from platform domain if default membership organization', async () => {
+        test_utils_1.TestUtils.setEnvironment('domains', {
+            ...STAMHOOFD.domains,
+            defaultTransactionalEmail: {
+                '': 'my-platform.com',
+            },
+            defaultBroadcastEmail: {
+                '': 'broadcast.my-platform.com',
+            },
+        });
+        const organization = await new OrganizationFactory_1.OrganizationFactory({}).create();
+        const platform = await Platform_1.Platform.getShared();
+        platform.membershipOrganizationId = organization.id;
+        await platform.save();
+        const model = await buildEmail({
+            organizationId: organization.id,
+            recipients: [
+                structures_1.EmailRecipient.create({
+                    email: 'example@domain.be',
+                }),
+            ],
+            fromAddress: 'info@my-platform.com',
+            fromName: 'My Platform',
+        });
+        await model.send();
+        await model.refresh();
+        // Check if it was sent correctly
+        expect(model.recipientsStatus).toBe(structures_1.EmailRecipientsStatus.Created);
+        expect(model.recipientCount).toBe(1);
+        expect(model.status).toBe(structures_1.EmailStatus.Sent);
+        // Both have succeeded
+        expect(email_1.EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(email_1.EmailMocker.broadcast.getFailedCount()).toBe(0);
+        // Check to header
+        expect(email_1.EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            to: 'example@domain.be',
+            from: '"My Platform" <info@my-platform.com>', // domain has changed here
+            replyTo: undefined,
+        });
+    }, 15_000);
+});
+//# sourceMappingURL=Email.test.js.map

package/dist/src/models/Email.test.js.map

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

package/dist/src/models/Organization.d.ts

@@ -1,4 +1,3 @@
-import { DecodedRequest } from '@simonbackx/simple-endpoints';
 import { I18n } from '@stamhoofd/backend-i18n';
 import { EmailInterfaceRecipient } from '@stamhoofd/email';
 import { QueryableModel } from '@stamhoofd/sql';
@@ -41,12 +40,6 @@ export declare class Organization extends QueryableModel {
     static getByURI(uri: string): Promise<Organization | undefined>;
     static getByEmail(email: string): Promise<Organization | undefined>;
     static getByRegisterDomain(host: string): Promise<Organization | undefined>;
-    /**
-     * Get an Organization by looking at the host of a request
-     * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app
-     * + switch country if needed
-     */
-    static getFromRequest(request: DecodedRequest<any, any, any>): Promise<Organization>;
     /**
      * Get an Organization by looking at the host of a request
      * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app

package/dist/src/models/Organization.d.ts.map

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

package/dist/src/models/Organization.js

@@ -99,17 +99,6 @@ class Organization extends sql_1.QueryableModel {
         // Read member + address from first row
         return this.fromRow(rows[0][this.table]);
     }
-    /**
-     * Get an Organization by looking at the host of a request
-     * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app
-     * + switch country if needed
-     */
-    static async getFromRequest(request) {
-        const organization = await Organization.fromApiHost(request.host);
-        const i18n = backend_i18n_1.I18n.fromRequest(request);
-        i18n.switchToLocale({ country: organization.address.country });
-        return organization;
-    }
     /**
      * Get an Organization by looking at the host of a request
      * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app