@stamhoofd/backend 2.115.0 → 2.116.0

package/src/endpoints/organization/dashboard/documents/PatchDocumentEndpoint.ts

@@ -4,7 +4,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Document, DocumentTemplate, Member, Registration } from '@stamhoofd/models';
 import { DocumentStatus, Document as DocumentStruct, PermissionLevel } from '@stamhoofd/structures';
 
-import { Context } from '../../../../helpers/Context';
+import { Context } from '../../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -104,7 +104,7 @@ export class PatchDocumentEndpoint extends Endpoint<Params, Query, Body, Respons
                 put.memberId = registration.memberId;
             }
             if (put.memberId) {
-                const member = await Member.getWithRegistrations(put.memberId);
+                const member = await Member.getByIdWithUsersAndRegistrations(put.memberId);
                 if (!member || !await Context.auth.canAccessMember(member, PermissionLevel.Read)) {
                     throw new SimpleError({
                         code: 'not_found',

package/src/endpoints/organization/dashboard/email/CheckEmailBouncesEndpoint.ts

@@ -4,7 +4,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailAddress } from '@stamhoofd/email';
 import { EmailInformation } from '@stamhoofd/structures';
 
-import { Context } from '../../../../helpers/Context';
+import { Context } from '../../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -28,10 +28,13 @@ export class CheckEmailBouncesEndpoint extends Endpoint<Params, Query, Body, Res
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
+        const organization = await Context.setOptionalOrganizationScope();
         await Context.authenticate();
 
-        if (!await Context.auth.canAccessEmailBounces(organization.id)) {
+        // null if platform
+        const organizationId: string | null = organization ? organization.id : null;
+
+        if (!await Context.auth.canAccessEmailBounces(organizationId)) {
             throw Context.auth.error();
         }
 
@@ -44,7 +47,7 @@ export class CheckEmailBouncesEndpoint extends Endpoint<Params, Query, Body, Res
             });
         }
 
-        const emails = await EmailAddress.getByEmails(request.body, organization.id);
+        const emails = await EmailAddress.getByEmails(request.body, organizationId);
         return new Response(emails.map(e => EmailInformation.create(e)));
     }
 }

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

