@stamhoofd/backend 2.39.0 → 2.40.0

package/src/endpoints/organization/dashboard/email/EmailEndpoint.ts

@@ -1,46 +1,46 @@
 import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { I18n } from '@stamhoofd/backend-i18n';
 import { Email } from '@stamhoofd/email';
-import { getEmailBuilder,RateLimiter } from '@stamhoofd/models';
-import { EmailRequest, Recipient } from "@stamhoofd/structures";
+import { getEmailBuilder, RateLimiter } from '@stamhoofd/models';
+import { EmailRequest, Recipient } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 
 type Params = Record<string, never>;
 type Query = undefined;
-type Body = EmailRequest
+type Body = EmailRequest;
 type ResponseBody = undefined;
 
 export const paidEmailRateLimiter = new RateLimiter({
     limits: [
-        {   
+        {
             // Max 5.000 emails a day
             limit: 5000,
-            duration: 24 * 60 * 1000 * 60
+            duration: 24 * 60 * 1000 * 60,
         },
-        {   
+        {
             // 10.000 requests per week
             limit: 10000,
-            duration: 24 * 60 * 1000 * 60 * 7
-        }
-    ]
+            duration: 24 * 60 * 1000 * 60 * 7,
+        },
+    ],
 });
 
 export const freeEmailRateLimiter = new RateLimiter({
     limits: [
-        {   
+        {
             // Max 100 a day
             limit: 100,
-            duration: 24 * 60 * 1000 * 60
+            duration: 24 * 60 * 1000 * 60,
         },
-        {   
+        {
             // Max 200 a week
             limit: 200,
-            duration: 7 * 24 * 60 * 1000 * 60
-        }
-    ]
+            duration: 7 * 24 * 60 * 1000 * 60,
+        },
+    ],
 });
 
 /**
@@ -48,14 +48,14 @@ export const freeEmailRateLimiter = new RateLimiter({
  */
 
 export class EmailEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
-    bodyDecoder = EmailRequest as Decoder<EmailRequest>
+    bodyDecoder = EmailRequest as Decoder<EmailRequest>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "POST") {
+        if (request.method !== 'POST') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/email/legacy", {});
+        const params = Endpoint.parseParameters(request.url, '/email/legacy', {});
 
         if (params) {
             return [true, params as Params];
@@ -65,152 +65,153 @@ export class EmailEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        const {user} = await Context.authenticate()
+        const { user } = await Context.authenticate();
 
         if (!Context.auth.canSendEmails()) {
-            throw Context.auth.error()
-        }  
+            throw Context.auth.error();
+        }
 
         if (request.body.recipients.length > 5000) {
             throw new SimpleError({
-                code: "too_many_recipients",
-                message: "Too many recipients",
-                human: "Je kan maar een mail naar maximaal 5000 personen tergelijk versturen. Contacteer ons om deze limiet te verhogen indien dit nodig is.",
-                field: "recipients"
-            })
+                code: 'too_many_recipients',
+                message: 'Too many recipients',
+                human: 'Je kan maar een mail naar maximaal 5000 personen tergelijk versturen. Contacteer ons om deze limiet te verhogen indien dit nodig is.',
+                field: 'recipients',
+            });
         }
 
         // For non paid organizations, the limit is 10
         if (request.body.recipients.length > 10 && !organization.meta.packages.isPaid) {
             throw new SimpleError({
-                code: "too_many_emails",
-                message: "Too many e-mails",
-                human: "Zolang je de demo versie van Stamhoofd gebruikt kan je maar maximaal een email sturen naar 10 emailadressen. Als je het pakket aankoopt zal deze limiet er niet zijn. Dit is om misbruik te voorkomen met spammers die spam email versturen via Stamhoofd.",
-                field: "recipients"
-            })
+                code: 'too_many_emails',
+                message: 'Too many e-mails',
+                human: 'Zolang je de demo versie van Stamhoofd gebruikt kan je maar maximaal een email sturen naar 10 emailadressen. Als je het pakket aankoopt zal deze limiet er niet zijn. Dit is om misbruik te voorkomen met spammers die spam email versturen via Stamhoofd.',
+                field: 'recipients',
+            });
         }
 
