@stamhoofd/backend 2.55.2 → 2.57.0

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

@@ -1,11 +1,12 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
+import { AuditLogType, GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group, Member, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, SetupStepUpdater } from '@stamhoofd/models';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
+import { AuditLogService } from '../../../../services/AuditLogService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -281,6 +282,11 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         model.deletedAt = new Date();
         await model.save();
         Member.updateMembershipsForGroupId(id);
+
+        await AuditLogService.log({
+            type: AuditLogType.GroupDeleted,
+            group: model,
+        });
     }
 
     static async patchGroup(struct: AutoEncoderPatchType<GroupStruct>, period?: RegistrationPeriod | null) {
@@ -289,6 +295,7 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
             throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen');
         }
+        const originalStruct = (await AuthenticatedStructures.group(model)).clone(); // Clone is required for deep changes
 
         const previousProperties = {
             deletedAt: model.deletedAt,
@@ -417,6 +424,13 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         if (struct.deletedAt !== undefined || struct.defaultAgeGroupId !== undefined) {
             Member.updateMembershipsForGroupId(model.id);
         }
+
+        await AuditLogService.log({
+            type: AuditLogType.GroupEdited,
+            group: model,
+            oldData: originalStruct,
+            patch,
+        });
     }
 
     static async createGroup(struct: GroupStruct, organizationId: string, period: RegistrationPeriod, options?: { allowedIds?: string[] }): Promise<Group> {
@@ -497,6 +511,12 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
 
         await model.save();
         await model.updateOccupancy({ isNew: true }); // Force update steps
+
+        await AuditLogService.log({
+            type: AuditLogType.GroupAdded,
+            group: model,
+        });
+
         return model;
     }
 }

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

@@ -1,15 +1,12 @@
-import { createMollieClient, PaymentStatus as MolliePaymentStatus } from '@mollie/api-client';
 import { AutoEncoder, BooleanDecoder, Decoder, field } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, MolliePayment, MollieToken, Order, Organization, PayconiqPayment, Payment } from '@stamhoofd/models';
