@stamhoofd/backend 2.137.4 → 2.138.0

package/src/endpoints/organization/dashboard/users/SignOutOrganizationAdminsEndpoint.test.ts

@@ -0,0 +1,160 @@
+import { Request } from '@simonbackx/simple-endpoints';
+import type { Organization, User } from '@stamhoofd/models';
+import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
+import { PermissionLevel, Permissions, UserPermissions } from '@stamhoofd/structures';
+import { STExpect, TestUtils } from '@stamhoofd/test-utils';
+
+import { testServer } from '../../../../../tests/helpers/TestServer.js';
+import { AdminSessionService } from '../../../../services/AdminSessionService.js';
+import { SignOutOrganizationAdminsEndpoint } from './SignOutOrganizationAdminsEndpoint.js';
+
+describe('Endpoint.SignOutOrganizationAdmins', () => {
+    const endpoint = new SignOutOrganizationAdminsEndpoint();
+
+    beforeEach(() => {
+        TestUtils.setEnvironment('userMode', 'platform');
+    });
+
+    const signOut = async (organization: Organization, token: Token) => {
+        const request = Request.buildJson('POST', '/organization/admins/sign-out', organization.getApiHost());
+        request.headers.authorization = 'Bearer ' + token.accessToken;
+        return await testServer.test(endpoint, request);
+    };
+
+    /**
+     * In platform mode users are not owned by an organization: they have permissions for it.
+     */
+    const createAdmin = async (organization: Organization, level = PermissionLevel.Full) => {
+        const user = await new UserFactory({
+            organization,
+            permissions: Permissions.create({ level }),
+        }).create();
+        user.organizationId = null;
+        await user.save();
+        return user;
+    };
+
+    const tokenExists = async (token: Token) => {
+        return !!(await Token.getByAccessToken(token.accessToken, true));
+    };
+
+    test('all sessions of all admins are signed out, except the one making the request', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const otherOrganization = await new OrganizationFactory({}).create();
+
+        const admin = await createAdmin(organization);
+        const otherAdmin = await createAdmin(organization);
+        const otherOrganizationAdmin = await createAdmin(otherOrganization);
+        const member = await new UserFactory({ organization }).create();
+
+        const currentToken = await Token.createToken(admin, new Date());
+        const secondDeviceOfAdmin = await Token.createToken(admin, new Date());
+        const otherAdminToken = await Token.createToken(otherAdmin, new Date());
+        const otherOrganizationAdminToken = await Token.createToken(otherOrganizationAdmin, new Date());
+        const memberToken = await Token.createToken(member, new Date());
+
+        const response = await signOut(organization, currentToken);
+
+        // The other device of the admin is signed out too: only this session is spared
+        expect(response.body.count).toBe(2);
+        expect(await tokenExists(currentToken)).toBe(true);
+        expect(await tokenExists(secondDeviceOfAdmin)).toBe(false);
+        expect(await tokenExists(otherAdminToken)).toBe(false);
+
+        // Users without permissions in this organization are not affected
+        expect(await tokenExists(otherOrganizationAdminToken)).toBe(true);
+        expect(await tokenExists(memberToken)).toBe(true);
+    });
+
+    test('an admin without full access cannot sign out the other admins', async () => {
+        const organization = await new OrganizationFactory({}).create();
+
+        const admin = await createAdmin(organization, PermissionLevel.Write);
+        const otherAdmin = await createAdmin(organization);
+        const otherAdminToken = await Token.createToken(otherAdmin, new Date());
+
+        await expect(signOut(organization, await Token.createToken(admin, new Date()))).rejects.toThrow(STExpect.simpleError({
+            code: 'permission_denied',
+        }));
+        expect(await tokenExists(otherAdminToken)).toBe(true);
+    });
+
+    test('an api user cannot sign out the admins', async () => {
+        const organization = await new OrganizationFactory({}).create();
+
+        const apiUser = await new UserFactory({ organization, apiUser: true }).create();
+        apiUser.permissions = UserPermissions.create({
+            organizationPermissions: new Map([[organization.id, Permissions.create({ level: PermissionLevel.Full })]]),
+        });
+        await apiUser.save();
+
+        const otherAdmin = await createAdmin(organization);
+        const otherAdminToken = await Token.createToken(otherAdmin, new Date());
+
+        await expect(signOut(organization, await Token.createApiToken(apiUser))).rejects.toThrow(STExpect.simpleError({
+            code: 'permission_denied',
+        }));
+        expect(await tokenExists(otherAdminToken)).toBe(true);
+    });
+
+    test('an organization without admins is a no-op', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new UserFactory({ organization }).create();
+        const memberToken = await Token.createToken(member, new Date());
+
+        // Not reachable through the endpoint (the caller is an admin themselves), but the
+        // empty list of users may not turn into a query that deletes everything.
+        expect(await AdminSessionService.signOutOrganizationAdmins(organization.id, null)).toBe(0);
+        expect(await tokenExists(memberToken)).toBe(true);
+    });
+
+    describe('userMode organization', () => {
+        beforeEach(() => {
+            TestUtils.setEnvironment('userMode', 'organization');
+        });
+
+        test('all sessions of all admins are signed out, except the one making the request', async () => {
+            const organization = await new OrganizationFactory({}).create();
+
+            const admin: User = await new UserFactory({
+                organization,
+                permissions: Permissions.create({ level: PermissionLevel.Full }),
+            }).create();
+            const otherAdmin: User = await new UserFactory({
+                organization,
+                permissions: Permissions.create({ level: PermissionLevel.Full }),
+            }).create();
+            const member = await new UserFactory({ organization }).create();
+
+            const otherAdminToken = await Token.createToken(otherAdmin, new Date());
+            const memberToken = await Token.createToken(member, new Date());
+
+            const response = await signOut(organization, await Token.createToken(admin, new Date()));
+
+            expect(response.body.count).toBe(1);
+            expect(await tokenExists(otherAdminToken)).toBe(false);
+            expect(await tokenExists(memberToken)).toBe(true);
+        });
+
+        test('api users keep their token, because they cannot complete a login', async () => {
+            const organization = await new OrganizationFactory({}).create();
+
+            const admin: User = await new UserFactory({
+                organization,
+                permissions: Permissions.create({ level: PermissionLevel.Full }),
+            }).create();
+
+            const apiUser = await new UserFactory({ organization, apiUser: true }).create();
+            apiUser.permissions = UserPermissions.create({
+                organizationPermissions: new Map([[organization.id, Permissions.create({ level: PermissionLevel.Full })]]),
+            });
+            await apiUser.save();
+            const apiToken = await Token.createApiToken(apiUser);
+
+            const response = await signOut(organization, await Token.createToken(admin, new Date()));
+
+            expect(response.body.count).toBe(0);
+            expect(await tokenExists(apiToken)).toBe(true);
+        });
+    });
+});