-        const limiter = organization.meta.packages.isPaid ? paidEmailRateLimiter : freeEmailRateLimiter
+        const limiter = organization.meta.packages.isPaid ? paidEmailRateLimiter : freeEmailRateLimiter;
 
         try {
             limiter.track(organization.id, request.body.recipients.length);
-        } catch (e) {
+        }
+        catch (e) {
             Email.sendWebmaster({
-                subject: "[Limiet] Limiet bereikt voor aantal e-mails",
-                text: "Beste, \nDe limiet werd bereikt voor het aantal e-mails per dag. \nVereniging: "+organization.id+" ("+organization.name+")" + "\n\n" + e.message + "\n\nStamhoofd"
-            })
+                subject: '[Limiet] Limiet bereikt voor aantal e-mails',
+                text: 'Beste, \nDe limiet werd bereikt voor het aantal e-mails per dag. \nVereniging: ' + organization.id + ' (' + organization.name + ')' + '\n\n' + e.message + '\n\nStamhoofd',
+            });
 
             throw new SimpleError({
-                code: "too_many_emails_period",
-                message: "Too many e-mails limited",
-                human: "Oeps! Om spam te voorkomen limiteren we het aantal emails die je per dag/week kan versturen. Neem contact met ons op om deze limiet te verhogen.",
-                field: "recipients"
-            })
+                code: 'too_many_emails_period',
+                message: 'Too many e-mails limited',
+                human: 'Oeps! Om spam te voorkomen limiteren we het aantal emails die je per dag/week kan versturen. Neem contact met ons op om deze limiet te verhogen.',
+                field: 'recipients',
+            });
         }
-       
 
         // Validate email
-        const sender = organization.privateMeta.emails.find(e => e.id == request.body.emailId)
+        const sender = organization.privateMeta.emails.find(e => e.id == request.body.emailId);
         if (!sender) {
             throw new SimpleError({
-                code: "invalid_field",
-                message: "Invalid emailId",
-                human: "Het e-mailadres waarvan je wilt versturen bestaat niet (meer). Kijk je het na?",
-                field: "emailId"
-            })
+                code: 'invalid_field',
+                message: 'Invalid emailId',
+                human: 'Het e-mailadres waarvan je wilt versturen bestaat niet (meer). Kijk je het na?',
+                field: 'emailId',
+            });
         }
 
         // Validate attachments
         const size = request.body.attachments.reduce((value: number, attachment) => {
-            return value + attachment.content.length
-        }, 0)
-        
-        if (size > 9.5*1024*1024) {
+            return value + attachment.content.length;
+        }, 0);
+
+        if (size > 9.5 * 1024 * 1024) {
             throw new SimpleError({
-                code: "too_big_attachments",
-                message: "Too big attachments",
-                human: "Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.",
-                field: "attachments"
-            })
+                code: 'too_big_attachments',
+                message: 'Too big attachments',
+                human: 'Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.',
+                field: 'attachments',
+            });
         }
 
         const safeContentTypes = [
-            "application/msword",
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            "application/vnd.ms-excel",
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-            "application/pdf",
-            "image/jpeg",
-            "image/png",
-            "image/gif"
-        ]
+            'application/msword',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/vnd.ms-excel',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'application/pdf',
+            'image/jpeg',
+            'image/png',
+            'image/gif',
+        ];
 
         for (const attachment of request.body.attachments) {
             if (attachment.contentType && !safeContentTypes.includes(attachment.contentType)) {
                 throw new SimpleError({
-                    code: "content_type_not_supported",
-                    message: "Content-Type not supported",
-                    human: "Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.",
-                    field: "attachments"
-                })
+                    code: 'content_type_not_supported',
+                    message: 'Content-Type not supported',
+                    human: 'Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.',
+                    field: 'attachments',
+                });
             }
         }
 
         const attachments = request.body.attachments.map((attachment, index) => {
-            let filename = "bijlage-"+index;
-            
-            if (attachment.contentType == "application/pdf") {
+            let filename = 'bijlage-' + index;
+
+            if (attachment.contentType == 'application/pdf') {
                 // tmp solution for pdf only
-                filename += ".pdf"
+                filename += '.pdf';
             }
 
             // Correct file name if needed
             if (attachment.filename) {
-                filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, "-").replace(/^-+/, "").replace(/-+$/, "")
+                filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
             }
 
             return {
                 filename: filename,
                 content: attachment.content,
                 contentType: attachment.contentType ?? undefined,
-                encoding: "base64"
-            }
-        })
+                encoding: 'base64',
+            };
+        });
 
         let from = organization.getDefaultFrom(request.i18n, false, 'broadcast');
         let replyTo: string | undefined = sender.email;
 
         // Can we send from this e-mail or reply-to?
