@stamhoofd/backend 2.19.0 → 2.21.0

package/.env.template.json

@@ -58,7 +58,7 @@
     "LATEST_IOS_VERSION": 0,
     "LATEST_ANDROID_VERSION": 0,
 
-    "NOLT_SSO_SECRET_KEY": "",
+    "NOLT_SSO_SECRET_KEY": "optional",
     "INTERNAL_SECRET_KEY": "",
     "CRONS_DISABLED": false,
     "WHITELISTED_EMAIL_DESTINATIONS": ["*"],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.19.0",
+    "version": "2.21.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -38,11 +38,11 @@
         "@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.19.0",
+        "@stamhoofd/email": "^2.21.0",
+        "@stamhoofd/models": "^2.21.0",
         "@stamhoofd/queues": "^2.17.3",
-        "@stamhoofd/sql": "^2.18.0",
-        "@stamhoofd/structures": "^2.19.0",
+        "@stamhoofd/sql": "^2.20.0",
+        "@stamhoofd/structures": "^2.21.0",
         "@stamhoofd/utility": "^2.17.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "876e7b976122e1c2f67d4cceebe92ec2af2bc35a"
+    "gitHead": "e6707735a221da68b4e6e669f60f0427ac8acc5d"
 }

package/src/crons.ts

@@ -1,21 +1,14 @@
 import { Database } from '@simonbackx/simple-database';
 import { logger, StyledText } from "@simonbackx/simple-logging";
 import { I18n } from '@stamhoofd/backend-i18n';
-import { Email } from '@stamhoofd/email';
-import { EmailAddress } from '@stamhoofd/email';
-import { Group, STPackage, Webshop } from '@stamhoofd/models';
-import { Organization } from '@stamhoofd/models';
-import { Payment } from '@stamhoofd/models';
-import { Registration } from '@stamhoofd/models';
-import { STInvoice } from '@stamhoofd/models';
-import { STPendingInvoice } from '@stamhoofd/models';
+import { Email, EmailAddress } from '@stamhoofd/email';
+import { Group, Organization, Payment, Registration, STPackage, STPendingInvoice, Webshop } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter, sleep } from '@stamhoofd/utility';
 import AWS from 'aws-sdk';
 import { DateTime } from 'luxon';
 
-import { ExchangeSTPaymentEndpoint } from './endpoints/global/payments/ExchangeSTPaymentEndpoint';
 import { ExchangePaymentEndpoint } from './endpoints/organization/shared/ExchangePaymentEndpoint';
 import { checkSettlements } from './helpers/CheckSettlements';
 import { ForwardHandler } from './helpers/ForwardHandler';
@@ -471,12 +464,7 @@ async function checkPayments() {
                     continue;
                 }
             } else {
-                // Try stamhoofd payment
-                const invoices = await STInvoice.where({ paymentId: payment.id })
-                if (invoices.length === 1) {
-                    await ExchangeSTPaymentEndpoint.pollStatus(payment, invoices[0])
-                    continue
-                }
+                // deprecated
             }
 
             // Check expired
@@ -599,52 +587,6 @@ async function checkReservedUntil() {
     }
 }
 
-
-// Wait for midnight before checking billing
-let lastBillingCheck: Date | null = new Date()
-let lastBillingId = ""
-async function checkBilling() {
-    if (STAMHOOFD.environment === "development") {
-        return
-    }
-
-    console.log("[BILLING] Checking billing...")
-
-    // Wait for the next day before doing a new check
-    if (lastBillingCheck && Formatter.dateIso(lastBillingCheck) === Formatter.dateIso(new Date())) {
-        console.log("[BILLING] Billing check done for today")
-        return
-    }
-    
-    const organizations = await Organization.where({ id: { sign: '>', value: lastBillingId } }, {
-        limit: 10,
-        sort: ["id"]
-    })
-
-    if (organizations.length == 0) {
-        // Wait again until next day
-        lastBillingId = ""
-        lastBillingCheck = new Date()
-        return
-    }
-
-    for (const organization of organizations) {
-        console.log("[BILLING] Checking billing for "+organization.name)
-
-        try {
-            await QueueHandler.schedule("billing/invoices-"+organization.id, async () => {
-                await STPendingInvoice.addAutomaticItems(organization)
-            });
-        } catch (e) {
-            console.error(e)
-        }
-        
-    }
-
-    lastBillingId = organizations[organizations.length - 1].id
-    
-}
-
 let lastDripCheck: Date | null = null
 let lastDripId = ""
 async function checkDrips() {
@@ -723,12 +665,6 @@ registeredCronJobs.push({
     running: false
 });
 
-registeredCronJobs.push({
-    name: 'checkBilling',
-    method: checkBilling,
-    running: false
-});
-
 registeredCronJobs.push({
     name: 'checkReservedUntil',
     method: checkReservedUntil,

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/members/PatchOrganizationMembersEndpoint.ts

@@ -9,6 +9,7 @@ import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../helpers/Context';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
+import { SetupStepUpdater } from '../../../helpers/SetupStepsUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -150,6 +151,8 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             await MemberUserSyncer.onChangeMember(member)
         }
 
+        let shouldUpdateSetupSteps = false;
+
         // Loop all members one by one
         for (let patch of request.body.getPatches()) {
             const member = members.find(m => m.id === patch.id) ?? await Member.getWithRegistrations(patch.id)
@@ -223,6 +226,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 }
 
                 await responsibilityRecord.save()
+                shouldUpdateSetupSteps = true;
             }
 
             // Create responsibilities
@@ -323,6 +327,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 model.startDate = put.startDate
 
                 await model.save()
+                shouldUpdateSetupSteps = true;
             }
 
             // Auto link users based on data