package/src/endpoints/organization/dashboard/users/SignOutOrganizationAdminsEndpoint.ts

@@ -0,0 +1,44 @@
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import { CountResponse } from '@stamhoofd/structures';
+
+import { Context } from '../../../../helpers/Context.js';
+import { AdminSessionService } from '../../../../services/AdminSessionService.js';
+
+type Params = Record<string, never>;
+type Query = undefined;
+type Body = undefined;
+type ResponseBody = CountResponse;
+
+/**
+ * End the sessions of all administrators of this organization, so they have to sign in
+ * again. Used after making two-factor authentication required, which is only enforced on
+ * new logins.
+ */
+export class SignOutOrganizationAdminsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+    protected doesMatch(request: Request): [true, Params] | [false] {
+        if (request.method !== 'POST') {
+            return [false];
+        }
+
+        const params = Endpoint.parseParameters(request.url, '/organization/admins/sign-out', {});
+
+        if (params) {
+            return [true, params as Params];
+        }
+        return [false];
+    }
+
+    async handle(_: DecodedRequest<Params, Query, Body>) {
+        const organization = await Context.setOrganizationScope();
+        const { token } = await Context.authenticate();
+
+        if (!await Context.auth.canManageAdmins(organization.id)) {
+            throw Context.auth.error();
+        }
+
+        const count = await AdminSessionService.signOutOrganizationAdmins(organization.id, token.accessToken);
+
+        return new Response(CountResponse.create({ count }));
+    }
+}

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -10,6 +10,7 @@ import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceIt
 import { Context } from '../../../../helpers/Context.js';
 import { ServiceFeeHelper } from '../../../../helpers/ServiceFeeHelper.js';
 import { AuditLogService } from '../../../../services/AuditLogService.js';