-        if (organization.privateMeta.mailDomain && organization.privateMeta.mailDomainActive && sender.email.endsWith("@"+organization.privateMeta.mailDomain)) {
-            from = sender.email
+        if (organization.privateMeta.mailDomain && organization.privateMeta.mailDomainActive && sender.email.endsWith('@' + organization.privateMeta.mailDomain)) {
+            from = sender.email;
             replyTo = undefined;
         }
 
         // Include name in form field
         if (sender.name) {
-            from = '"'+sender.name.replaceAll("\"", "\\\"")+"\" <"+from+">" 
-        } else {
-            from = '"'+organization.name.replaceAll("\"", "\\\"")+"\" <"+from+">" 
+            from = '"' + sender.name.replaceAll('"', '\\"') + '" <' + from + '>';
+        }
+        else {
+            from = '"' + organization.name.replaceAll('"', '\\"') + '" <' + from + '>';
         }
 
-        const email = request.body
+        const email = request.body;
 
         if (!email.html) {
             throw new SimpleError({
-                code: "missing_field",
-                message: "Missing html",
-                human: "Je hebt geen inhoud ingevuld voor je e-mail. Vul een bericht in en probeer opnieuw.",
-                field: "html"
-            })
+                code: 'missing_field',
+                message: 'Missing html',
+                human: 'Je hebt geen inhoud ingevuld voor je e-mail. Vul een bericht in en probeer opnieuw.',
+                field: 'html',
+            });
         }
 
         if (!email.subject) {
             throw new SimpleError({
-                code: "missing_field",
-                message: "Missing subject",
-                human: "Je hebt geen onderwerp ingevuld voor je e-mail. Vul een onderwerp in en probeer opnieuw.",
-                field: "subject"
-            })
+                code: 'missing_field',
+                message: 'Missing subject',
+                human: 'Je hebt geen onderwerp ingevuld voor je e-mail. Vul een onderwerp in en probeer opnieuw.',
+                field: 'subject',
+            });
         }
 
         // Create e-mail builder
@@ -221,32 +222,32 @@ export class EmailEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
             from,
             replyTo,
             attachments,
-            defaultReplacements: request.body.defaultReplacements ?? []
-        })
+            defaultReplacements: request.body.defaultReplacements ?? [],
+        });
 
-        Email.schedule(builder)
+        Email.schedule(builder);
 
         // Also send a copy
-        const recipient = Recipient.create(email.recipients[0])
-        recipient.email = sender.email
-        recipient.firstName = sender.name ?? null
-        recipient.lastName = null
-        recipient.userId = null
-        
-        const prefix = "<p><i>Kopie e-mail verzonden door "+user.firstName+" "+user.lastName+"</i><br /><br /></p>"
+        const recipient = Recipient.create(email.recipients[0]);
+        recipient.email = sender.email;
+        recipient.firstName = sender.name ?? null;
+        recipient.lastName = null;
+        recipient.userId = null;
+
+        const prefix = '<p><i>Kopie e-mail verzonden door ' + user.firstName + ' ' + user.lastName + '</i><br /><br /></p>';
         const builder2 = await getEmailBuilder(organization, {
             ...email,
-            subject: "[KOPIE] "+email.subject,
-            html: email.html.replace("<body>", "<body>"+prefix),
+            subject: '[KOPIE] ' + email.subject,
+            html: email.html.replace('<body>', '<body>' + prefix),
             recipients: [
-                recipient
+                recipient,
             ],
             from,
             replyTo,
-            attachments
-        })
+            attachments,
+        });
 
