@stamhoofd/backend 2.143.1 → 2.145.0

package/src/services/SettlementService.ts

@@ -6,7 +6,8 @@ import { ApplicationFee } from '@stamhoofd/models/models/ApplicationFee.js';
 import { PaymentSettlement } from '@stamhoofd/models/models/PaymentSettlement.js';
 import { Settlement } from '@stamhoofd/models/models/Settlement.js';
 import { SettlementCharge } from '@stamhoofd/models/models/SettlementCharge.js';
-import { AbortSignal, QueueHandler } from '@stamhoofd/queues';
+import type { AbortSignal } from '@stamhoofd/queues';
+import { QueueHandler } from '@stamhoofd/queues';
 import { SQL } from '@stamhoofd/sql';
 import type { PaymentProvider } from '@stamhoofd/structures';
 import { PaymentMethod, SettlementReference } from '@stamhoofd/structures';
@@ -67,44 +68,6 @@ const CHARGE_UPDATE_BATCH_SIZE = 500;
  */
 const FEE_BATCH_SIZE = 500;
 
-/**
- * Collects which rows the provider still reports in a settlement while a sync walks it. A stored
- * row of the settlement that is not in here after the walk has moved or disappeared at the
- * provider, and gets swept.
- */
-export class ReportedRows {
-    readonly paymentLineExternalIds = new Set<string>();
-    readonly chargeExternalIds = new Set<string>();
-    readonly applicationFeeIds = new Set<string>();
-
-    paymentLine(line: PaymentSettlement) {
-        if (line.externalId === null) {
-            return;
-        }
-        this.paymentLineExternalIds.add(line.externalId);
-    }
-
-    charge(charge: SettlementCharge) {
-        this.chargeExternalIds.add(charge.externalId);
-    }
-
-    charges(charges: SettlementCharge[]) {
-        for (const charge of charges) {
-            this.charge(charge);
-        }
-    }
-
-    applicationFee(fee: ApplicationFee) {
-        this.applicationFeeIds.add(fee.id);
-    }
-
-    applicationFees(fees: ApplicationFee[]) {
-        for (const fee of fees) {
-            this.applicationFee(fee);
-        }
-    }
-}
-
 /**
  * All writes to the settlements tables go through this service. Every write is an upsert on the
  * deterministic unique key of its table, so re-running a sync can never duplicate rows.
@@ -317,77 +280,6 @@ export class SettlementService {
         }
     }
 
-    /**
-     * After a complete walk of a settlement: remove rows the provider no longer reports in this
-     * settlement (a transaction can move to another payout). Rows that only exist because of the
-     * payout are deleted; rows that outlive the payout link are only unlinked: derived fee lines
-     * (owned by updatePaymentSettlementsForAccountDeductionPayment), deduction charges referenced
-     * by an application fee, and the application fee rows themselves.
-     *
-     * Returns the fees unlinked from this settlement, so the caller can refresh the derived lines
-     * of their fee payments.
-     */
-    static async sweepSettlement(settlement: Settlement, reported: ReportedRows): Promise<{ unlinkedFees: ApplicationFee[] }> {
-        const lines = await PaymentSettlement.select()
-            .where('settlementId', settlement.id)
-            .fetch();
-
-        const sweptPaymentIds = new Set<string>();
-        for (const line of lines) {
-            if (line.externalId === null) {
-                continue;
-            }
-            if (!reported.paymentLineExternalIds.has(line.externalId)) {
-                await line.delete();
-                sweptPaymentIds.add(line.paymentId);
-            }
-        }
-
-        // The legacy blob points at one of the lines, so a payment that lost one has to be
-        // repointed at what is left
-        if (sweptPaymentIds.size > 0) {
-            const payments = await PaymentModel.getByIDs(...sweptPaymentIds);
-            for (const payment of payments) {
-                await this.updateLegacySettlementReference(payment);
-            }
-        }
-
-        const charges = await SettlementCharge.select()
-            .where('settlementId', settlement.id)
-            .fetch();
-
-        const unreportedCharges = charges.filter(charge => !reported.chargeExternalIds.has(charge.externalId));
-        const referencedChargeIds = unreportedCharges.length > 0
-            ? new Set((await ApplicationFee.select()
-                    .where('settlementChargeId', unreportedCharges.map(c => c.id))
-                    .fetch()).map(fee => fee.settlementChargeId))
-            : new Set<string>();
-
-        for (const charge of unreportedCharges) {
-            if (referencedChargeIds.has(charge.id)) {
-                charge.settlementId = null;
-                await charge.save();
-            } else {
-                await charge.delete();
-            }
-        }
-
-        const fees = await ApplicationFee.select()
-            .where('settlementId', settlement.id)
-            .fetch();
-
-        const unlinkedFees: ApplicationFee[] = [];
-        for (const fee of fees) {
-            if (!reported.applicationFeeIds.has(fee.id)) {
-                fee.settlementId = null;
-                await fee.save();
-                unlinkedFees.push(fee);
-            }
-        }
-
-        return { unlinkedFees };
-    }
-
     /**
      * Recomputes the cached reconciliation columns from the stored rows: `unexplainedAmount` should
      * be 0 — a non-zero value is a real question to answer — and `pendingFees` holds what is
@@ -500,7 +392,7 @@ export class SettlementService {
      * payout that contains fees billed by this payment, amount = the sum of those fees. When the
      * total of the lines matches the payment's price, the payment is completely paid out.
      */
-    static async updatePaymentSettlementsForAccountDeductionPayment(payment: Payment): Promise<void> {
+    static async updatePaymentSettlementsForApplicationFeePayment(payment: Payment): Promise<void> {
         if (payment.method !== PaymentMethod.AccountDeductions) {
             return;
         }
@@ -567,7 +459,7 @@ export class SettlementService {
      * Refreshes the derived lines of every fee payment that billed one of these balance items:
      * called after a walk linked or unlinked invoiced fees, so the lines follow the fees.
      */
-    static async updatePaymentSettlementsForAccountDeductionBalanceItems(balanceItemIds: string[]): Promise<void> {
+    static async updatePaymentSettlementsForApplicationFeeBalanceItems(balanceItemIds: string[]): Promise<void> {
         if (balanceItemIds.length === 0) {
             return;
         }
@@ -582,7 +474,7 @@ export class SettlementService {
 
         const payments = await PaymentModel.getByIDs(...paymentIds);
         for (const payment of payments) {
-            await this.updatePaymentSettlementsForAccountDeductionPayment(payment);
+            await this.updatePaymentSettlementsForApplicationFeePayment(payment);
         }
     }
 

package/src/services/WebshopCrowdfundingService.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 { BalanceItem, BalanceItemFactory, BalanceItemPayment, Order, OrderFactory, OrganizationFactory, Payment, Token, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, StripeAccount, Token } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemFactory, BalanceItemPayment, Order, OrderFactory, OrganizationFactory, Payment, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
 import type { OrderResponse } from '@stamhoofd/structures';
 import { BalanceItemStatus, Cart, CartItem, Customer, OrderData, OrderStatus, PaymentConfiguration, PaymentMethod, PaymentStatus, PermissionLevel, Permissions, PrivateOrder, PrivatePaymentConfiguration, PrivateWebshop, Product, ProductPrice, TransferSettings, WebshopCrowdfunding, WebshopMetaData, WebshopPrivateMetaData } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
+import { SessionService } from './SessionService.js';
 
 import type { StripeObject } from '../../tests/helpers/StripeMocker.js';
 import { StripeMocker } from '../../tests/helpers/StripeMocker.js';
@@ -234,7 +235,7 @@ describe('WebshopCrowdfundingService', () => {
                     level: PermissionLevel.Full,
                 }),
             }).create();
-            token = await Token.createToken(user);
+            token = await SessionService.createSession(user);
         });
 
         afterAll(() => {

package/src/sql-filters/balance-items.ts

@@ -99,6 +99,16 @@ export const balanceItemFilterCompilers: SQLFilterDefinitions = {
         type: SQLValueType.String,
         nullable: true,
     }),
+    orderId: createColumnFilter({
+        expression: SQL.column('balance_items', 'orderId'),
+        type: SQLValueType.String,
+        nullable: true,
+    }),
+    registrationId: createColumnFilter({
+        expression: SQL.column('balance_items', 'registrationId'),
+        type: SQLValueType.String,
+        nullable: true,
+    }),
     type: createColumnFilter({
         expression: SQL.column('balance_items', 'type'),
         type: SQLValueType.String,

package/src/sql-filters/registrations.ts

@@ -1,6 +1,6 @@
 import { Group, Member, Organization, Registration } from '@stamhoofd/models';
 import type { SQLFilterDefinitions } from '@stamhoofd/sql';
-import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, SQL, SQLValueType } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createJoinedRelationFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';
 import { baseRegistrationFilterCompilers } from './base-registration-filter-compilers.js';
 import { memberFilterCompilers } from './members.js';
@@ -55,6 +55,64 @@ export const registrationFilterCompilers: SQLFilterDefinitions = {
             }),
         },
     ),
+    /**
+     * There is a bug in MySQL 8 that is fixed in 9.3
+     * where EXISTS (select * from json_table(...)) does not work
+     * To fix this, we do a double select with join inside the select
+     * It is a bit slower, but it works for now.
+     */
+    options: createExistsFilter(
+        SQL.select()
+            .from(SQL.table('registrations', 'innerRegistrations'))
+            .join(
+                SQL.join(
+                    SQL.jsonTable(
+                        SQL.jsonExtract(SQL.column('innerRegistrations', 'options'), '$.value'),
+                        'options',
+                    )
+                        .addColumn(
+                            'amount',
+                            'INT',
+                            '$.amount',
+                        )
+                        .addColumn(
+                            'optionId',
+                            'TEXT',
+                            '$.option.id',
+                        )
+                        .addColumn(
+                            'optionMenuId',
+                            'TEXT',
+                            '$.optionMenu.id',
+                        ),
+                ),
+            )
+            .where(SQL.column('innerRegistrations', 'id'), SQL.column('registrations', 'id')),
+        {
+            ...baseSQLFilterCompilers,
+            amount: createColumnFilter({
+                expression: SQL.column('options', 'amount'),
+                type: SQLValueType.Number,
+                nullable: false,
+            }),
+            option: {
+                ...baseSQLFilterCompilers,
+                id: createColumnFilter({
+                    expression: SQL.column('options', 'optionId'),
+                    type: SQLValueType.String,
+                    nullable: false,
+                }),
+            },
+            optionMenu: {
+                ...baseSQLFilterCompilers,
+                id: createColumnFilter({
+                    expression: SQL.column('options', 'optionMenuId'),
+                    type: SQLValueType.String,
+                    nullable: false,
+                }),
+            },
+        },
+    ),
     organization: createJoinedRelationFilter(
         organizationJoin,
         organizationFilterCompilers,

package/tests/actions/patchUserMember.ts

@@ -6,11 +6,12 @@ import { Token } from '@stamhoofd/models';
 import type { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 export async function patchUserMember({ patch, organization, user }: { patch: AutoEncoderPatchType<MemberWithRegistrationsBlob>; organization: Organization; user: User }) {
     expect(patch.id).toEqual(expect.any(String));
 
-    const token = await Token.createToken(user);
+    const token = await SessionService.createSession(user);
 
     const arr = new PatchableArray();
     arr.addPatch(patch);

package/tests/e2e/api-rate-limits.test.ts

@@ -1,6 +1,7 @@
 import { Request } from '@simonbackx/simple-endpoints';
 import type { Organization } from '@stamhoofd/models';
 import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
+import { SessionService } from '../../src/services/SessionService.js';
 
 import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
@@ -29,7 +30,7 @@ describe('E2E.APIRateLimits', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user, new Date());
+        const token = await SessionService.createSession(user, { authenticatedAt: new Date() });
 
         const createRequest = Request.buildJson('POST', '/api-keys', organization.getApiHost(), ApiUser.create({
             permissions: UserPermissions.create({

package/tests/e2e/bundle-discounts.test.ts

@@ -1,6 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { BalanceItem, Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { BalanceItem, Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { AccessRight, AppliedRegistrationDiscount, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BooleanStatus, GroupPriceDiscount, GroupPriceDiscountType, IDRegisterCart, IDRegisterCheckout, IDRegisterItem, PaymentMethod, PermissionLevel, Permissions, PermissionsResourceType, ReduceablePrice, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { RegisterMembersEndpoint } from '../../src/endpoints/global/registration/RegisterMembersEndpoint.js';
@@ -12,6 +12,7 @@ import { initBundleDiscount } from '../init/initBundleDiscount.js';
 import { initPermissionRole } from '../init/initPermissionRole.js';
 import { initStripe } from '../init/initStripe.js';
 import { initMembershipOrganization } from '../init/initMembershipOrganization.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 const baseUrl = `/members/register`;
 
@@ -64,7 +65,7 @@ describe('E2E.Bundle Discounts', () => {
             permissions: null,
         }).create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const member = await new MemberFactory({ organization, user })
             .create();

package/tests/e2e/charge-members.test.ts

@@ -1,12 +1,13 @@
 import { Request, Response } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import type { BalanceItemWithPayments, StamhoofdFilter } from '@stamhoofd/structures';
 import { AccessRight, ChargeRequest, LimitedFilteredRequest, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { ChargeMembersEndpoint } from '../../src/endpoints/admin/members/ChargeMembersEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
 import { GetReceivableBalanceEndpoint } from '../../src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 describe('E2E.ChargeMembers', () => {
     const chargeMembersEndpoint = new ChargeMembersEndpoint();
@@ -45,7 +46,7 @@ describe('E2E.ChargeMembers', () => {
         })
             .create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         return { organization, user, token };
     };
@@ -148,7 +149,7 @@ describe('E2E.ChargeMembers', () => {
         for (const userFactory of testUserFactories) {
             const user = await userFactory.create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             await expect(postCharge(filter, organization, body, token))
                 .rejects
@@ -234,7 +235,7 @@ describe('E2E.ChargeMembers', () => {
         })
             .create();
 
-        const otherFinancialDirectorToken = await Token.createToken(otherFinancialDirector);
+        const otherFinancialDirectorToken = await SessionService.createSession(otherFinancialDirector);
 
         const body = ChargeRequest.create({
             description: 'test description',

package/tests/e2e/documents.test.ts

@@ -1,6 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Group, Member, Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { Document, DocumentTemplateFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Group, Member, Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { Document, DocumentTemplateFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { IDRegisterCart, IDRegisterCheckout, IDRegisterItem, MemberDetails, MemberWithRegistrationsBlob, PaymentMethod } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { Formatter } from '@stamhoofd/utility';
@@ -14,6 +14,7 @@ import { initStripe } from '../init/initStripe.js';
 import { registrationUpdateQueue } from '../../src/services/BalanceItemService.js';
 import { DocumentRenderService } from '../../src/services/DocumentRenderService.js';
 import { initMembershipOrganization } from '../init/initMembershipOrganization.js';
+import { SessionService } from '../../src/services/SessionService.js';
 
 const baseUrl = `/members/register`;
 
@@ -73,7 +74,7 @@ describe('E2E.Documents', () => {
             permissions: null,
         }).create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const member = await new MemberFactory({ organization, user })
             .create();

package/tests/e2e/private-files.test.ts

@@ -1,4 +1,5 @@
 import { File, MemberDetails, MemberWithRegistrationsBlob, RecordCategory, RecordFileAnswer, RecordSettings, RecordType, TranslatedString, Version } from '@stamhoofd/structures';
+import { SessionService } from '../../src/services/SessionService.js';
 
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { encodeObject, EncodeMedium, PatchableArray } from '@simonbackx/simple-encoding';
@@ -48,7 +49,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -91,7 +92,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -135,7 +136,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -197,7 +198,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Public files are not signed, so a malicious user can put anything in them. The url of a file ends up
         // in a link (and in the source of an image), so a javascript: url would run on our own domain.
@@ -260,7 +261,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -324,7 +325,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -404,7 +405,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({
@@ -662,7 +663,7 @@ describe('E2E.PrivateFiles', () => {
                 level: PermissionLevel.Full,
             }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         // Create a user member
         const member = MemberWithRegistrationsBlob.create({

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',