@stamhoofd/backend 2.20.0 → 2.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.20.0",
+    "version": "2.21.1",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.0",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "^2.17.0",
-        "@stamhoofd/backend-middleware": "^2.17.0",
-        "@stamhoofd/email": "^2.17.0",
-        "@stamhoofd/models": "^2.20.0",
-        "@stamhoofd/queues": "^2.17.3",
-        "@stamhoofd/sql": "^2.20.0",
-        "@stamhoofd/structures": "^2.20.0",
-        "@stamhoofd/utility": "^2.17.0",
+        "@stamhoofd/backend-i18n": "2.21.1",
+        "@stamhoofd/backend-middleware": "2.21.1",
+        "@stamhoofd/email": "2.21.1",
+        "@stamhoofd/models": "2.21.1",
+        "@stamhoofd/queues": "2.21.1",
+        "@stamhoofd/sql": "2.21.1",
+        "@stamhoofd/structures": "2.21.1",
+        "@stamhoofd/utility": "2.21.1",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "946c0ddcaa7cdc9b769d4dc9083a517fe7ad19f8"
+    "gitHead": "5762f9e0dc07731e32a5d58fb83e4aa0e3da4fa9"
 }

package/src/endpoints/auth/ForgotPasswordEndpoint.ts

@@ -1,8 +1,7 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Email } from '@stamhoofd/email';
-import { PasswordToken, User } from '@stamhoofd/models';
-import { ForgotPasswordRequest } from '@stamhoofd/structures';
+import { PasswordToken, sendEmailTemplate, User } from '@stamhoofd/models';
+import { EmailTemplateType, ForgotPasswordRequest, Recipient, Replacement } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context';
 
@@ -29,41 +28,46 @@ export class ForgotPasswordEndpoint extends Endpoint<Params, Query, Body, Respon
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        // for now we care more about UX, so we show a mesage if the user doesn't exist
         const organization = await Context.setOptionalOrganizationScope()
         const user = await User.getForAuthentication(organization?.id ?? null, request.body.email, {allowWithoutAccount: true});
         
-        const { from, replyTo } = {
-            from: organization ? organization.getStrongEmail(request.i18n) : Email.getInternalEmailFor(request.i18n),
-            replyTo: undefined
-        }
-        const name = organization ? organization.name : request.i18n.t("shared.platformName");
-
         if (!user) {
-            // Send email
-            Email.send({
-                from,
-                replyTo,
-                to: request.body.email,
-                subject: "["+name+"] Wachtwoord vergeten",
-                type: "transactional",
-                text: "Hallo, \n\nJe gaf aan dat je jouw wachtwoord bent vergeten, maar er bestaat geen account op het e-mailadres dat je hebt ingegeven ("+request.body.email+"). Niet zeker meer welk e-mailadres je kan gebruiken? Wij sturen altijd e-mails naar een e-mailadres waarop je een account hebt. Lukt dat niet? Dan moet je je eerst registreren.\n\nMet vriendelijke groeten,\n"+(name),
-            });
+            // Create e-mail builder
+            await sendEmailTemplate(organization, {
+                recipients: [
+                    Recipient.create({
+                        email: request.body.email
+                    })
+                ],
+                template: {
+                    type: EmailTemplateType.ForgotPasswordButNoAccount,
+                },
+                type: 'transactional'
+            })
 
             return new Response(undefined)
         }
 
         const recoveryUrl = await PasswordToken.getPasswordRecoveryUrl(user, organization, request.i18n)