-        Email.schedule(builder2)
+        Email.schedule(builder2);
 
         return new Response(undefined);
     }

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -1,5 +1,5 @@
 import { AutoEncoder, Data, Decoder, EnumDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { EmailTemplate } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
 
@@ -12,13 +12,13 @@ type Body = undefined;
 
 class Query extends AutoEncoder {
     @field({ decoder: new StringNullableDecoder(StringDecoder), optional: true, nullable: true })
-    webshopId: string|null = null
+    webshopId: string | null = null;
 
-    @field({ decoder: new StringNullableDecoder(new StringArrayDecoder(StringDecoder)), optional: true, nullable: true})
-    groupIds: string[]|null = null
+    @field({ decoder: new StringNullableDecoder(new StringArrayDecoder(StringDecoder)), optional: true, nullable: true })
+    groupIds: string[] | null = null;
 
-    @field({ decoder: new StringNullableDecoder(new StringArrayDecoder(new EnumDecoder(EmailTemplateType))), optional: true, nullable: true})
-    types: EmailTemplateType[]|null = null
+    @field({ decoder: new StringNullableDecoder(new StringArrayDecoder(new EnumDecoder(EmailTemplateType))), optional: true, nullable: true })
+    types: EmailTemplateType[] | null = null;
 }
 
 type ResponseBody = EmailTemplateStruct[];
@@ -27,11 +27,11 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
     queryDecoder = Query as Decoder<Query>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/email-templates", {});
+        const params = Endpoint.parseParameters(request.url, '/email-templates', {});
 
         if (params) {
             return [true, params as Params];
@@ -41,37 +41,37 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOptionalOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         if (organization) {
             if (!await Context.auth.canReadEmailTemplates(organization.id)) {
-                throw Context.auth.error()
-            }  
-        } else {
+                throw Context.auth.error();
+            }
+        }
+        else {
             if (!Context.auth.hasPlatformFullAccess()) {
-                throw Context.auth.error()
-            } 
+                throw Context.auth.error();
+            }
         }
 
-        const types = (request.query.types ?? [...Object.values(EmailTemplateType)]).filter(type => {
+        const types = (request.query.types ?? [...Object.values(EmailTemplateType)]).filter((type) => {
             if (!organization) {
-                return EmailTemplateStruct.allowPlatformLevel(type)
+                return EmailTemplateStruct.allowPlatformLevel(type);
             }
-            return EmailTemplateStruct.allowOrganizationLevel(type)
-        })
+            return EmailTemplateStruct.allowOrganizationLevel(type);
+        });
 
-        
-        const templates = organization ? 
-            (
-                await EmailTemplate.where({ organizationId: organization.id, webshopId: request.query.webshopId ?? null, groupId: request.query.groupIds ? {sign: 'IN', value: request.query.groupIds} : null, type: {sign: 'IN', value: types}})
-            ) 
+        const templates = organization
+            ? (
+                    await EmailTemplate.where({ organizationId: organization.id, webshopId: request.query.webshopId ?? null, groupId: request.query.groupIds ? { sign: 'IN', value: request.query.groupIds } : null, type: { sign: 'IN', value: types } })
+                )
             : (
                 // Required for event emails when logged in as the platform admin
-                (request.query.webshopId || request.query.groupIds) ? 
-                    await EmailTemplate.where({ webshopId: request.query.webshopId ?? null, groupId: request.query.groupIds ? {sign: 'IN', value: request.query.groupIds} : null, type: {sign: 'IN', value: types}}) 
-                    : []
-            );        
-        const defaultTemplates = await EmailTemplate.where({ organizationId: null, type: {sign: 'IN', value: types} });
-        return new Response([...templates, ...defaultTemplates].map(template => EmailTemplateStruct.create(template)))
+                    (request.query.webshopId || request.query.groupIds)
+                        ? await EmailTemplate.where({ webshopId: request.query.webshopId ?? null, groupId: request.query.groupIds ? { sign: 'IN', value: request.query.groupIds } : null, type: { sign: 'IN', value: types } })
+                        : []
+                );
+        const defaultTemplates = await EmailTemplate.where({ organizationId: null, type: { sign: 'IN', value: types } });
+        return new Response([...templates, ...defaultTemplates].map(template => EmailTemplateStruct.create(template)));
     }
 }

package/src/endpoints/organization/dashboard/email-templates/PatchEmailTemplatesEndpoint.ts

@@ -1,5 +1,5 @@
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { EmailTemplate, Group, Webshop } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, PermissionLevel } from '@stamhoofd/structures';
 
@@ -13,14 +13,14 @@ type Query = undefined;
 type ResponseBody = EmailTemplateStruct[];
 
 export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
-    bodyDecoder = new PatchableArrayDecoder(EmailTemplateStruct as Decoder<EmailTemplateStruct>, EmailTemplateStruct.patchType() as Decoder<AutoEncoderPatchType<EmailTemplateStruct>>, StringDecoder)
+    bodyDecoder = new PatchableArrayDecoder(EmailTemplateStruct as Decoder<EmailTemplateStruct>, EmailTemplateStruct.patchType() as Decoder<AutoEncoderPatchType<EmailTemplateStruct>>, StringDecoder);
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "PATCH") {
+        if (request.method !== 'PATCH') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/email-templates", {});
+        const params = Endpoint.parseParameters(request.url, '/email-templates', {});
 
         if (params) {
             return [true, params as Params];
@@ -30,39 +30,40 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOptionalOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         if (organization) {
             if (!await Context.auth.canReadEmailTemplates(organization.id)) {
-                throw Context.auth.error()
-            }  
-        } else {
+                throw Context.auth.error();
+            }
+        }
+        else {
             if (!Context.auth.hasPlatformFullAccess()) {
-                throw Context.auth.error()
-            } 
+                throw Context.auth.error();
+            }
         }
 
