@stamhoofd/backend 2.118.1 → 2.120.0

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

@@ -1,5 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { EmailTemplate, GroupFactory, Organization, OrganizationFactory, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
@@ -86,4 +87,38 @@ describe('Endpoint.GetEmailTemplatesEndpoint', () => {
         expect(response.body).toBeDefined();
         expect(response.body).toHaveLength(1);
     });
+
+    test('Saved templates with groupIds should not throw SQL syntax error', async () => {
+        const organization = await new OrganizationFactory({ period }).create();
+        const group = await new GroupFactory({ organization }).create();
+
+        const user = await new UserFactory({
+            organization,
+            permissions: Permissions.create({
+                level: PermissionLevel.Full,
+            }),
+        }).create();
+
+        const token = await Token.createToken(user);
+
+        const template = new EmailTemplate();
+        template.subject = 'saved template';
+        template.type = EmailTemplateType.SavedMembersEmail;
+        template.json = {};
+        template.html = 'html test';
+        template.text = 'text test';
+        template.organizationId = organization.id;
+        template.groupId = group.id;
+        await template.save();
+
+        const response = await getEmailTemplates({
+            token,
+            organization,
+            types: [EmailTemplateType.SavedMembersEmail],
+            groupIds: [group.id],
+        });
+
+        expect(response.body).toBeDefined();
+        expect(response.body).toHaveLength(1);
+    });
 });

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

@@ -1,7 +1,10 @@
-import { AutoEncoder, Decoder, EnumDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, EnumDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailTemplate } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { StringArrayDecoder } from '../../../../decoders/StringArrayDecoder.js';
@@ -101,7 +104,7 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                     },
                 }));
 