@@ -242,7 +242,7 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
     }
 
     async validateMemberId(memberId: string) {
-        const member = (await Member.getWithRegistrations(memberId));
+        const member = (await Member.getByIdWithUsersAndRegistrations(memberId));
 
         if (!member || !(await Context.auth.canLinkBalanceItemToMember(member))) {
             throw new SimpleError({

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint.ts

@@ -2,10 +2,10 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { DetailedReceivableBalance, PaymentStatus, ReceivableBalanceType } from '@stamhoofd/structures';
 
 import { BalanceItem, BalanceItemPayment, CachedBalance, MemberUser, Payment } from '@stamhoofd/models';
-import { Context } from '../../../../helpers/Context';
-import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
+import { Context } from '../../../../helpers/Context.js';
+import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { SQL } from '@stamhoofd/sql';
-import { BalanceItemService } from '../../../../services/BalanceItemService';
+import { BalanceItemService } from '../../../../services/BalanceItemService.js';
 import { Formatter } from '@stamhoofd/utility';
 
 type Params = { id: string; type: ReceivableBalanceType };
@@ -44,7 +44,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
         switch (request.params.type) {
             case ReceivableBalanceType.organization: {
                 // Force cache updates, because sometimes the cache could be out of date
-                BalanceItemService.scheduleOrganizationUpdate(organization.id, request.params.id);
+                // BalanceItemService.scheduleOrganizationUpdate(organization.id, request.params.id);
 
                 paymentModels = await Payment.select()
                     .where('organizationId', organization.id)
@@ -67,7 +67,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
 
             case ReceivableBalanceType.member: {
                 // Force cache updates, because sometimes the cache could be out of date
-                BalanceItemService.scheduleMemberUpdate(organization.id, request.params.id);
+                // BalanceItemService.scheduleMemberUpdate(organization.id, request.params.id);
 
                 paymentModels = await Payment.select()
                     .where('organizationId', organization.id)
@@ -93,11 +93,11 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
                 const memberIds = Formatter.uniqueArray(memberUsers.map(mu => mu.membersId));
 
                 // Force cache updates, because sometimes the cache could be out of date
-                BalanceItemService.scheduleUserUpdate(organization.id, request.params.id);
-
-                for (const memberId of memberIds) {
-                    BalanceItemService.scheduleMemberUpdate(organization.id, memberId);
-                }
+                // BalanceItemService.scheduleUserUpdate(organization.id, request.params.id);
+                //
+                // for (const memberId of memberIds) {
+                //    BalanceItemService.scheduleMemberUpdate(organization.id, memberId);
+                // }
 
                 const q = Payment.select()
                     .where('organizationId', organization.id)
@@ -131,7 +131,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
 
             case ReceivableBalanceType.userWithoutMembers: {
                 // Force cache updates, because sometimes the cache could be out of date
-                BalanceItemService.scheduleUserUpdate(organization.id, request.params.id);
+                // BalanceItemService.scheduleUserUpdate(organization.id, request.params.id);
 
                 const q = Payment.select()
                     .where('organizationId', organization.id)
@@ -176,7 +176,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
         }
 
         // Flush caches (this makes sure that we do a reload in the frontend after a registration or change, we get the newest balances)
-        await BalanceItemService.flushCaches(organization.id);
+        // await BalanceItemService.flushCaches(organization.id);
         const balanceItemModels = await CachedBalance.balanceForObjects(organization.id, [request.params.id], request.params.type);
         const balanceItems = await BalanceItem.getStructureWithPayments(balanceItemModels);
         const payments = await AuthenticatedStructures.paymentsGeneral(paymentModels, false);

package/src/helpers/AdminPermissionChecker.ts

@@ -1,6 +1,6 @@
 import { AutoEncoderPatchType, PatchMap } from '@simonbackx/simple-encoding';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, CachedBalance, Document, Email, EmailTemplate, Event, EventNotification, Group, Member, MemberPlatformMembership, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from '@stamhoofd/models';
+import { BalanceItem, CachedBalance, Document, Email, EmailTemplate, Event, EventNotification, Group, Member, MemberPlatformMembership, MemberWithRegistrations, MemberWithUsers, MemberWithUsersAndRegistrations, MemberWithUsersRegistrationsAndGroups, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from '@stamhoofd/models';
 import { AccessRight, EmailTemplate as EmailTemplateStruct, EventPermissionChecker, FinancialSupportSettings, GroupCategory, GroupStatus, GroupType, MemberWithRegistrationsBlob, PermissionLevel, PermissionsResourceType, Platform as PlatformStruct, ReceivableBalanceType, RecordSettings, ResourcePermissions, UitpasNumberDetails, UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { MemberRecordStore } from '../services/MemberRecordStore.js';
@@ -16,7 +16,7 @@ export class AdminPermissionChecker {
     /**
      * The member that is linked to this user = is this user
      */
-    member: MemberWithRegistrations | null = null;
+    member: MemberWithUsersRegistrationsAndGroups | null = null;
     platform: PlatformStruct;
 
     organizationCache: Map<string, Organization | Promise<Organization | undefined>> = new Map();
@@ -361,7 +361,7 @@ export class AdminPermissionChecker {
         return await this.hasFullAccess(organizationId);
     }
 
-    async canAccessMember(member: MemberWithRegistrations, permissionLevel: PermissionLevel = PermissionLevel.Read) {
+    async canAccessMember(member: MemberWithUsersAndRegistrations, permissionLevel: PermissionLevel = PermissionLevel.Read) {
         if (permissionLevel !== PermissionLevel.Full && this.isUserManager(member)) {
             return true;
         }
@@ -407,7 +407,7 @@ export class AdminPermissionChecker {
      * The server will temporarily grant the user access to this member, and store this in the server
      * memory. This is required for adding new members to an organization (first add member -> then patch with registrations, which requires write access).
      */
-    async temporarilyGrantMemberAccess(member: MemberWithRegistrations, permissionLevel: PermissionLevel = PermissionLevel.Write) {
+    async temporarilyGrantMemberAccess(member: MemberWithUsersRegistrationsAndGroups, permissionLevel: PermissionLevel = PermissionLevel.Write) {
         console.log('Temporarily granting access to member', member.id, 'for user', this.user.id);
         addTemporaryMemberAccess(this.user.id, member.id, permissionLevel);
     }
@@ -415,11 +415,11 @@ export class AdminPermissionChecker {
     /**
      * Only full admins can delete members permanently
      */
-    async canDeleteMember(member: MemberWithRegistrations) {
+    async canDeleteMember(member: MemberWithUsersAndRegistrations) {
         if (member.registrations.length === 0 && this.isUserManager(member)) {
             const cachedBalance = await CachedBalance.getForObjects([member.id], null, ReceivableBalanceType.member);
             if (cachedBalance.length === 0 || (cachedBalance[0].amountOpen === 0 && cachedBalance[0].amountPending === 0)) {
-                const platformMemberships = await MemberPlatformMembership.where({ memberId: member.id });
+                const platformMemberships = await MemberPlatformMembership.select().where('memberId', member.id).fetch();
                 if (platformMemberships.length === 0) {
                     return true;
                 }
@@ -436,7 +436,7 @@ export class AdminPermissionChecker {
     /**
      * Note: only checks admin permissions. Users that 'own' this member can also access it but that does not use the AdminPermissionChecker
      */
-    async canAccessRegistration(registration: Registration, permissionLevel: PermissionLevel = PermissionLevel.Read, checkMember: boolean | MemberWithRegistrations = true) {
+    async canAccessRegistration(registration: Registration, permissionLevel: PermissionLevel = PermissionLevel.Read, checkMember: boolean | MemberWithUsersRegistrationsAndGroups = true) {
         if (registration.deactivatedAt || !registration.registeredAt) {
             if (!checkMember) {
                 // We can't grant access to a member because of a deactivated registration
@@ -840,7 +840,7 @@ export class AdminPermissionChecker {
         return false;
     }
 
-    async canLinkBalanceItemToMember(member: MemberWithRegistrations) {
+    async canLinkBalanceItemToMember(member: MemberWithUsersAndRegistrations) {
         if (!this.checkScope(member.organizationId)) {
             return false;
         }
@@ -928,8 +928,11 @@ export class AdminPermissionChecker {
         return this.hasFullAccess(organizationId);
     }
 
-    async canAccessEmailBounces(organizationId: string) {
-        return this.hasSomeAccess(organizationId);
+    async canAccessEmailBounces(organizationId: string | null) {
+        if (organizationId) {
+            return this.hasSomeAccess(organizationId);
+        }
+        return this.hasPlatformFullAccess();
     }
 
     async canSendEmails(organizationId: Organization | string | null) {
@@ -1105,14 +1108,14 @@ export class AdminPermissionChecker {
         return !!organizationPermissions && organizationPermissions.hasAccess(level);
     }
 
-    isUserManager(member: MemberWithRegistrations) {
+    isUserManager(member: MemberWithUsers) {
         return !!member.users.find(u => u.id === this.user.id);
     }
 
     /**
      * Return a list of RecordSettings the current user can view or edit
      */
-    async hasFinancialMemberAccess(member: MemberWithRegistrations, level: PermissionLevel = PermissionLevel.Read, organizationId?: string): Promise<boolean> {
+    async hasFinancialMemberAccess(member: MemberWithUsersAndRegistrations, level: PermissionLevel = PermissionLevel.Read, organizationId?: string): Promise<boolean> {
         const isUserManager = this.isUserManager(member);
 
         if (isUserManager && level === PermissionLevel.Read) {
@@ -1197,7 +1200,7 @@ export class AdminPermissionChecker {
     /**
      * Return a list of RecordSettings the current user can view or edit
      */
-    async hasNRNAccess(member: MemberWithRegistrations, level: PermissionLevel = PermissionLevel.Read): Promise<boolean> {
+    async hasNRNAccess(member: MemberWithUsersAndRegistrations, level: PermissionLevel = PermissionLevel.Read): Promise<boolean> {
         const isUserManager = this.isUserManager(member);
 
         if (isUserManager) {
@@ -1319,7 +1322,7 @@ export class AdminPermissionChecker {
         };
     }
 
-    async checkRecordAccess(member: MemberWithRegistrations, recordId: string, level: PermissionLevel = PermissionLevel.Read): Promise<{ canAccess: false; record: RecordSettings | null } | { canAccess: true; record: RecordSettings }> {
+    async checkRecordAccess(member: MemberWithUsersRegistrationsAndGroups, recordId: string, level: PermissionLevel = PermissionLevel.Read): Promise<{ canAccess: false; record: RecordSettings | null } | { canAccess: true; record: RecordSettings }> {
         const record = await MemberRecordStore.getRecord(recordId);
         if (!record) {
             return {
@@ -1452,7 +1455,7 @@ export class AdminPermissionChecker {
     /**
      * Changes data inline
      */
-    async filterMemberData(member: MemberWithRegistrations, data: MemberWithRegistrationsBlob, options?: { forAdminCartCalculation?: boolean }): Promise<MemberWithRegistrationsBlob> {
+    async filterMemberData(member: MemberWithUsersRegistrationsAndGroups, data: MemberWithRegistrationsBlob, options?: { forAdminCartCalculation?: boolean }): Promise<MemberWithRegistrationsBlob> {
         const cloned = data.clone();
 
         for (const [key, value] of cloned.details.recordAnswers.entries()) {
@@ -1511,7 +1514,7 @@ export class AdminPermissionChecker {
     /**
      * Only for creating new members
      */
-    filterMemberPut(member: MemberWithRegistrations, data: MemberWithRegistrationsBlob, options: { asUserManager: boolean }) {
+    filterMemberPut(member: MemberWithUsersRegistrationsAndGroups, data: MemberWithRegistrationsBlob, options: { asUserManager: boolean }) {
         if (options.asUserManager || STAMHOOFD.userMode === 'platform') {
             // A user manager cannot choose the member number + in platform mode, nobody can choose the member number
             data.details.memberNumber = null;
@@ -1526,7 +1529,7 @@ export class AdminPermissionChecker {
         }
     }
 
-    async filterMemberPatch(member: MemberWithRegistrations, data: AutoEncoderPatchType<MemberWithRegistrationsBlob>): Promise<AutoEncoderPatchType<MemberWithRegistrationsBlob>> {
+    async filterMemberPatch(member: MemberWithUsersRegistrationsAndGroups, data: AutoEncoderPatchType<MemberWithRegistrationsBlob>): Promise<AutoEncoderPatchType<MemberWithRegistrationsBlob>> {
         if (!data.details) {
             return data;
         }