+import { OrderService } from '../../../../services/OrderService.js';
 import { PaymentService } from '../../../../services/PaymentService.js';
 import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService.js';
 
@@ -151,7 +152,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         order.data.paymentMethod = PaymentMethod.Unknown;
 
                         // Mark this order as paid
-                        await order.markPaid(null, organization, webshop);
+                        await OrderService.markPaid(order, null, organization, webshop);
                         await order.save();
                     } else {
                         const payment = new Payment();
@@ -217,12 +218,12 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         await balanceItemPayment.save();
 
                         if (payment.method === PaymentMethod.Transfer) {
-                            await order.markValid(payment, []);
+                            await OrderService.markValid(order, payment, []);
                             await payment.save();
                             await order.save();
                         } else if (payment.method === PaymentMethod.PointOfSale) {
                             // Not really paid, but needed to create the tickets if needed
-                            await order.markPaid(payment, organization, webshop);
+                            await OrderService.markPaid(order, payment, organization, webshop);
                             await payment.save();
                             await order.save();
                         } else {

package/src/endpoints/organization/shared/GetDocumentHtml.ts

@@ -5,6 +5,7 @@ import { signInternal } from '@stamhoofd/backend-env';
 import { Document, Organization } from '@stamhoofd/models';
 
 import { Context } from '../../../helpers/Context.js';
+import { DocumentRenderService } from '../../../services/DocumentRenderService.js';
 type Params = { id: string };
 type Query = undefined;
 type Body = undefined;
@@ -45,7 +46,7 @@ export class GetDocumentHtml extends Endpoint<Params, Query, Body, ResponseBody>
             });
         }
 