-        const templates: EmailTemplate[] = []
+        const templates: EmailTemplate[] = [];
 
         // Get all patches
         for (const patch of request.body.getPatches()) {
-            const template = await EmailTemplate.getByID(patch.id)
+            const template = await EmailTemplate.getByID(patch.id);
             if (!template || !(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.notFoundOrNoAccess("Je hebt geen toegang om deze emailtemplate te bewerken")
-            } 
-            
-            template.html = patch.html ?? template.html
-            template.subject = patch.subject ?? template.subject
-            template.text = patch.text ?? template.text
-            template.json = patch.json ?? template.json
+                throw Context.auth.notFoundOrNoAccess('Je hebt geen toegang om deze emailtemplate te bewerken');
+            }
 
-            await template.save()
+            template.html = patch.html ?? template.html;
+            template.subject = patch.subject ?? template.subject;
+            template.text = patch.text ?? template.text;
+            template.json = patch.json ?? template.json;
 
-            templates.push(template)
+            await template.save();
+
+            templates.push(template);
         }
 
         for (const put of request.body.getPuts()) {
-            const struct = put.put
+            const struct = put.put;
 
             if (!EmailTemplateStruct.allowOrganizationLevel(struct.type) && organization) {
                 throw Context.auth.error();
@@ -72,54 +73,54 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
                 throw Context.auth.error();
             }
 
-            const template = new EmailTemplate()
-            template.id = struct.id
-            template.organizationId = organization?.id ?? null
-            template.webshopId = struct.webshopId
-            template.groupId = struct.groupId
+            const template = new EmailTemplate();
+            template.id = struct.id;
+            template.organizationId = organization?.id ?? null;
+            template.webshopId = struct.webshopId;
+            template.groupId = struct.groupId;
 
             if (struct.groupId) {
-                const group = await Group.getByID(struct.groupId)
+                const group = await Group.getByID(struct.groupId);
                 if (!group || !await Context.auth.canAccessGroup(group, PermissionLevel.Full)) {
                     throw Context.auth.error();
                 }
-                template.organizationId = group.organizationId
+                template.organizationId = group.organizationId;
             }
 
             if (struct.webshopId) {
-                const webshop = await Webshop.getByID(struct.webshopId)
+                const webshop = await Webshop.getByID(struct.webshopId);
                 if (!webshop || !await Context.auth.canAccessWebshop(webshop, PermissionLevel.Full)) {
                     throw Context.auth.error();
                 }
-                template.organizationId = webshop.organizationId
+                template.organizationId = webshop.organizationId;
             }
 
-            template.html = struct.html
-            template.subject = struct.subject
-            template.text = struct.text
-            template.json = struct.json
+            template.html = struct.html;
+            template.subject = struct.subject;
+            template.text = struct.text;
+            template.json = struct.json;
 
-            template.type = struct.type
+            template.type = struct.type;
 
             // Check if valid + write permissions
             if (!(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.error("Je hebt geen toegang om deze emailtemplate te maken")
-            } 
+                throw Context.auth.error('Je hebt geen toegang om deze emailtemplate te maken');
+            }
 
-            await template.save()
+            await template.save();
 
-            templates.push(template)
+            templates.push(template);
         }
 
         for (const id of request.body.getDeletes()) {
-            const template = await EmailTemplate.getByID(id)
+            const template = await EmailTemplate.getByID(id);
             if (!template || !(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.notFoundOrNoAccess("Je hebt geen toegang om deze emailtemplate te verwijderen")
-            } 
-            
-            await template.delete()
+                throw Context.auth.notFoundOrNoAccess('Je hebt geen toegang om deze emailtemplate te verwijderen');
+            }
+
+            await template.delete();
         }
-        
-        return new Response(templates.map(template => EmailTemplateStruct.create(template)))
+
+        return new Response(templates.map(template => EmailTemplateStruct.create(template)));
     }
 }