@@ -443,7 +448,6 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 updateMembershipMemberIds.add(member.id)
             }
 
-
             if (!members.find(m => m.id === member.id)) {
                 members.push(member)
             }
@@ -460,6 +464,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             await User.deleteForDeletedMember(member.id)
             await BalanceItem.deleteForDeletedMember(member.id)
             await member.delete()
+            shouldUpdateSetupSteps = true
 
             // Update occupancy of this member because we removed registrations
             const groupIds = member.registrations.flatMap(r => r.groupId)
@@ -498,6 +503,10 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             }
         }
 
+        if(shouldUpdateSetupSteps && organization) {
+            SetupStepUpdater.updateForOrganization(organization).catch(console.error);
+        }
+
         return new Response(
             await AuthenticatedStructures.membersBlob(members)
         );

package/src/endpoints/global/organizations/CreateOrganizationEndpoint.test.ts

@@ -1,15 +1,10 @@
 
 import { Request } from "@simonbackx/simple-endpoints";
-import { Organization, OrganizationFactory, RegisterCodeFactory, STCredit } from "@stamhoofd/models";
 import { Address, Country, CreateOrganization, NewUser, Organization as OrganizationStruct, Version } from "@stamhoofd/structures";
 
 import { testServer } from "../../../../tests/helpers/TestServer";
 import { CreateOrganizationEndpoint } from "./CreateOrganizationEndpoint";
 
-function expect_toBeDefined<T>(arg: T): asserts arg is NonNullable<T> {
-  expect(arg).toBeDefined();
-}
-
 describe("Endpoint.CreateOrganization", () => {
     // Test endpoint
     const endpoint = new CreateOrganizationEndpoint();
@@ -60,46 +55,4 @@ describe("Endpoint.CreateOrganization", () => {
 
         await expect(testServer.test(endpoint, r)).rejects.toThrow(/name/);
     });
-
-    test("Can create an organization with a register code and apply the discount", async () => {
-        const otherOrganization =  await new OrganizationFactory({}).create();
-        const code = await new RegisterCodeFactory({organization: otherOrganization}).create();
-        const uri = 'my-organization-with-a-discount';
-
-        const r = Request.buildJson(
-            "POST", 
-            "/organizations", 
-            "todo-host.be", 
-            CreateOrganization.create({
-                organization: OrganizationStruct.create({
-                    name: "My organization with a discount",
-                    uri,
-                    address: Address.create({
-                        street: "My street",
-                        number: "1",
-                        postalCode: "9000",
-                        city: "Gent",
-                        country: Country.Belgium
-                    }),
-                }),
-                user: NewUser.create({
-                    email: "voorbeeld@stamhoofd.be",
-                    password: "My user password",
-                }),
-                registerCode: code.code
-            })
-        );
-
-        const response = await testServer.test(endpoint, r);
-        expect(response.body.token).not.toBeEmpty();
-
-        const organization = await Organization.getByURI(uri);
-        expect_toBeDefined(organization);
-
-        // Check if this organization has an open register code
-        const credits = await STCredit.getForOrganization(organization.id);
-        expect(credits.length).toBe(1);
-        expect(credits[0].change).toBe(code.value);
-    });
-
 });

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

@@ -1,9 +1,7 @@
-import { Model } from '@simonbackx/simple-database';
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Email, EmailInterfaceBase } from '@stamhoofd/email';
-import { EmailVerificationCode, Organization, RegisterCode, User } from '@stamhoofd/models';
+import { EmailVerificationCode, Organization, User } from '@stamhoofd/models';
 import { CreateOrganization, PermissionLevel, Permissions, SignupResponse, UserPermissions } from "@stamhoofd/structures";
 import { Formatter } from "@stamhoofd/utility";
 
@@ -83,14 +81,14 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         organization.name = request.body.organization.name;
 
         // Delay save until after organization is saved, but do validations before the organization is saved
-        let registerCodeModels: Model[] = []
-        let delayEmails: EmailInterfaceBase[] = []
+        // let registerCodeModels: Model[] = []
+        // let delayEmails: EmailInterfaceBase[] = []
 
-        if (request.body.registerCode) {
-            const applied = await RegisterCode.applyRegisterCode(organization, request.body.registerCode)
-            registerCodeModels = applied.models
-            delayEmails = applied.emails
-        }
+        //if (request.body.registerCode) {
+        //    const applied = await RegisterCode.applyRegisterCode(organization, request.body.registerCode)
+        //    registerCodeModels = applied.models
+        //    delayEmails = applied.emails
+        //}
 
         organization.uri = uri;
         organization.meta = request.body.organization.meta
@@ -126,16 +124,16 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         user.permissions.organizationPermissions.set(organization.id, Permissions.create({ level: PermissionLevel.Full }))
         await user.save()
 
-        for (const model of registerCodeModels) {
-            await model.save()
-        }
+        // for (const model of registerCodeModels) {
+        //     await model.save()
+        // }
 
         const code = await EmailVerificationCode.createFor(user, user.email)
         code.send(user, organization, request.i18n)
 
-        for (const email of delayEmails) {
-            Email.sendInternal(email, organization.i18n)
-        }
+        // for (const email of delayEmails) {
+        //     Email.sendInternal(email, organization.i18n)
+        // }
 
         return new Response(SignupResponse.create({
             token: code.token

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/global/organizations/SearchOrganizationEndpoint.ts

@@ -45,7 +45,7 @@ export class SearchOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         };
 
         // We had to add an order by in the query to fix the limit. MySQL doesn't want to limit the results correctly if we don't explicitly sort the results on their relevance
-        const organizations = await Organization.where({ searchIndex: match }, {
+        const organizations = await Organization.where({ searchIndex: match, active: 1 }, {
             limit: 15,
             sort: [
                 {