-        
-        // Send email
-        Email.send({
-            from,
-            replyTo,
-            to: user.email,
-            subject: "Wachtwoord vergeten",
-            type: "transactional",
-            text: (user.firstName ? "Hey "+user.firstName : "Hey") + ", \n\nJe gaf aan dat je jouw wachtwoord bent vergeten. Je kan een nieuw wachtwoord instellen door op de volgende link te klikken of door deze te kopiëren in de URL-balk van je browser:\n"+recoveryUrl+"\n\nWachtwoord al teruggevonden of heb je helemaal niet aangeduid dat je je wachtwoord vergeten bent? Dan mag je deze e-mail gewoon negeren.\n\nMet vriendelijke groeten,\n"+(user.permissions ? request.i18n.t("shared.platformName") : name)
-        });
+
+        // Create e-mail builder
+        await sendEmailTemplate(organization, {
+            recipients: [
+                Recipient.create({
+                    email: request.body.email,
+                    replacements: [
+                        Replacement.create({
+                            token: 'resetUrl',
+                            value: recoveryUrl
+                        })
+                    ]
+                })
+            ],
+            template: {
+                type: EmailTemplateType.ForgotPassword,
+            },
+            type: 'transactional'
+        })
 
         return new Response(undefined);
     }

package/src/endpoints/global/files/ExportToExcelEndpoint.ts

@@ -4,7 +4,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { ArchiverWriterAdapter, exportToExcel, XlsxTransformerSheet, XlsxWriter } from '@stamhoofd/excel-writer';
-import { getEmailBuilderForTemplate, Platform, RateLimiter } from '@stamhoofd/models';
+import { getEmailBuilderForTemplate, Platform, RateLimiter, sendEmailTemplate } from '@stamhoofd/models';
 import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, LimitedFilteredRequest, PaginatedResponse, Recipient, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from "@stamhoofd/utility";
 import { Context } from '../../../helpers/Context';
@@ -90,7 +90,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
         const result = await Promise.race([
             this.job(loader, request.body, request.params.type).then(async (url: string) => {
                 if (sendEmail) {
-                    const builder = await getEmailBuilderForTemplate(organization, {
+                    await sendEmailTemplate(null, {
                         template: {
                             type: EmailTemplateType.ExcelExportSucceeded
                         },
@@ -99,13 +99,8 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
                                 token: 'downloadUrl',
                                 value: url
                             }))
-                        ],
-                        from: Email.getInternalEmailFor(Context.i18n)
+                        ]
                     })
-            
-                    if (builder) {
-                        Email.schedule(builder)
-                    }
 
                 }
 

package/src/endpoints/global/organizations/GetOrganizationFromUriEndpoint.ts

@@ -45,6 +45,14 @@ export class GetOrganizationFromUriEndpoint extends Endpoint<Params, Query, Body
                 statusCode: 404
             })
         }
+
+        if (!organization.active) {
+            throw new SimpleError({
+                code: "archived_organization",
+                message: "This organization has been archived",
+                statusCode: 404
+            })
+        }
         return new Response(await AuthenticatedStructures.organization(organization));
     }
 }

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -262,7 +262,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     }
                 }
 
-                if (request.body.meta?.tags) {
+                if (request.body.meta?.tags && (Array.isArray(request.body.meta?.tags) || request.body.meta?.tags.changes.length > 0)) {
                     if (!Context.auth.hasPlatformFullAccess()) {
                         throw Context.auth.error()
                     }

package/src/endpoints/organization/dashboard/registration-periods/SetupStepReviewEndpoint.ts

@@ -42,7 +42,7 @@ export class SetupStepReviewEndpoint extends Endpoint<Params, Query, Body, Respo
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate()
+        const { user } = await Context.authenticate()
 
         if (!await Context.auth.hasFullAccess(organization.id)) {
             throw Context.auth.error()
@@ -64,7 +64,10 @@ export class SetupStepReviewEndpoint extends Endpoint<Params, Query, Body, Respo
         const setupSteps = organizationPeriod.setupSteps;
 
         if(isReviewed) {
-            setupSteps.markReviewed(stepType);
+            setupSteps.markReviewed(stepType, {
+                userId: user.id,
+                userName: user.name ?? '?'
+            });
         } else {
             setupSteps.resetReviewed(stepType);
         }