-        const html = await document.getRenderedHtml(organization);
+        const html = await DocumentRenderService.getRenderedHtml(document, organization);
         if (!html) {
             throw new SimpleError({
                 code: 'failed_generating',

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.ts

@@ -16,6 +16,7 @@ import { ServiceFeeHelper } from '../../../helpers/ServiceFeeHelper.js';
 import { StripeHelper } from '../../../helpers/StripeHelper.js';
 import { AuditLogService } from '../../../services/AuditLogService.js';
 import { MollieService } from '../../../services/MollieService.js';
+import { OrderService } from '../../../services/OrderService.js';
 import { PaymentService } from '../../../services/PaymentService.js';
 import { UitpasService } from '../../../services/uitpas/UitpasService.js';
 import { WebshopAuthHelper } from './WebshopAuthHelper.js';
@@ -171,7 +172,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 order.data.paymentMethod = PaymentMethod.Unknown;
 
                 // Mark this order as paid
-                await order.markPaid(null, organization, webshop);
+                await OrderService.markPaid(order, null, organization, webshop);
                 await order.save();
             } else {
                 const payment = new Payment();
@@ -242,7 +243,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 const description = webshop.meta.name + ' - ' + organization.name;
 
                 if (payment.method === PaymentMethod.Transfer) {
-                    await order.markValid(payment, []);
+                    await OrderService.markValid(order, payment, []);
 
                     if (order.number) {
                         balanceItem.description = order.generateBalanceDescription(webshop);
@@ -253,7 +254,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     await payment.save();
                 } else if (payment.method === PaymentMethod.PointOfSale) {
                     // Not really paid, but needed to create the tickets if needed
-                    await order.markPaid(payment, organization, webshop);
+                    await OrderService.markPaid(order, payment, organization, webshop);
 
                     if (order.number) {
                         balanceItem.description = order.generateBalanceDescription(webshop);

package/src/excel-loaders/balance-items.ts

@@ -16,7 +16,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.BalanceItems, {
             results: await BalanceItem.getStructureWithPayments(data.results),
         });
     },
-    sheets: [
+    getSheets: () => [
         {
             id: 'balanceItems',
             name: $t(`%1LA`),

package/src/excel-loaders/event-notifications.ts

@@ -1,14 +1,14 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
-import type { EventNotification, LimitedFilteredRequest } from '@stamhoofd/structures';
-import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, Platform as PlatformStruct } from '@stamhoofd/structures';
+import type { EventNotification, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<EventNotification, EventNotification> => ({
     id: 'event-notifications',
     name: $t(`%1FR`),
     columns: [
@@ -118,18 +118,17 @@ const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
             matchId: 'recordAnswers',
             getRecordAnswers: (notification: EventNotification) => notification.recordAnswers,
             getRecordCategories: () => {
-                const platform = PlatformStruct.shared;
                 return platform.config.eventNotificationTypes.flatMap(r => r.recordCategories);
             },
         }),
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.EventNotifications, {
     fetch: async (query: LimitedFilteredRequest) => {
         return await GetEventNotificationsEndpoint.buildData(query);
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });

package/src/excel-loaders/members.test.ts

@@ -1,7 +1,7 @@
 import type { XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
 import type { PlatformMember } from '@stamhoofd/structures';
 import { EmergencyContact, MemberDetails, MembersBlob, MemberWithRegistrationsBlob, Organization, Platform, PlatformFamily } from '@stamhoofd/structures';
-import { baseMemberColumns } from './members.js';
+import { getBaseMemberColumns } from './members.js';
 
 describe('Member excel export', () => {
     describe('emergencyContacts column', () => {
@@ -21,7 +21,7 @@ describe('Member excel export', () => {
         }
 
         function getColumn() {
-            const column = baseMemberColumns.find(c => 'id' in c && c.id === 'emergencyContacts') as XlsxTransformerConcreteColumn<PlatformMember> | undefined;
+            const column = getBaseMemberColumns(Platform.create({})).find(c => 'id' in c && c.id === 'emergencyContacts') as XlsxTransformerConcreteColumn<PlatformMember> | undefined;
 
             if (!column) {
                 throw new Error('Column emergencyContacts not found');

package/src/excel-loaders/members.ts

@@ -1,8 +1,8 @@
 import type { XlsxTransformerColumn, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, PlatformMember } from '@stamhoofd/structures';
-import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';
@@ -10,7 +10,7 @@ import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
 import { Context } from '../helpers/Context.js';
 import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
-export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
+export const getBaseMemberColumns = (platform: PlatformStruct): XlsxTransformerColumn<PlatformMember>[] => [
     {
         id: 'id',
         name: $t(`%d`),
@@ -244,7 +244,6 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
         matchId: 'recordAnswers',
         getRecordAnswers: ({ patchedMember: object }: PlatformMember) => object.details.recordAnswers,
         getRecordCategories: () => {
-            const platform = PlatformStruct.shared;
             const organization = Context.organization;
 
             return [
@@ -256,11 +255,11 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
 ];
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<PlatformMember, PlatformMember> => ({
     id: 'members',
     name: $t(`%1EH`),
     columns: [
-        ...baseMemberColumns,
+        ...getBaseMemberColumns(platform),
         {
             id: 'group',
             name: $t(`%wH`),
@@ -281,7 +280,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
             getValue: (member: PlatformMember) => {
                 const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
                 const defaultAgeGroupIds = Formatter.uniqueArray(groups.filter(o => o.group.defaultAgeGroupId));
-                const defaultAgeGroups = defaultAgeGroupIds.map(o => PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`%wJ`));
+                const defaultAgeGroups = defaultAgeGroupIds.map(o => platform.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`%wJ`));
                 const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' ' + $t(`%M1`) + ' ') || Context.i18n.$t('%5D');
 
                 return {
@@ -472,7 +471,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
             },
         },
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -486,8 +485,8 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
             next: result.next,
         });
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });
 

package/src/excel-loaders/organizations.ts

@@ -1,8 +1,8 @@
 import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
-import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, Premise } from '@stamhoofd/structures';
-import { ExcelExportType, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { Group, Member, MemberResponsibilityRecord, Platform } from '@stamhoofd/models';
+import type { LimitedFilteredRequest, Platform as PlatformStruct, Premise } from '@stamhoofd/structures';
+import { ExcelExportType, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
@@ -27,7 +27,7 @@ class MemberResponsibilityRecordWithMemberAndOrganization extends MemberResponsi
 type Object = OrganizationWithResponsibilities;
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<Object, Object> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, Object> => ({
     id: 'organizations',
     name: $t(`%wP`),
     columns: [
@@ -60,8 +60,6 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
             name: $t(`%13`),
             width: 50,
             getValue: (object: Object) => {
-                const platform = PlatformStruct.shared;
-
                 return {
                     value: object.meta.tags.map(tag => platform.config.tags.find(t => t.id === tag)?.name ?? $t(`%Gr`)).join(', '),
                 };
@@ -76,17 +74,15 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
             matchId: 'recordAnswers',
             getRecordAnswers: (object: Object) => object.getRecordAnswers(),
             getRecordCategories: () => {
-                const platform = PlatformStruct.shared;
-
                 return [
                     ...platform.config.organizationLevelRecordsConfiguration.recordCategories,
                 ];
             },
         }),
     ],
-};
+});
 
-const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordWithMemberAndOrganization> = {
+const getResponsibilitiesSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, MemberResponsibilityRecordWithMemberAndOrganization> => ({
     id: 'responsibilities',
     name: $t(`%7D`),
     transform(organization) {
@@ -125,7 +121,6 @@ const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordW
             name: $t(`%H2`),
             width: 50,
             getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => {
-                const platform = PlatformStruct.shared;
                 const responsibility = platform.config.responsibilities.find(r => r.id === object.responsibilityId) ?? object.organization.privateMeta?.responsibilities.find(r => r.id === object.responsibilityId);
 
                 if (!responsibility) {
@@ -168,10 +163,10 @@ const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordW
             getAddress: object => object.member.details.address ?? object.member.details.parents[0]?.address ?? object.member.details.parents[1]?.address ?? null,
         }),
     ],
-};
+});
 
 type PremiseWithOrganization = { organization: Object; premise: Premise };
-const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
+const getPremisesSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, PremiseWithOrganization> => ({
     id: 'premises',
     name: $t(`%6c`),
     transform(organization) {
@@ -219,7 +214,6 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
             width: 20,
             getValue: (object: PremiseWithOrganization) => {
                 const ids = object.premise.premiseTypeIds;
-                const platform = PlatformStruct.shared;
                 return {
                     value: ids.map(id => platform.config.premiseTypes.find(t => t.id === id)?.name ?? $t(`%Gr`)).join(', '),
                 };
@@ -230,7 +224,7 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
             getAddress: object => object.premise.address,
         }),
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -253,7 +247,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
         const groups = await Group.getByIDs(...groupIds);
         const memberStructs = await AuthenticatedStructures.members(members);
         const groupStructs = await AuthenticatedStructures.groups(groups);
-        const platform = PlatformStruct.shared;
+        const platform = await Platform.getSharedStruct();
 
         const mappedOrganizations = organizations.results.map((o) => {
             const resp = responsibilities.filter(r => r.organizationId === o.id);
@@ -295,9 +289,9 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
             next: organizations.next,
         });
     },
-    sheets: [
-        sheet,
-        responsibilities,
-        premises,
+    getSheets: platform => [
+        getSheet(platform),
+        getResponsibilitiesSheet(platform),
+        getPremisesSheet(platform),
     ],
 });

package/src/excel-loaders/payments.ts

@@ -62,7 +62,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Payments, {
             }),
         });
     },
-    sheets: [
+    getSheets: () => [
         {
             id: 'payments',
             name: $t(`%1JH`),

package/src/excel-loaders/platform-memberships.ts

@@ -1,12 +1,12 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
-import type { LimitedFilteredRequest, PlatformMembership } from '@stamhoofd/structures';
-import { ExcelExportType, PaginatedResponse, Platform } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMembership, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { ExcelExportType, PaginatedResponse } from '@stamhoofd/structures';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetPlatformMembershipsEndpoint } from '../endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<PlatformMembership> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<PlatformMembership> => ({
     id: 'platform-memberships',
     name: $t('%1EI'),
     columns: [
@@ -23,7 +23,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             name: $t('%1LP'),
             width: 40,
             getValue: (membership: PlatformMembership) => {
-                const membershipType = Platform.shared.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
+                const membershipType = platform.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
                 const value = membershipType ? membershipType.name : '';
                 return { value };
             },
@@ -244,7 +244,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             }),
         },
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -255,7 +255,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
             next: data.next,
         });
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });