@stamhoofd/backend 2.144.0 → 2.145.0

package/tests/e2e/register.test.ts

@@ -1,6 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriod, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriod, Platform, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { AdministrationFeeSettings, BalanceItemCartItem, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BooleanStatus, DefaultAgeGroup, FreeContributionSettings, GroupOption, GroupOptionMenu, IDRegisterCart, IDRegisterCheckout, IDRegisterItem, PaymentMethod, PermissionLevel, Permissions, PlatformMembershipType, PlatformMembershipTypeConfig, ReceivableBalanceType, ReduceablePrice, RegisterItemOption, TranslatedString, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { v4 as uuidv4 } from 'uuid';
@@ -11,6 +11,7 @@ import { BalanceItemService } from '../../src/services/BalanceItemService.js';
 import { PlatformMembershipService } from '../../src/services/PlatformMembershipService.js';
 import { assertBalances } from '../assertions/assertBalances.js';
 import { testServer } from '../helpers/TestServer.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 describe('E2E.Register', () => {
     const registerEndpoint = new RegisterMembersEndpoint();
@@ -74,7 +75,7 @@ describe('E2E.Register', () => {
         })
             .create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const member = await new MemberFactory({ organization, user }).create();
 

package/tests/e2e/stock.test.ts

@@ -1,11 +1,12 @@
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, StripeAccount } from '@stamhoofd/models';
-import { Order, OrganizationFactory, Token, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, StripeAccount, Token } from '@stamhoofd/models';
+import { Order, OrganizationFactory, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
 import { Address, Cart, CartItem, CartItemOption, CartReservedSeat, Customer, Option, OptionMenu, OrderData, OrderStatus, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivateOrder, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, ReservedSeat, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, ValidatedAddress, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
 import { Country } from '@stamhoofd/types/Country';
 import { v4 as uuidv4 } from 'uuid';
+import { SessionService } from '../../src/services/SessionService.js';
 
 import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.js';
 import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint.js';
@@ -253,7 +254,7 @@ describe('E2E.Stock', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        token = await Token.createToken(user);
+        token = await SessionService.createSession(user);
 
         await initMembershipOrganization();
     });

package/tests/e2e/tickets.test.ts

@@ -1,9 +1,10 @@
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, StripeAccount, Webshop } from '@stamhoofd/models';
-import { OrganizationFactory, Ticket, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, StripeAccount, Webshop, Token } from '@stamhoofd/models';
+import { OrganizationFactory, Ticket, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { Cart, CartItem, CartReservedSeat, Customer, OrderData, OrderStatus, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivateOrder, PrivatePaymentConfiguration, Product, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopMetaData, WebshopPrivateMetaData, WebshopTicketType } from '@stamhoofd/structures';
+import { SessionService } from '../../src/services/SessionService.js';
 
 import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.js';
 import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint.js';
@@ -66,7 +67,7 @@ describe('E2E.Tickets', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        token = await Token.createToken(user);
+        token = await SessionService.createSession(user);
     });
 
     afterAll(() => {

package/tests/helpers/ExportSlice.ts

@@ -6,6 +6,7 @@ import { ExcelExportType, LimitedFilteredRequest, SortItemDirection } from '@sta
 import { ExportToExcelEndpoint } from '../../src/endpoints/global/files/ExportToExcelEndpoint.js';
 import { Context } from '../../src/helpers/Context.js';
 import { testServer } from './TestServer.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 // Registers the balance item payment export, which is what a row that holds a part of its objects is
 // written out with
@@ -56,7 +57,7 @@ class ExportSliceEndpoint extends Endpoint<Record<string, never>, undefined, und
  * How many balance item payments a filter selects, and what they are worth together.
  */
 export async function exportSlice({ organization, user, filter, search = null }: { organization: Organization; user: User; filter: StamhoofdFilter; search?: string | null }) {
-    const token = await Token.createToken(user);
+    const token = await SessionService.createSession(user);
 
     const request = Request.get({
         path: '/exports/balance-item-payments',

package/tests/helpers/MollieMocker.ts

@@ -25,6 +25,9 @@ export type MollieMockPayment = {
     mandateId: string | null;
     isCancelable: boolean;
     details: Record<string, unknown> | null;
+    description?: string;
+    profileId?: string | null;
+    createdAt?: string;
 };
 
 export type MollieMockMandate = {
@@ -83,9 +86,7 @@ const MOLLIE_CHECKOUT_URL = 'https://molliecheckout/';
 /**
  * Mirrors the StripeMocker (tests/helpers/StripeMocker.ts) but for Mollie.
  *
- * The Mollie node client (@mollie/api-client v4) performs its HTTP requests through node-fetch v2,
- * which uses Node's http/https module under the hood. nock can therefore intercept every call to
- * https://api.mollie.com - exactly like the StripeMocker does for Stripe.
+ * The Mollie client sends every API call to https://api.mollie.com, which nock intercepts here.
  *
  * Usage:
  *   const mollieMocker = new MollieMocker();
@@ -117,6 +118,23 @@ export class MollieMocker {
 
     #forceFailure = false;
 
+    // The SDK validates responses with zod: these links are required on most resources
+    #dashboardLink = { href: 'https://www.mollie.com/dashboard', type: 'text/html' };
+    #documentationLink = { href: 'https://docs.mollie.com', type: 'text/html' };
+
+    /**
+     * A Mollie error body, complete enough for the SDK to parse it as an ErrorResponse.
+     */
+    #errorBody(status: number, title: string, detail: string, field?: string) {
+        return {
+            status,
+            title,
+            detail,
+            field,
+            _links: { documentation: this.#documentationLink },
+        };
+    }
+
     reset() {
         this.payments = [];
         this.customers = [];
@@ -168,15 +186,18 @@ export class MollieMocker {
         const interceptor = nock('https://api.mollie.com').persist();
 
         interceptor.get(matcher).reply((uri) => {
-            return this.#handle('GET', uri, undefined);
+            const [status, body] = this.#handle('GET', uri, undefined);
+            return [status, body, { 'content-type': 'application/hal+json' }];
         });
 
         interceptor.post(matcher).reply((uri, body) => {
-            return this.#handle('POST', uri, body);
+            const [status, responseBody] = this.#handle('POST', uri, body);
+            return [status, responseBody, { 'content-type': 'application/hal+json' }];
         });
 
         interceptor.delete(matcher).reply((uri, body) => {
-            return this.#handle('DELETE', uri, body);
+            const [status, responseBody] = this.#handle('DELETE', uri, body);
+            return [status, responseBody, { 'content-type': 'application/hal+json' }];
         });
     }
 
@@ -244,6 +265,10 @@ export class MollieMocker {
             return [200, this.#onboarding()];
         }
 
+        if (parts[0] === 'onboarding' && method === 'POST') {
+            return [204];
+        }
+
         if (parts[0] === 'chargebacks' && method === 'GET') {
             return this.#listResource('chargebacks', this.chargebacks.map(c => this.#chargebackResource(c)));
         }
@@ -294,6 +319,9 @@ export class MollieMocker {
             mandateId: body.mandateId ?? null,
             isCancelable: true,
             details: null,
+            description: body.description ?? '',
+            profileId: body.profileId ?? null,
+            createdAt: new Date().toISOString(),
         };
         this.payments.push(payment);
         return [201, this.#paymentResource(payment)];
@@ -302,7 +330,7 @@ export class MollieMocker {
     #getPayment(id: string): [number, unknown] {
         const payment = this.payments.find(p => p.id === id);
         if (!payment) {
-            return [404, { detail: 'Payment not found' }];
+            return [404, this.#errorBody(404, 'Not Found', 'No payment exists with token ' + id)];
         }
         return [200, this.#paymentResource(payment)];
     }
@@ -310,7 +338,7 @@ export class MollieMocker {
     #cancelPayment(id: string): [number, unknown] {
         const payment = this.payments.find(p => p.id === id);
         if (!payment) {
-            return [404, { detail: 'Payment not found' }];
+            return [404, this.#errorBody(404, 'Not Found', 'No payment exists with token ' + id)];
         }
         payment.status = 'canceled';
         return [200, this.#paymentResource(payment)];
@@ -329,9 +357,14 @@ export class MollieMocker {
             mandateId: payment.mandateId ?? undefined,
             details: payment.details ?? undefined,
             metadata: payment.internalPaymentId ? { paymentId: payment.internalPaymentId } : undefined,
+            description: payment.description ?? '',
+            profileId: payment.profileId ?? 'pfl_test',
+            createdAt: payment.createdAt ?? new Date().toISOString(),
             _links: {
                 self: { href: 'https://api.mollie.com/v2/payments/' + payment.id, type: 'application/hal+json' },
                 checkout: { href: MOLLIE_CHECKOUT_URL, type: 'text/html' },
+                dashboard: this.#dashboardLink,
+                documentation: this.#documentationLink,
             },
         };
     }
@@ -358,9 +391,15 @@ export class MollieMocker {
             id,
             mode: 'test',
             name: body.name ?? 'Test',
-            email: body.email ?? undefined,
-            metadata: body.metadata ?? undefined,
-            _links: { self: { href: 'https://api.mollie.com/v2/customers/' + id, type: 'application/hal+json' } },
+            email: body.email ?? null,
+            locale: null,
+            metadata: body.metadata ?? null,
+            createdAt: new Date().toISOString(),
+            _links: {
+                self: { href: 'https://api.mollie.com/v2/customers/' + id, type: 'application/hal+json' },
+                dashboard: this.#dashboardLink,
+                documentation: this.#documentationLink,
+            },
         };
     }
 
@@ -406,8 +445,14 @@ export class MollieMocker {
             method: mandate.method,
             details: mandate.details,
             customerId: mandate.customerId,
+            mandateReference: null,
+            signatureDate: mandate.createdAt.substring(0, 10),
             createdAt: mandate.createdAt,
-            _links: { self: { href: 'https://api.mollie.com/v2/customers/' + mandate.customerId + '/mandates/' + mandate.id, type: 'application/hal+json' } },
+            _links: {
+                self: { href: 'https://api.mollie.com/v2/customers/' + mandate.customerId + '/mandates/' + mandate.id, type: 'application/hal+json' },
+                customer: { href: 'https://api.mollie.com/v2/customers/' + mandate.customerId, type: 'application/hal+json' },
+                documentation: this.#documentationLink,
+            },
         };
     }
 
@@ -421,8 +466,16 @@ export class MollieMocker {
             mode: 'test',
             name: 'Stamhoofd',
             website: 'https://www.stamhoofd.be',
+            email: 'hallo@stamhoofd.be',
+            phone: '+32499999999',
+            businessCategory: 'SOCIAL_ASSOCIATIONS',
             status: 'verified',
-            _links: { self: { href: 'https://api.mollie.com/v2/profiles/' + id, type: 'application/hal+json' } },
+            createdAt: new Date().toISOString(),
+            _links: {
+                self: { href: 'https://api.mollie.com/v2/profiles/' + id, type: 'application/hal+json' },
+                dashboard: this.#dashboardLink,
+                documentation: this.#documentationLink,
+            },
         };
     }
 
@@ -433,6 +486,7 @@ export class MollieMocker {
             status: 'completed',
             canReceivePayments: true,
             canReceiveSettlements: true,
+            signedUpAt: new Date().toISOString(),
             _links: { self: { href: 'https://api.mollie.com/v2/onboarding/me', type: 'application/hal+json' } },
         };
     }
@@ -461,7 +515,11 @@ export class MollieMocker {
             amount: chargeback.amount,
             paymentId: chargeback.paymentId,
             createdAt: chargeback.createdAt,
-            _links: { self: { href: 'https://api.mollie.com/v2/payments/' + chargeback.paymentId + '/chargebacks/' + chargeback.id, type: 'application/hal+json' } },
+            _links: {
+                self: { href: 'https://api.mollie.com/v2/payments/' + chargeback.paymentId + '/chargebacks/' + chargeback.id, type: 'application/hal+json' },
+                payment: { href: 'https://api.mollie.com/v2/payments/' + chargeback.paymentId, type: 'application/hal+json' },
+                documentation: this.#documentationLink,
+            },
         };
     }
 
@@ -484,20 +542,20 @@ export class MollieMocker {
     #createRefund(paymentId: string, body: Record<string, any>): [number, unknown] {
         const payment = this.payments.find(p => p.id === paymentId);
         if (!payment) {
-            return [404, { status: 404, title: 'Not Found', detail: 'No payment exists with token ' + paymentId }];
+            return [404, this.#errorBody(404, 'Not Found', 'No payment exists with token ' + paymentId)];
         }
 
         if (payment.status !== 'paid') {
-            return [422, { status: 422, title: 'Unprocessable Entity', detail: 'The payment is not paid; you can only refund paid payments' }];
+            return [422, this.#errorBody(422, 'Unprocessable Entity', 'The payment is not paid; you can only refund paid payments')];
         }
 
         const value = parseFloat(String(body.amount?.value ?? '0'));
         if (!(value > 0)) {
-            return [422, { status: 422, title: 'Unprocessable Entity', detail: 'The amount is invalid', field: 'amount' }];
+            return [422, this.#errorBody(422, 'Unprocessable Entity', 'The amount is invalid', 'amount')];
         }
 
         if (value > this.getRemainingAmount(payment) + 0.000001) {
-            return [422, { status: 422, title: 'Unprocessable Entity', detail: 'The amount is higher than the remaining payment amount', field: 'amount' }];
+            return [422, this.#errorBody(422, 'Unprocessable Entity', 'The amount is higher than the remaining payment amount', 'amount')];
         }
 
         const refund: MollieMockRefund = {
@@ -516,7 +574,7 @@ export class MollieMocker {
     #getRefund(paymentId: string, refundId: string): [number, unknown] {
         const refund = this.refunds.find(r => r.id === refundId && r.paymentId === paymentId);
         if (!refund) {
-            return [404, { status: 404, title: 'Not Found', detail: 'No refund exists with token ' + refundId }];
+            return [404, this.#errorBody(404, 'Not Found', 'No refund exists with token ' + refundId)];
         }
         return [200, this.#refundResource(refund)];
     }
@@ -574,8 +632,12 @@ export class MollieMocker {
             description: refund.description,
             paymentId: refund.paymentId,
             createdAt: refund.createdAt,
-            metadata: refund.metadata ?? undefined,
-            _links: { self: { href: 'https://api.mollie.com/v2/payments/' + refund.paymentId + '/refunds/' + refund.id, type: 'application/hal+json' } },
+            metadata: refund.metadata ?? null,
+            _links: {
+                self: { href: 'https://api.mollie.com/v2/payments/' + refund.paymentId + '/refunds/' + refund.id, type: 'application/hal+json' },
+                payment: { href: 'https://api.mollie.com/v2/payments/' + refund.paymentId, type: 'application/hal+json' },
+                documentation: this.#documentationLink,
+            },
         };
     }
 
@@ -626,7 +688,7 @@ export class MollieMocker {
         const from = query.get('from');
         const startIndex = from ? sorted.findIndex(s => s.id === from) : 0;
         if (startIndex === -1) {
-            return [404, { status: 404, title: 'Not Found', detail: 'No settlement exists with token ' + from }];
+            return [404, this.#errorBody(404, 'Not Found', 'No settlement exists with token ' + from)];
         }
 
         const page = sorted.slice(startIndex, startIndex + limit);
@@ -693,7 +755,7 @@ export class MollieMocker {
         const from = query.get('from');
         const startIndex = from ? sorted.findIndex(t => t.id === from) : 0;
         if (startIndex === -1) {
-            return [404, { status: 404, title: 'Not Found', detail: 'No balance transaction exists with token ' + from }];
+            return [404, this.#errorBody(404, 'Not Found', 'No balance transaction exists with token ' + from)];
         }
 
         const page = sorted.slice(startIndex, startIndex + limit);

package/tests/init/initAdmin.ts

@@ -3,6 +3,7 @@ import { Token, UserFactory } from '@stamhoofd/models';
 import type { AccessRight } from '@stamhoofd/structures';
 import { PermissionLevel, PermissionRole, Permissions } from '@stamhoofd/structures';
 import { initPermissionRole } from './initPermissionRole.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 /**
  * You cannot assign access rights directy to a user, but it can be done using roles. So when setting accessRights, a role wil be created and assigned to the user.
@@ -25,6 +26,6 @@ export async function initAdmin({ organization, permissions, accessRights }: { o
         permissions,
     }).create();
 
-    const adminToken = await Token.createToken(admin);
+    const adminToken = await SessionService.createSession(admin);
     return { admin, adminToken };
 }

package/tests/init/initPlatformAdmin.ts

@@ -1,5 +1,6 @@
 import { Token, UserFactory } from '@stamhoofd/models';
 import { PermissionLevel, Permissions } from '@stamhoofd/structures';
+import { SessionService } from '../../src/services/SessionService.js';
 
 export async function initPlatformAdmin() {
     const admin = await new UserFactory({
@@ -8,6 +9,6 @@ export async function initPlatformAdmin() {
         }),
     }).create();
 
-    const adminToken = await Token.createToken(admin);
+    const adminToken = await SessionService.createSession(admin);
     return { admin, adminToken };
 }