@stamhoofd/backend 2.121.0 → 2.122.0

package/src/endpoints/admin/organizations/PatchPackagesEndpoint.ts

@@ -2,8 +2,8 @@ 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 { STPackage } from '@stamhoofd/models';
-import { OrganizationPackagesStatus, STPackage as STPackageStruct } from '@stamhoofd/structures';
+import { Organization, Platform, STPackage } from '@stamhoofd/models';
+import { BalanceItemStatus, OrganizationPackagesStatus, STPackage as STPackageStruct } from '@stamhoofd/structures';
 import { Context } from '../../../helpers/Context.js';
 import { STPackageService } from '../../../services/STPackageService.js';
 
@@ -13,7 +13,7 @@ type ResponseBody = OrganizationPackagesStatus;
 type Body = AutoEncoderPatchType<OrganizationPackagesStatus>;
 
 export class PatchPackagesEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
-    bodyDecoder = OrganizationPackagesStatus.patchType() as Decoder<AutoEncoderPatchType<OrganizationPackagesStatus>>
+    bodyDecoder = OrganizationPackagesStatus.patchType() as Decoder<AutoEncoderPatchType<OrganizationPackagesStatus>>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
         if (request.method !== 'PATCH') {
@@ -36,55 +36,73 @@ export class PatchPackagesEndpoint extends Endpoint<Params, Query, Body, Respons
         if (!Context.auth.hasPlatformFullAccess()) {
             throw Context.auth.error();
         }
-        let updatePackages = false
+        let updatePackages = false;
         const packages = await STPackageService.getValidPackagesWithExpired(organization.id);
+        const membershipOrganizationId = (await Platform.getShared()).membershipOrganizationId;
+        if (!membershipOrganizationId) {
+            throw new Error('Unavailable');
+        }
 
+        const membershipOrganization = await Organization.getByID(membershipOrganizationId, true);
         // Do patches
         if (request.body.packages) {
             for (const patch of request.body.packages.getPatches()) {
-                const pack = packages.find(p => p.id === patch.id)
+                const pack = packages.find(p => p.id === patch.id);
                 if (!pack) {
                     throw new SimpleError({
                         code: 'not_found',
-                        message: 'Package not found with id '+patch.id
-                    })
+                        message: 'Package not found with id ' + patch.id,
+                    });
                 }
 
                 if (patch.meta !== undefined) {
-                    pack.meta.patchOrPut(patch.meta)
+                    pack.meta.patchOrPut(patch.meta);
                 }
 
                 if (patch.validUntil !== undefined) {
-                    pack.validUntil = patch.validUntil
+                    pack.validUntil = patch.validUntil;
                 }
 
                 if (patch.removeAt !== undefined) {
-                    pack.removeAt = patch.removeAt
+                    pack.removeAt = patch.removeAt;
                 }
 
-                await pack.save()
-                updatePackages = true
+                await pack.save();
+                updatePackages = true;
+
+                const item = await STPackageService.chargePackage(pack, membershipOrganization, organization.defaultCompanies[0]);
+                if (item) {
+                    item.status = BalanceItemStatus.Due;
+                    await item.save();
+                    console.log('Charged', item.id);
+                }
             }
 
             for (const put of request.body.packages.getPuts()) {
-                const pack = new STPackage()
+                const pack = new STPackage();
                 pack.id = put.put.id;
-                pack.validAt = new Date()
-                pack.organizationId = organization.id
+                pack.validAt = new Date();
+                pack.organizationId = organization.id;
 
-                pack.meta = put.put.meta
-                pack.validUntil = put.put.validUntil
-                pack.removeAt = put.put.removeAt
+                pack.meta = put.put.meta;
+                pack.validUntil = put.put.validUntil;
+                pack.removeAt = put.put.removeAt;
 
-                await pack.save()
-                updatePackages = true
+                await pack.save();
+                updatePackages = true;
 
                 packages.push(pack);
+                const item = await STPackageService.chargePackage(pack, membershipOrganization, organization.defaultCompanies[0]);
+                if (item) {
+                    item.status = BalanceItemStatus.Due;
+                    await item.save();
+                    console.log('Charged', item.id);
+                }
             }
         }
 
         if (updatePackages) {
-            await STPackageService.updateOrganizationPackages(organization.id)
+            await STPackageService.updateOrganizationPackages(organization.id);
         }
 
         return new Response(OrganizationPackagesStatus.create({

package/src/endpoints/admin/registrations/ChargeRegistrationsEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { ChargeRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';

package/src/endpoints/auth/CreateAdminEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
@@ -39,14 +39,33 @@ export class CreateAdminEndpoint extends Endpoint<Params, Query, Body, ResponseB
             if (!await Context.auth.canManageAdmins(organization.id)) {
                 throw Context.auth.error();
             }
-        }
-        else {
+        } else {
             // Fast throw first (more in depth checking for patches later)
             if (!Context.auth.canManagePlatformAdmins()) {
                 throw Context.auth.error();
             }
         }
 
+        if (organization) {
+            if (request.body.permissions === null || request.body.permissions.organizationPermissions.get(organization.id)?.isEmpty !== false) {
+                throw new SimpleError({
+                    code: 'empty_permissions',
+                    message: 'Cannot add an admin without permissions',
+                    human: $t('%1V9'),
+                    statusCode: 400,
+                });
+            }
+        } else {
+            if (request.body.permissions === null || request.body.permissions.isEmpty !== false) {
+                throw new SimpleError({
+                    code: 'empty_permissions',
+                    message: 'Cannot add an admin without permissions',
+                    human: $t('%1V9'),
+                    statusCode: 400,
+                });
+            }
+        }
+
         // First check if a user exists with this email?
         const existing = await User.getForRegister(organization?.id ?? null, request.body.email);
 
@@ -77,8 +96,7 @@ export class CreateAdminEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         if (organization) {
             admin.permissions = UserPermissions.limitedAdd(admin.permissions, request.body.permissions, organization.id);
-        }
-        else {
+        } else {
             admin.permissions = UserPermissions.add(admin.permissions, request.body.permissions);
         }
 

package/src/endpoints/auth/CreateTokenEndpoint.ts

@@ -1,8 +1,8 @@
-import type { DecodedRequest, Request} 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 { EmailVerificationCode, PasswordToken, Platform, Token, User } from '@stamhoofd/models';
-import type { ChallengeGrantStruct, PasswordGrantStruct, PasswordTokenGrantStruct, RefreshTokenGrantStruct, RequestChallengeGrantStruct} from '@stamhoofd/structures';
+import type { ChallengeGrantStruct, PasswordGrantStruct, PasswordTokenGrantStruct, RefreshTokenGrantStruct, RequestChallengeGrantStruct } from '@stamhoofd/structures';
 import { CreateTokenStruct, LoginMethod, SignupResponse, Token as TokenStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';

package/src/endpoints/auth/DeleteTokenEndpoint.ts

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

package/src/endpoints/auth/DeleteUserEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 
 import { getDefaultEmailFrom, sendEmailTemplate } from '@stamhoofd/models';
@@ -32,10 +32,10 @@ export class DeleteUserEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
         // Delete the account
 
-        const bcc = (await getDefaultEmailFrom(null, {
+        const bcc = (await getDefaultEmailFrom(STAMHOOFD.userMode === 'platform' ? null : organization, {
             template: {},
         }));
-        await sendEmailTemplate(organization, {
+        await sendEmailTemplate(STAMHOOFD.userMode === 'platform' ? null : organization, {
             recipients: [
                 Recipient.create({
                     email: user.email,

package/src/endpoints/auth/ForgotPasswordEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
 import { EmailTemplateType, ForgotPasswordRequest, LoginMethod, Recipient, Replacement } from '@stamhoofd/structures';

package/src/endpoints/auth/GetOtherUserEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import type { UserWithMembers } from '@stamhoofd/structures';
 

package/src/endpoints/auth/GetUserEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import type { UserWithMembers } from '@stamhoofd/structures';
 

package/src/endpoints/auth/OpenIDConnectAuthTokenEndpoint.ts

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

package/src/endpoints/auth/OpenIDConnectStartEndpoint.ts

@@ -30,7 +30,7 @@ export class OpenIDConnectStartEndpoint extends Endpoint<Params, Query, Body, Re
     async handle(request: DecodedRequest<Params, Query, Body>) {
         // Check webshop and/or organization
         await Context.setUserOrganizationScope({ willAuthenticate: false });
-        const service = await SSOService.fromContext(request.query.provider);
+        const service = await SSOService.fromContext(request.query.provider, { validate: true });
         return await service.validateAndStartAuthCodeFlow(request.query);
     }
 }

package/src/endpoints/auth/PatchUserEndpoint.ts

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
 import { isPatch } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { EmailVerificationCode, Member, PasswordToken, Platform, Token, User } from '@stamhoofd/models';
@@ -64,8 +64,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                     // Also propage the name change to other users of the same member if needed
                     await MemberUserSyncer.onChangeMember(member);
                 }
-            }
-            else {
+            } else {
                 editUser.firstName = request.body.firstName ?? editUser.firstName;
                 editUser.lastName = request.body.lastName ?? editUser.lastName;
             }
@@ -89,12 +88,10 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                             message: $t(`%DG`),
                         });
                     }
-                }
-                else {
+                } else {
                     if (editUser.permissions) {
                         editUser.permissions.patchOrPut(request.body.permissions);
-                    }
-                    else {
+                    } else {
                         editUser.permissions = request.body.permissions.isPut() ? request.body.permissions : null;
                     }
 

package/src/endpoints/auth/PollEmailVerificationEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailVerificationCode } from '@stamhoofd/models';
 import { PollEmailVerificationRequest, PollEmailVerificationResponse } from '@stamhoofd/structures';

package/src/endpoints/auth/RetryEmailVerificationEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailVerificationCode } from '@stamhoofd/models';
 import { PollEmailVerificationRequest, PollEmailVerificationResponse } from '@stamhoofd/structures';

package/src/endpoints/auth/SignupEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { EmailVerificationCode, PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
@@ -100,8 +100,7 @@ export class SignupEndpoint extends Endpoint<Params, Query, Body, ResponseBody>
                         type: 'transactional',
                     });
                 })().catch(console.error);
-            }
-            else {
+            } else {
                 // This is safe, because we are the first one. There is no password yet.
                 // If a hacker tries this, he won't be able to sign in, because he needs to
                 // verify the e-mail first (same as if the user didn't exist)

package/src/endpoints/auth/VerifyEmailEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { EmailVerificationCode, Token, User } from '@stamhoofd/models';
@@ -31,6 +31,24 @@ export class VerifyEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOptionalOrganizationScope({ willAuthenticate: false });
 
+        if (!request.body.token) {
+            throw new SimpleError({
+                statusCode: 400,
+                code: 'missing_field',
+                field: 'token',
+                message: 'Token field missing in request',
+            });
+        }
+
+        if (!request.body.code) {
+            throw new SimpleError({
+                statusCode: 400,
+                code: 'missing_field',
+                field: 'code',
+                message: 'Code field missing in request',
+            });
+        }
+
         const code = await EmailVerificationCode.verify(organization?.id ?? null, request.body.token, request.body.code);
 
         if (!code) {
@@ -71,8 +89,7 @@ export class VerifyEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         try {
             await user.save();
-        }
-        catch (e) {
+        } catch (e) {
             // Duplicate key probably
             if (e.code && e.code == 'ER_DUP_ENTRY') {
                 throw new SimpleError({

package/src/endpoints/frontend/FrontendEnvironmentEndpoint.ts

@@ -1,12 +1,13 @@
 import type {
     DecodedRequest,
-    Request} from '@simonbackx/simple-endpoints';
+    Request } from '@simonbackx/simple-endpoints';
 import {
     Endpoint,
     Response,
 } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Version } from '@stamhoofd/structures';
+import type { FrontendSpecificEnvironment, SharedEnvironment } from '@stamhoofd/types/Environment';
 
 type Params = Record<string, never>;
 type Query = undefined;

package/src/endpoints/global/addresses/SearchRegionsEndpoint.ts

@@ -43,12 +43,10 @@ export class SearchRegionsEndpoint extends Endpoint<Params, Query, Body, Respons
             if (/^[a-z0-9]*$/i.test(word)) {
                 if (index === words.length - 1) {
                     cleanedWords.push('+' + word + '*');
-                }
-                else {
+                } else {
                     cleanedWords.push('+' + word);
                 }
-            }
-            else {
+            } else {
                 cleanedWords.push('+"' + word + '"');
             }
         }

package/src/endpoints/global/addresses/ValidateAddressEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import type { ValidatedAddress } from '@stamhoofd/structures';
 import { Address } from '@stamhoofd/structures';

package/src/endpoints/global/audit-logs/GetAuditLogsEndpoint.ts

@@ -1,11 +1,11 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { AuditLog } from '@stamhoofd/models';
-import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import type { SQLSortDefinitions } from '@stamhoofd/sql';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { AuditLog as AuditLogStruct, CountFilteredRequest, StamhoofdFilter} from '@stamhoofd/structures';
+import type { AuditLog as AuditLogStruct, CountFilteredRequest, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
@@ -49,16 +49,14 @@ export class GetAuditLogsEndpoint extends Endpoint<Params, Query, Body, Response
                 scopeFilter = {
                     organizationId: organization.id,
                 };
-            }
-            else {
+            } else {
                 if (!q.filter || typeof q.filter !== 'object' || !('objectId' in q.filter)) {
                     scopeFilter = {
                         organizationId: organization.id,
                     };
                 }
             }
-        }
-        else {
+        } else {
             if (!Context.auth.hasPlatformFullAccess()) {
                 throw Context.auth.error();
             }

package/src/endpoints/global/caddy/CheckDomainCertEndpoint.ts

@@ -1,6 +1,6 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { Organization, Webshop } from '@stamhoofd/models';

package/src/endpoints/global/email/CreateEmailEndpoint.ts

@@ -1,8 +1,8 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, Platform, RateLimiter } from '@stamhoofd/models';
-import type { EmailPreview} from '@stamhoofd/structures';
+import type { EmailPreview } from '@stamhoofd/structures';
 import { EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
@@ -106,8 +106,7 @@ export class CreateEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
             model.senderId = sender.id;
             model.fromAddress = sender.email;
             model.fromName = sender.name;
-        }
-        else {
+        } else {
             if (request.body.senderId) {
                 throw new SimpleError({
                     code: 'invalid_sender',

package/src/endpoints/global/email/GetAdminEmailsEndpoint.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User } from '@stamhoofd/models';
 import { Email, EmailRecipient, MemberFactory, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailStatus, LimitedFilteredRequest, PermissionLevel, Permissions, Replacement } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';

package/src/endpoints/global/email/GetAdminEmailsEndpoint.ts

@@ -80,8 +80,7 @@ export class GetAdminEmailsEndpoint extends Endpoint<Params, Query, Body, Respon
             scopeFilter = mergeFilters([scopeFilter, {
                 $or: filters,
             }]);
-        }
-        else {
+        } else {
             scopeFilter = mergeFilters([scopeFilter, {
                 $or: [
                     {

package/src/endpoints/global/email/GetEmailAddressEndpoint.ts

@@ -1,6 +1,6 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { EmailAddress } from '@stamhoofd/email';
@@ -64,8 +64,7 @@ export class GetEmailAddressEndpoint extends Endpoint<Params, Query, Body, Respo
                 ...email,
                 organization: organization ? OrganizationSimple.create(organization) : null,
             }));
-        }
-        else {
+        } else {
             if (!request.query.email) {
                 throw new SimpleError({
                     code: 'missing_field',
@@ -86,8 +85,7 @@ export class GetEmailAddressEndpoint extends Endpoint<Params, Query, Body, Respo
             );
             if (organization) {
                 query.andWhere('organizationId', organization.id);
-            }
-            else {
+            } else {
                 // No need
             }
 

package/src/endpoints/global/email/GetEmailEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email } from '@stamhoofd/models';
 import type { EmailPreview } from '@stamhoofd/structures';

package/src/endpoints/global/email/GetUserEmailsEndpoint.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User } from '@stamhoofd/models';
 import { Email, EmailRecipient, MemberFactory, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailStatus, LimitedFilteredRequest, Replacement } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';

package/src/endpoints/global/email/GetUserEmailsEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import type { CountFilteredRequest, EmailWithRecipients, StamhoofdFilter } from '@stamhoofd/structures';
 import { assertSort, EmailStatus, getSortFilter, LimitedFilteredRequest, mergeFilters, PaginatedResponse } from '@stamhoofd/structures';

package/src/endpoints/global/email/ManageEmailAddressEndpoint.ts

@@ -1,6 +1,6 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, BooleanDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { Email, EmailAddress } from '@stamhoofd/email';
@@ -92,8 +92,7 @@ export class ManageEmailAddressEndpoint extends Endpoint<Params, Query, Body, Re
 
             await email.save();
             return new Response(undefined);
-        }
-        else {
+        } else {
             if (!request.body.email) {
                 throw new SimpleError({
                     code: 'missing_field',
@@ -109,8 +108,7 @@ export class ManageEmailAddressEndpoint extends Endpoint<Params, Query, Body, Re
                 if (!await Context.auth.hasFullAccess(organization.id)) {
                     throw Context.auth.error();
                 }
-            }
-            else {
+            } else {
                 if (!Context.auth.hasPlatformFullAccess()) {
                     throw Context.auth.error();
                 }
@@ -147,8 +145,7 @@ export class ManageEmailAddressEndpoint extends Endpoint<Params, Query, Body, Re
                 if (!isBlocked && wasBlocked && !Context.auth.hasPlatformFullAccess()) {
                     try {
                         unblockLimiter.track(organization?.id ?? '', 1);
-                    }
-                    catch (e) {
+                    } catch (e) {
                         Email.sendWebmaster({
                             subject: '[Limiet] Limiet bereikt voor aantal unblocks',
                             text: 'Beste, \nDe limiet werd bereikt voor het aantal email unblocks per week. \nUser: ' + user.email + '\n\nVereniging: ' + (organization ? (organization.id + ' (' + organization.name + ')') : 'platform') + '\n\n' + e.message + '\n\nStamhoofd',
@@ -176,8 +173,7 @@ export class ManageEmailAddressEndpoint extends Endpoint<Params, Query, Body, Re
                     const command = new DeleteSuppressedDestinationCommand(input);
                     const response = await client.send(command);
                     console.log('Removed from AWS suppression list', request.body.email, response);
-                }
-                catch (error) {
+                } catch (error) {
                     console.error('Error removing from suppression list', request.body.email, error);
                 }
             }

package/src/endpoints/global/email/PatchEmailEndpoint.test.ts

@@ -1,6 +1,6 @@
 import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User } from '@stamhoofd/models';
 import { Email, EmailRecipient, GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailStatus, Email as EmailStruct, OrganizationEmail, Parent, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserPermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
@@ -698,8 +698,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
 
             if (recipient.email) {
                 expect(loginDetails?.html).toContain(recipient.email || ''); // If no email, won't contain it
-            }
-            else {
+            } else {
                 // Cehck loginDetails is an empty string
                 expect(loginDetails?.html).toBe(undefined);
                 expect(loginDetails?.value).toBe('');
@@ -719,11 +718,9 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             expect(firstNameMember).toBeDefined();
             if (recipient.memberId === memberWithEmail.id) {
                 expect(firstNameMember?.value).toBe(memberWithEmail.details.firstName);
-            }
-            else if (recipient.memberId === memberWithoutEmail.id) {
+            } else if (recipient.memberId === memberWithoutEmail.id) {
                 expect(firstNameMember?.value).toBe(memberWithoutEmail.details.firstName);
-            }
-            else {
+            } else {
                 throw new Error('Recipient has unexpected memberId ' + recipient.memberId);
             }