-import { QueueHandler } from '@stamhoofd/queues';
-import { PaymentGeneral, PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
+import { Order } from '@stamhoofd/models';
+import { PaymentGeneral } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
 import { Context } from '../../../helpers/Context';
-import { StripeHelper } from '../../../helpers/StripeHelper';
+import { PaymentService } from '../../../services/PaymentService';
 
 type Params = { id: string };
 class Query extends AutoEncoder {
@@ -52,7 +49,7 @@ export class ExchangePaymentEndpoint extends Endpoint<Params, Query, Body, Respo
         }
 
         // Not method on payment because circular references (not supprted in ts)
-        const payment = await ExchangePaymentEndpoint.pollStatus(request.params.id, organization, request.query.cancel);
+        const payment = await PaymentService.pollStatus(request.params.id, organization, request.query.cancel);
         if (!payment) {
             throw new SimpleError({
                 code: '',
@@ -82,303 +79,4 @@ export class ExchangePaymentEndpoint extends Endpoint<Params, Query, Body, Respo
             await AuthenticatedStructures.paymentGeneral(payment, checkPermissions),
         );
     }
-
-    static async handlePaymentStatusUpdate(payment: Payment, organization: Organization, status: PaymentStatus) {
-        if (payment.status === status) {
-            return;
-        }
-
-        if (status === PaymentStatus.Succeeded) {
-            payment.status = PaymentStatus.Succeeded;
-            payment.paidAt = new Date();
-            await payment.save();
-
-            // Prevent concurrency issues
-            await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
-                const unloaded = (await BalanceItemPayment.where({ paymentId: payment.id })).map(r => r.setRelation(BalanceItemPayment.payment, payment));
-                const balanceItemPayments = await BalanceItemPayment.balanceItem.load(
-                    unloaded,
-                );
-
-                for (const balanceItemPayment of balanceItemPayments) {
-                    await balanceItemPayment.markPaid(organization);
-                }
-
-                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem));
-            });
-            return;
-        }
-
-        const oldStatus = payment.status;
-
-        // Save before updating balance items
-        payment.status = status;
-        payment.paidAt = null;
-        await payment.save();
-
-        // If OLD status was succeeded, we need to revert the actions
-        if (oldStatus === PaymentStatus.Succeeded) {
-            // No longer succeeded
-            await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
-                const balanceItemPayments = await BalanceItemPayment.balanceItem.load(
-                    (await BalanceItemPayment.where({ paymentId: payment.id })).map(r => r.setRelation(BalanceItemPayment.payment, payment)),
-                );
-
-                for (const balanceItemPayment of balanceItemPayments) {
-                    await balanceItemPayment.undoPaid(organization);
-                }
-
-                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem));
-            });
-        }
-
-        // Moved to failed
-        if (status == PaymentStatus.Failed) {
-            await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
-                const balanceItemPayments = await BalanceItemPayment.balanceItem.load(
-                    (await BalanceItemPayment.where({ paymentId: payment.id })).map(r => r.setRelation(BalanceItemPayment.payment, payment)),
-                );
-
-                for (const balanceItemPayment of balanceItemPayments) {
-                    await balanceItemPayment.markFailed(organization);
-                }
-
-                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem));
-            });
-        }
-
-        // If OLD status was FAILED, we need to revert the actions
-        if (oldStatus === PaymentStatus.Failed) { // OLD FAILED!! -> NOW PENDING
-            await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
-                const balanceItemPayments = await BalanceItemPayment.balanceItem.load(
-                    (await BalanceItemPayment.where({ paymentId: payment.id })).map(r => r.setRelation(BalanceItemPayment.payment, payment)),
-                );
-
-                for (const balanceItemPayment of balanceItemPayments) {
-                    await balanceItemPayment.undoFailed(organization);
-                }
-
-                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem));
-            });
-        }
-    }
-
-    /**
-     * ID of payment is needed because of race conditions (need to fetch payment in a race condition save queue)
-     */
-    static async pollStatus(paymentId: string, org: Organization | null, cancel = false): Promise<Payment | undefined> {
-        // Prevent polling the same payment multiple times at the same time: create a queue to prevent races
-        return await QueueHandler.schedule('payments/' + paymentId, async () => {
-            // Get a new copy of the payment (is required to prevent concurreny bugs)
-            const payment = await Payment.getByID(paymentId);
-            if (!payment) {
-                return;
-            }
-
-            if (!payment.organizationId) {
-                console.error('Payment without organization not supported', payment.id);
-                return;
-            }
-
-            const organization = org ?? await Organization.getByID(payment.organizationId);
-            if (!organization) {
-                console.error('Organization not found for payment', payment.id);
-                return;
-            }
-
-            const testMode = organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production';
-
-            if (payment.status == PaymentStatus.Pending || payment.status == PaymentStatus.Created || (payment.provider === PaymentProvider.Buckaroo && payment.status == PaymentStatus.Failed)) {
-                if (payment.provider === PaymentProvider.Stripe) {
-                    try {
-                        let status = await StripeHelper.getStatus(payment, cancel || this.shouldTryToCancel(payment.status, payment), testMode);
-
-                        if (this.isManualExpired(status, payment)) {
-                            console.error('Manually marking Stripe payment as expired', payment.id);
-                            status = PaymentStatus.Failed;
-                        }
-
-                        await this.handlePaymentStatusUpdate(payment, organization, status);
-                    }
-                    catch (e) {
-                        console.error('Payment check failed Stripe', payment.id, e);
-                        if (this.isManualExpired(payment.status, payment)) {
-                            console.error('Manually marking Stripe payment as expired', payment.id);
-                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                        }
-                    }
-                }
-                else if (payment.provider === PaymentProvider.Mollie) {
-                    // check status via mollie
-                    const molliePayments = await MolliePayment.where({ paymentId: payment.id }, { limit: 1 });
-                    if (molliePayments.length == 1) {
-                        const molliePayment = molliePayments[0];
-                        // check status
-                        const token = await MollieToken.getTokenFor(organization.id);
-
-                        if (token) {
-                            try {
-                                const mollieClient = createMollieClient({ accessToken: await token.getAccessToken() });
-                                const mollieData = await mollieClient.payments.get(molliePayment.mollieId, {
-                                    testmode: organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production',
-                                });
-
-                                console.log(mollieData); // log to log files to check issues
-
-                                const details = mollieData.details as any;
-                                if (details?.consumerName) {
-                                    payment.ibanName = details.consumerName;
-                                }
-                                if (details?.consumerAccount) {
-                                    payment.iban = details.consumerAccount;
-                                }
-                                if (details?.cardHolder) {
-                                    payment.ibanName = details.cardHolder;
-                                }
-                                if (details?.cardNumber) {
-                                    payment.iban = 'xxxx xxxx xxxx ' + details.cardNumber;
-                                }
-
-                                if (mollieData.status === MolliePaymentStatus.paid) {
-                                    await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Succeeded);
-                                }
-                                else if (mollieData.status === MolliePaymentStatus.failed || mollieData.status === MolliePaymentStatus.expired || mollieData.status === MolliePaymentStatus.canceled) {
-                                    await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                                }
-                                else if (this.isManualExpired(payment.status, payment)) {
-                                    // Mollie still returning pending after 1 day: mark as failed
-                                    console.error('Manually marking Mollie payment as expired', payment.id);
-                                    await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                                }
-                            }
-                            catch (e) {
-                                console.error('Payment check failed Mollie', payment.id, e);
-                                if (this.isManualExpired(payment.status, payment)) {
-                                    console.error('Manually marking Mollie payment as expired', payment.id);
-                                    await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                                }
-                            }
-                        }
-                        else {
-                            console.warn('Mollie payment is missing for organization ' + organization.id + ' while checking payment status...');
-
-                            if (this.isManualExpired(payment.status, payment)) {
-                                console.error('Manually marking payment without mollie token as expired', payment.id);
-                                await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                            }
-                        }
-                    }
-                    else {
-                        if (this.isManualExpired(payment.status, payment)) {
-                            console.error('Manually marking payment without mollie payments as expired', payment.id);
-                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                        }
-                    }
-                }
-                else if (payment.provider == PaymentProvider.Buckaroo) {
-                    const helper = new BuckarooHelper(organization.privateMeta.buckarooSettings?.key ?? '', organization.privateMeta.buckarooSettings?.secret ?? '', organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
-                    try {
-                        let status = await helper.getStatus(payment);
-
-                        if (this.isManualExpired(status, payment)) {
-                            console.error('Manually marking Buckaroo payment as expired', payment.id);
-                            status = PaymentStatus.Failed;
-                        }
-
-                        await this.handlePaymentStatusUpdate(payment, organization, status);
-                    }
-                    catch (e) {
-                        console.error('Payment check failed Buckaroo', payment.id, e);
-                        if (this.isManualExpired(payment.status, payment)) {
-                            console.error('Manually marking Buckaroo payment as expired', payment.id);
-                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                        }
-                    }
-                }
-                else if (payment.provider == PaymentProvider.Payconiq) {
-                    // Check status
-
-                    const payconiqPayments = await PayconiqPayment.where({ paymentId: payment.id }, { limit: 1 });
-                    if (payconiqPayments.length == 1) {
-                        const payconiqPayment = payconiqPayments[0];
-
-                        if (cancel) {
-                            console.error('Cancelling Payconiq payment on request', payment.id);
-                            await payconiqPayment.cancel(organization);
-                        }
-
-                        let status = await payconiqPayment.getStatus(organization);
-
-                        if (!cancel && this.shouldTryToCancel(status, payment)) {
-                            console.error('Manually cancelling Payconiq payment', payment.id);
-                            if (await payconiqPayment.cancel(organization)) {
-                                status = PaymentStatus.Failed;
-                            }
-                        }
-
-                        if (this.isManualExpired(status, payment)) {
-                            console.error('Manually marking Payconiq payment as expired', payment.id);
-                            status = PaymentStatus.Failed;
-                        }
-
-                        await this.handlePaymentStatusUpdate(payment, organization, status);
-                    }
-                    else {
-                        console.warn('Payconiq payment is missing for organization ' + organization.id + ' while checking payment status...');
-
-                        if (this.isManualExpired(payment.status, payment)) {
-                            console.error('Manually marking Payconiq payment as expired because not found', payment.id);
-                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                        }
-                    }
-                }
-                else {
-                    console.error('Invalid payment provider', payment.provider, 'for payment', payment.id);
-                    if (this.isManualExpired(payment.status, payment)) {
-                        console.error('Manually marking unknown payment as expired', payment.id);
-                        await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
-                    }
-                }
-            }
-            else {
-                // Do a manual update if needed
-                if (payment.status === PaymentStatus.Succeeded) {
-                    if (payment.provider === PaymentProvider.Stripe) {
-                        // Update the status
-                        await StripeHelper.getStatus(payment, false, testMode);
-                    }
-                }
-            }
-            return payment;
-        });
-    }
-
-    static isManualExpired(status: PaymentStatus, payment: Payment) {
-        if ((status == PaymentStatus.Pending || status === PaymentStatus.Created) && payment.method !== PaymentMethod.DirectDebit) {
-            // If payment is not succeeded after one day, mark as failed
-            if (payment.createdAt < new Date(new Date().getTime() - 60 * 1000 * 60 * 24)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Try to cancel a payment that is still pending
-     */
-    static shouldTryToCancel(status: PaymentStatus, payment: Payment) {
-        if ((status == PaymentStatus.Pending || status === PaymentStatus.Created) && payment.method !== PaymentMethod.DirectDebit) {
-            let timeout = STAMHOOFD.environment === 'development' ? 60 * 1000 * 2 : 60 * 1000 * 30;
-
-            // If payconiq and not yet 'identified' (scanned), cancel after 5 minutes
-            if (payment.provider === PaymentProvider.Payconiq && status === PaymentStatus.Created) {
-                timeout = STAMHOOFD.environment === 'development' ? 60 * 1000 * 1 : 60 * 1000 * 5;
-            }
-
-            if (payment.createdAt < new Date(new Date().getTime() - timeout)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

package/src/helpers/AdminPermissionChecker.ts

@@ -520,7 +520,18 @@ export class AdminPermissionChecker {
         }
 
         if (!user.organizationId) {
-            return this.hasPlatformFullAccess();
+            if (this.hasPlatformFullAccess()) {
+                return true;
+            }
+
+            // Check if this user has permissions for the current scoped organization
+            if (this.organization && await this.hasFullAccess(this.organization.id)) {
+                if (user.permissions?.forOrganization(this.organization)) {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         return await this.canManageAdmins(user.organizationId);
@@ -932,6 +943,60 @@ export class AdminPermissionChecker {
         return false;
     }
 
+    /**
+     * Return a list of RecordSettings the current user can view or edit
+     */
+    async hasNRNAccess(member: MemberWithRegistrations, level: PermissionLevel = PermissionLevel.Read): Promise<boolean> {
+        const isUserManager = this.isUserManager(member);
+
+        if (isUserManager) {
+            return true;
+        }
+
+        if (!await this.canAccessMember(member, level)) {
+            return false;
+        }
+
+        // First list all organizations this member is part of
+        const organizations: Organization[] = [];
+
+        if (member.organizationId) {
+            if (this.checkScope(member.organizationId)) {
+                organizations.push(await this.getOrganization(member.organizationId));
+            }
+        }
+
+        for (const registration of member.registrations) {
+            if (this.checkScope(registration.organizationId)) {
+                if (!organizations.find(o => o.id === registration.organizationId)) {
+                    organizations.push(await this.getOrganization(registration.organizationId));
+                }
+            }
+        }
+
+        // Loop all organizations.
+        for (const organization of organizations) {
+            const permissions = await this.getOrganizationPermissions(organization);
+            if (!permissions) {
+                continue;
+            }
+
+            if (permissions.hasAccessRight(AccessRight.MemberManageNRN)) {
+                return true;
+            }
+        }
+
+        // Platform data
+        const platformPermissions = this.platformPermissions;
+        if (platformPermissions) {
+            if (platformPermissions.hasAccessRight(AccessRight.MemberManageNRN)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Return a list of RecordSettings the current user can view or edit
      */
@@ -1006,6 +1071,14 @@ export class AdminPermissionChecker {
             cloned.details.securityCode = null;
         }
 
+        if (!await this.hasNRNAccess(member, PermissionLevel.Read)) {
+            cloned.details.nationalRegisterNumber = null;
+
+            for (const parent of cloned.details.parents) {
+                parent.nationalRegisterNumber = null;
+            }
+        }
+
         return cloned;
     }
 
@@ -1021,6 +1094,14 @@ export class AdminPermissionChecker {
             });
         }
 
+        if (Array.isArray(data.details.parents)) {
+            throw new SimpleError({
+                code: 'invalid_request',
+                message: 'Cannot PUT a full member details parents',
+                statusCode: 400,
+            });
+        }
+
         const hasRecordAnswers = !!data.details.recordAnswers;
         const hasNotes = data.details.notes !== undefined;
         const isSetFinancialSupportTrue = data.details.shouldApplyReducedPrice;
@@ -1155,6 +1236,26 @@ export class AdminPermissionChecker {
             }
         }
 
+        if (!await this.hasNRNAccess(member, PermissionLevel.Write)) {
+            if (data.details.nationalRegisterNumber) {
+                throw new SimpleError({
+                    code: 'permission_denied',
+                    message: 'Je hebt geen toegangsrechten om het rijksregisternummer van dit lid aan te passen',
+                    statusCode: 400,
+                });
+            }
+
+            for (const parent of data.details.parents.getPatches()) {
+                if (parent.nationalRegisterNumber) {
+                    throw new SimpleError({
+                        code: 'permission_denied',
+                        message: 'Je hebt geen toegangsrechten om het rijksregisternummer van een ouder aan te passen',
+                        statusCode: 400,
+                    });
+                }
+            }
+        }
+
         return data;
     }
 

package/src/helpers/AuthenticatedStructures.ts

@@ -1,6 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AccessRight, Document as DocumentStruct, Event as EventStruct, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLog, BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
+import { AuditLog as AuditLogStruct, Document as DocumentStruct, Event as EventStruct, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Formatter } from '@stamhoofd/utility';
 import { Context } from './Context';
@@ -639,4 +639,48 @@ export class AuthenticatedStructures {
 
         return result;
     }
+
+    static async auditLogs(logs: AuditLog[]): Promise<AuditLogStruct[]> {
+        const structs: AuditLogStruct[] = [];
+
+        const userIds = Formatter.uniqueArray(logs.map(l => l.userId).filter(id => id !== null));
+        const users = await User.getByIDs(...userIds);
+
+        for (const log of logs) {
+            const user = log.userId ? (users.find(u => u.id === log.userId) ?? null) : null;
+            let userStruct: NamedObject | null = null;
+
+            if (user) {
+                if (!await Context.auth.canAccessUser(user)) {
+                    if (user.permissions?.platform !== null) {
+                        userStruct = NamedObject.create({
+                            id: '',
+                            name: 'Beheerder van ' + Platform.shared.config.name,
+                        });
+                    }
+                    else {
+                        userStruct = NamedObject.create({
+                            id: '',
+                            name: 'Onbekend',
+                        });
+                    }
+                }
+                else {
+                    userStruct = NamedObject.create({
+                        id: user.id,
+                        name: (user.firstName || user.lastName) ? (user.firstName + ' ' + user.lastName) : user.email,
+                    });
+                }
+            }
+
+            structs.push(
+                AuditLogStruct.create({
+                    ...log,
+                    user: userStruct,
+                }),
+            );
+        }
+
+        return structs;
+    }
 }

package/src/helpers/EmailResumer.ts

@@ -30,8 +30,13 @@ export async function resumeEmails() {
             continue;
         }
 
-        await ContextInstance.startForUser(user, organization, async () => {
-            await email.send();
-        });
+        try {
+            await ContextInstance.startForUser(user, organization, async () => {
+                await email.send();
+            });
+        }
+        catch (e) {
+            console.error('Error resuming email', email.id, e);
+        }
     }
 }