-        if (organization && (request.query.webshopId || request.query.groupIds)) {
+        if (organization && defaultTemplateTypes.length > 0 && (request.query.webshopId || request.query.groupIds)) {
             const orgDefaults = (await EmailTemplate.where({
                 organizationId: organization.id,
                 webshopId: null,
@@ -116,8 +119,14 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
         }
 
         const allTemplates: EmailTemplate[] = [];
+        const allCandidates = templates.concat(defaultTemplates);
 
-        for (const template of templates.concat(defaultTemplates)) {
+        const groupIds = Formatter.uniqueArray(allCandidates.map(t => t.groupId).filter((id): id is string => id !== null));
+        if (groupIds.length > 0) {
+            await Context.auth.getGroups(groupIds);
+        }
+
+        for (const template of allCandidates) {
             if (await Context.auth.canAccessEmailTemplate(template)) {
                 allTemplates.push(template);
             }

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

@@ -1,6 +1,8 @@
-import { PatchableArray, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
+import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
+import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import { EmailTemplate, GroupFactory, Organization, OrganizationFactory, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';

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

@@ -1,5 +1,7 @@
-import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailTemplate, Group, Webshop } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, PermissionLevel } from '@stamhoofd/structures';
 
@@ -43,7 +45,7 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
         for (const patch of request.body.getPatches()) {
             const template = await EmailTemplate.getByID(patch.id);
             if (!template || !(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.notFoundOrNoAccess($t(`ca80fb17-1557-491f-9e9d-554d842a74d7`));
+                throw Context.auth.notFoundOrNoAccess($t(`%ES`));
             }
 
             template.html = patch.html ?? template.html;
@@ -98,7 +100,7 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
 
             // Check if valid + write permissions
             if (!(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.error($t(`a2afb95e-1dc5-452d-a919-70720fd4e8a6`));
+                throw Context.auth.error($t(`%ET`));
             }
 
             await template.save();
@@ -109,7 +111,7 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
         for (const id of request.body.getDeletes()) {
             const template = await EmailTemplate.getByID(id);
             if (!template || !(await Context.auth.canAccessEmailTemplate(template, PermissionLevel.Write))) {
-                throw Context.auth.notFoundOrNoAccess($t(`54599fe6-d0a3-471d-bbe4-b41c367f9aa2`));
+                throw Context.auth.notFoundOrNoAccess($t(`%EU`));
             }
 
             await template.delete();

package/src/endpoints/organization/dashboard/invoices/GetInvoicesCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';

package/src/endpoints/organization/dashboard/invoices/GetInvoicesEndpoint.ts

@@ -1,9 +1,11 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Invoice } from '@stamhoofd/models';
 import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { CountFilteredRequest, InvoiceStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { CountFilteredRequest, InvoiceStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
@@ -158,7 +160,7 @@ export class GetInvoicesEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'timeout',
                     message: 'Query took too long',
-                    human: $t(`dce51638-6129-448b-8a15-e6d778f3a76a`),
+                    human: $t(`%Cv`),
                 });
             }
             throw error;

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.ts

@@ -1,10 +1,12 @@
-import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Invoice as InvoiceStruct } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
-import { Invoice } from '@stamhoofd/models';
+import type { Invoice } from '@stamhoofd/models';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { ViesHelper } from '../../../../helpers/ViesHelper.js';
 import { InvoiceService } from '../../../../services/InvoiceService.js';

package/src/endpoints/organization/dashboard/mollie/CheckMollieEndpoint.ts

@@ -1,6 +1,8 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import { CheckMollieResponse, Organization as OrganizationStruct, PermissionLevel } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import { CheckMollieResponse, PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';

package/src/endpoints/organization/dashboard/mollie/ConnectMollieEndpoint.ts

@@ -1,7 +1,10 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import { Organization as OrganizationStruct, PermissionLevel } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { checkMollieSettlementsFor } from '../../../../helpers/CheckSettlements.js';

package/src/endpoints/organization/dashboard/mollie/DisconnectMollieEndpoint.ts

@@ -1,6 +1,8 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import { Organization as OrganizationStruct, PermissionLevel } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';

package/src/endpoints/organization/dashboard/mollie/GetMollieDashboardEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
 import { MollieToken } from '@stamhoofd/models';
 import { PermissionLevel } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/nolt/CreateNoltTokenEndpoint.ts

@@ -1,5 +1,6 @@
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import jwt from 'jsonwebtoken';
 
 import { Context } from '../../../../helpers/Context.js';

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

@@ -1,7 +1,9 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group, Token } from '@stamhoofd/models';
-import { Group as GroupStruct, GroupStatus } from '@stamhoofd/structures';
+import type { Group as GroupStruct} from '@stamhoofd/structures';
+import { GroupStatus } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';

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

@@ -1,6 +1,7 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Group } from '@stamhoofd/models';
-import { Group as GroupStruct } from '@stamhoofd/structures';
+import type { Group as GroupStruct } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';

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

@@ -1,4 +1,5 @@
-import { Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasGetClientIdResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';

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

@@ -1,8 +1,10 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { GroupFactory, Organization, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, User, Webshop} from '@stamhoofd/models';
+import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { AccessRight, MemberResponsibility, OrganizationPrivateMetaData, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 
-import { AutoEncoderPatchType, PatchableArray, PatchableArrayAutoEncoder, PatchMap } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { PatchOrganizationEndpoint } from './PatchOrganizationEndpoint.js';
@@ -592,7 +594,7 @@ describe('Endpoint.PatchOrganization', () => {
 
                 // other fields should be default fields and not be set
                 expect(response.body.privateMeta!.inheritedResponsibilityRoles[0].level).toBe(PermissionLevel.None);
-                expect(response.body.privateMeta!.inheritedResponsibilityRoles[0].accessRights).toBeEmpty();
+                expect(response.body.privateMeta!.inheritedResponsibilityRoles[0].accessRights).toEqual([]);
             });
 
             test('should only be able to patch resources of inherited responsibility roles', async () => {

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

@@ -1,8 +1,11 @@
-import { AutoEncoderPatchType, cloneObject, Decoder, isPatchableArray, isPatchMap, ObjectData, PatchableArray, PatchableArrayAutoEncoder, PatchMap, patchObject } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { cloneObject, isPatchableArray, isPatchMap, ObjectData, PatchableArray, PatchMap, patchObject } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
 import { Organization, OrganizationRegistrationPeriod, PayconiqPayment, Platform, RegistrationPeriod, StripeAccount, Webshop } from '@stamhoofd/models';
-import { BuckarooSettings, Company, MemberResponsibility, OrganizationMetaData, Organization as OrganizationStruct, PayconiqAccount, PaymentMethod, PaymentMethodHelper, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, PermissionsResourceType, ResourcePermissions, UitpasClientCredentialsStatus } from '@stamhoofd/structures';
+import type { Company, PermissionsResourceType, ResourcePermissions} from '@stamhoofd/structures';
+import { BuckarooSettings, MemberResponsibility, OrganizationMetaData, Organization as OrganizationStruct, PayconiqAccount, PaymentMethod, PaymentMethodHelper, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, UitpasClientCredentialsStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
@@ -51,7 +54,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             throw new SimpleError({
                 code: 'permission_denied',
                 message: 'You do not have permissions to edit an inactive organization',
-                human: $t(`b33ba9f0-c12d-4918-ac9d-7aeec5de41a5`),
+                human: $t(`%EV`),
                 statusCode: 403,
             });
         }
@@ -77,7 +80,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         code: 'invalid_field',
                         message: 'Name is too short',
                         field: 'name',
-                        human: $t('50b198a4-af37-4514-8d82-b9e4c41d9e91'),
+                        human: $t('%1L7'),
                     });
                 }
                 organization.name = request.body.name ?? organization.name;
@@ -97,7 +100,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Field is too long',
-                        human: $t(`864675a2-7376-4a61-9c7d-f488e7906d7b`),
+                        human: $t(`%EW`),
                         field: 'uri',
                     });
                 }
@@ -106,7 +109,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Field is too short',
-                        human: $t(`0fa660da-1e74-4940-af88-eafafb1094b6`),
+                        human: $t(`%EX`),
                         field: 'uri',
                     });
                 }
@@ -116,7 +119,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'name_taken',
                         message: 'An organization with the same URI already exists',
-                        human: $t(`daa7dc61-e8c9-4629-97b6-a75f39eaebac`),
+                        human: $t(`%EY`),
                         field: 'uri',
                     });
                 }
@@ -329,7 +332,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'You cannot set the uitpasClientCredentialsStatus manually',
-                        human: $t('d8937ba8-6689-4c76-9841-d5a00c99074b'),
+                        human: $t('%1BB'),
                     });
                 }
 
@@ -357,7 +360,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
             if (request.body.active !== undefined) {
                 if (!Context.auth.hasPlatformFullAccess()) {
-                    throw Context.auth.error($t(`e46f34cd-f166-421e-be97-28ccecdf9c73`));
+                    throw Context.auth.error($t(`%EZ`));
                 }
                 organization.active = request.body.active;
             }
@@ -373,7 +376,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'name_taken',
                         message: 'An organization with the same name already exists',
-                        human: $t(`6e675a7d-b124-4507-bf0c-9b70013e98ca`),
+                        human: $t(`%D2`),
                         field: 'name',
                     });
                 }
@@ -387,7 +390,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'The period you want to set does not exist (anymore)',
-                        human: $t('a3795bf6-ed50-4aa6-9caf-33820292c159'),
+                        human: $t('%15h'),
                         field: 'period',
                     });
                 }
@@ -398,7 +401,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set does not exist (anymore)',
-                            human: $t('a3795bf6-ed50-4aa6-9caf-33820292c159'),
+                            human: $t('%15h'),
                             field: 'period',
                         });
                     }
@@ -408,7 +411,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period has no organization id',
-                            human: $t('d004e93c-e67f-48ab-bf3d-7b4ad86c7a38'),
+                            human: $t('%1Gw'),
                             field: 'period',
                         });
                     }
@@ -417,7 +420,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set is already closed',
-                            human: $t('b6bc2fef-71ac-43a1-b430-50945427a9e3'),
+                            human: $t('%15i'),
                             field: 'period',
                         });
                     }
@@ -427,7 +430,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set has not started yet',
-                            human: $t('e0fff936-3f3c-46b8-adcf-c723c33907a2'),
+                            human: $t('%15k'),
                             field: 'period',
                         });
                     }
@@ -580,7 +583,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
             if (!model || !await Context.auth.canAccessWebshop(model, PermissionLevel.Full)) {
                 errors.addError(
-                    Context.auth.error($t(`5e92a9b3-a94d-41db-9d0e-c58122400725`)),
+                    Context.auth.error($t(`%Ea`)),
                 );
                 continue;
             }
@@ -636,7 +639,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Too many companies',
-                        human: $t(`35d462bc-121e-46ad-824b-a7838a6665ae`),
+                        human: $t(`%Eb`),
                         field: 'companies',
                     });
                 }
@@ -649,7 +652,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Too many companies',
-                    human: $t(`35d462bc-121e-46ad-824b-a7838a6665ae`),
+                    human: $t(`%Eb`),
                     field: 'companies',
                 });
             }

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

@@ -1,7 +1,9 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
-import { UitpasOrganizersResponse } from '@stamhoofd/structures';
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { UitpasOrganizersResponse } from '@stamhoofd/structures';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { Context } from '../../../../helpers/Context.js';
 
 type Params = Record<string, never>;

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

@@ -1,12 +1,14 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
-import { DNSRecord, DNSRecordType, Organization as OrganizationStruct, OrganizationDomains } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { DNSRecord, DNSRecordType, OrganizationDomains } from '@stamhoofd/structures';
 import NodeRSA from 'node-rsa';
 
+import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
-import { Formatter } from '@stamhoofd/utility';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -52,20 +54,20 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
 
             // Validate domains
 
-            if (request.body.registerDomain !== null && !request.body.registerDomain.match(/^([a-zA-Z0-9-]+\.)?[a-zA-Z0-9-]+\.[a-zA-Z]+$/)) {
+            if (request.body.registerDomain !== null && !request.body.registerDomain.match(/^(?:[a-z0-9-]+\.)?[a-z0-9-]+\.[a-z]+$/i)) {
                 throw new SimpleError({
                     code: 'invalid_domain',
                     message: 'registerDomain is invalid',
-                    human: $t(`50fc6c16-b3d2-4015-b04c-7f11c6e4d497`),
+                    human: $t(`%Ec`),
                     field: 'registerDomain',
                 });
             }
 
-            if (request.body.mailDomain !== null && !request.body.mailDomain.match(/^([a-zA-Z0-9-]+\.)?[a-zA-Z0-9-]+\.[a-zA-Z]+$/)) {
+            if (request.body.mailDomain !== null && !request.body.mailDomain.match(/^(?:[a-z0-9-]+\.)?[a-z0-9-]+\.[a-z]+$/i)) {
                 throw new SimpleError({
                     code: 'invalid_domain',
                     message: 'mailDomain is invalid',
-                    human: $t(`da31b8f3-ef8c-4235-b9ba-7eb6d6433a61`),
+                    human: $t(`%Ed`),
                     field: 'mailDomain',
                 });
             }
@@ -165,7 +167,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                     type: DNSRecordType.TXT,
                     name: '_dmarc.' + organization.privateMeta.pendingMailDomain + '.',
                     value: 'v=DMARC1; p=quarantine; pct=100; sp=quarantine; aspf=r; adkim=r;',
-                    description: $t(`dfd0d85f-262e-4d5a-b8e4-8a9e67c60652`),
+                    description: $t(`%Ee`),
                     optional: true,
                 }));
             }

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

@@ -1,5 +1,6 @@
-import { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { UitpasClientCredentialsStatus, UitpasClientIdAndSecret, UitpasSetClientCredentialsResponse } from '@stamhoofd/structures';
 import { Context } from '../../../../helpers/Context.js';
@@ -51,7 +52,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You must provide a client id',
                 code: 'missing_client_id',
-                human: $t('9b9ec483-63b8-4696-ade6-0eb18f9008e6'),
+                human: $t('%1BC'),
                 field: 'clientId',
             });
         }
@@ -59,7 +60,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You must provide a client secret',
                 code: 'missing_client_secret',
-                human: $t('58de00fb-3b0a-45a6-9214-7d11b4175779'),
+                human: $t('%1BD'),
                 field: 'clientSecret',
             });
         }
@@ -67,7 +68,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You cannot use the placeholder client secret for a different client id',
                 code: 'invalid_client_secret',
-                human: $t('bbc79280-7ae2-4b8d-a900-2d7cbb552428'),
+                human: $t('%1BE'),
                 field: 'clientSecret',
             });
         }
@@ -77,7 +78,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'This organization does not have a uitpas organizer id set',
                 code: 'missing_uitpas_organizer_id',
-                human: $t('80fcde9c-c8c7-4fe1-b9a6-51684a23d850'),
+                human: $t('%1BF'),
             });
         }
 
@@ -88,7 +89,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
                 throw new SimpleError({
                     message: 'The provided client credentials are not valid',
                     code: 'invalid_client_credentials',
-                    human: $t('42bbd5c0-8789-4ca1-b667-1c9ecf4d0190'),
+                    human: $t('%1BG'),
                 });
             }
         }

package/src/endpoints/organization/dashboard/payments/GetMemberBalanceEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request, Response } from '@simonbackx/simple-endpoints';
+import { Endpoint } from '@simonbackx/simple-endpoints';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 

package/src/endpoints/organization/dashboard/payments/GetPaymentsCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';

package/src/endpoints/organization/dashboard/payments/GetPaymentsEndpoint.ts

@@ -1,11 +1,13 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Payment } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, PaymentGeneral, StamhoofdFilter, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { CountFilteredRequest, PaymentGeneral, StamhoofdFilter} from '@stamhoofd/structures';
+import { LimitedFilteredRequest, PaginatedResponse, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
 
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
 import { paymentFilterCompilers } from '../../../../sql-filters/payments.js';
@@ -171,7 +173,7 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'timeout',
                     message: 'Query took too long',
-                    human: $t(`dce51638-6129-448b-8a15-e6d778f3a76a`),
+                    human: $t(`%Cv`),
                 });
             }
             throw error;