@stamhoofd/backend 2.143.1 → 2.145.0

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.test.ts

@@ -1,10 +1,11 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { GetEmailTemplatesEndpoint } from './GetEmailTemplatesEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 const baseUrl = `/v${Version}/email-templates`;
 
@@ -66,7 +67,7 @@ describe('Endpoint.GetEmailTemplatesEndpoint', () => {
         const organization = await new OrganizationFactory({ period }).create();
         const group = await new GroupFactory({ organization }).create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const template = new EmailTemplate();
         template.subject = 'test template 1';
@@ -99,7 +100,7 @@ describe('Endpoint.GetEmailTemplatesEndpoint', () => {
             }),
         }).create();
 
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const template = new EmailTemplate();
         template.subject = 'saved template';

package/src/endpoints/organization/dashboard/email-templates/PatchEmailTemplatesEndpoint.test.ts

@@ -1,14 +1,15 @@
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { EmailContent, EmailTemplate as EmailTemplateStruct, EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { Language } from '@stamhoofd/types/Language';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { v4 as uuidv4 } from 'uuid';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { PatchEmailTemplatesEndpoint } from './PatchEmailTemplatesEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 const baseUrl = `/v${Version}/email-templates`;
 
@@ -64,7 +65,7 @@ describe('Endpoint.PatchEmailTemplatesEndpoint', () => {
             const organization = await new OrganizationFactory({ period }).create();
             const group = await new GroupFactory({ organization }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const template = new EmailTemplate();
             template.subject = 'test template 1';
@@ -99,7 +100,7 @@ describe('Endpoint.PatchEmailTemplatesEndpoint', () => {
                     level: PermissionLevel.Full,
                 }),
             }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             return { organization, token };
         };
 

package/src/endpoints/organization/dashboard/invoices/GetInvoicesEndpoint.test.ts

@@ -6,6 +6,7 @@ import { LimitedFilteredRequest, PermissionLevel, Permissions } from '@stamhoofd
 import { STExpect } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { GetInvoicesEndpoint } from './GetInvoicesEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 describe('Endpoint.GetInvoicesEndpoint', () => {
     const endpoint = new GetInvoicesEndpoint();
@@ -38,7 +39,7 @@ describe('Endpoint.GetInvoicesEndpoint', () => {
     };
 
     const getInvoices = async ({ filter, organization, user }: { filter: StamhoofdFilter | null; organization: Organization; user: User }) => {
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const request = Request.get({
             path: '/invoices',

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.test.ts

@@ -8,6 +8,7 @@ import { PaymentMethod, PaymentStatus, PermissionLevel, Permissions } from '@sta
 import { STExpect } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { PatchInvoicesEndpoint } from './PatchInvoicesEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 describe('Endpoint.PatchInvoicesEndpoint', () => {
     const endpoint = new PatchInvoicesEndpoint();
@@ -56,7 +57,7 @@ describe('Endpoint.PatchInvoicesEndpoint', () => {
     };
 
     const patchInvoices = async ({ body, organization, user }: { body: PatchableArrayAutoEncoder<InvoiceStruct>; organization: Organization; user: User }) => {
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
         const request = Request.buildJson('PATCH', '/invoices', organization.getApiHost(), body);
         request.headers.authorization = 'Bearer ' + token.accessToken;
         return await testServer.test<InvoiceStruct[]>(endpoint, request);

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.ts

@@ -8,7 +8,6 @@ import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStruct
 import { Context } from '../../../../helpers/Context.js';
 import { Invoice } from '@stamhoofd/models';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { ViesHelper } from '../../../../helpers/ViesHelper.js';
 import { InvoiceService } from '../../../../services/InvoiceService.js';
 
 type Params = Record<string, never>;

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.test.ts

@@ -1,7 +1,8 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, User, Webshop } from '@stamhoofd/models';
-import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, User, Webshop, Token } from '@stamhoofd/models';
+import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { AccessRight, Address, Company, MemberResponsibility, OrganizationMetaData, OrganizationPrivateMetaData, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PeppolEndointId, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
+import { SessionService } from '../../../../services/SessionService.js';
 
 import type { AutoEncoderPatchType, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
@@ -29,7 +30,7 @@ describe('Endpoint.PatchOrganization', () => {
         const organization = await new OrganizationFactory({}).create();
         const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
         // const groups = await new GroupFactory({ organization }).createMultiple(2)
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const r = Request.buildJson('PATCH', '/v2/organization', organization.getApiHost(), {
             id: organization.id,
@@ -51,7 +52,7 @@ describe('Endpoint.PatchOrganization', () => {
     test("Can't change organization as a normal user", async () => {
         const organization = await new OrganizationFactory({}).create();
         const user = await new UserFactory({ organization }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const r = Request.buildJson('PATCH', '/organization', organization.getApiHost(), {
             id: organization.id,
@@ -65,7 +66,7 @@ describe('Endpoint.PatchOrganization', () => {
     test("Can't change organization as a user with read access", async () => {
         const organization = await new OrganizationFactory({}).create();
         const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Read }) }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const r = Request.buildJson('PATCH', '/organization', organization.getApiHost(), {
             id: organization.id,
@@ -169,7 +170,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                const token = await Token.createToken(user);
+                const token = await SessionService.createSession(user);
 
                 // act
                 const response = await patchOrganization({
@@ -275,7 +276,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                const token = await Token.createToken(user);
+                const token = await SessionService.createSession(user);
 
                 // act
                 const response = await patchOrganization({
@@ -336,7 +337,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                token = await Token.createToken(user);
+                token = await SessionService.createSession(user);
             });
 
             test('should throw if put roles', async () => {
@@ -687,7 +688,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                const userWithReadAccessToken = await Token.createToken(userWithReadAccess);
+                const userWithReadAccessToken = await SessionService.createSession(userWithReadAccess);
 
                 const userWithWriteAccess = await new UserFactory({
                     organization,
@@ -702,7 +703,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                const userWithWriteAccessToken = await Token.createToken(userWithReadAccess);
+                const userWithWriteAccessToken = await SessionService.createSession(userWithReadAccess);
 
                 const otherWebshop = await new WebshopFactory({ organizationId: organization.id }).create();
 
@@ -719,7 +720,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                const userWithFullAccessForOtherWebshopToken = await Token.createToken(userWithReadAccess);
+                const userWithFullAccessForOtherWebshopToken = await SessionService.createSession(userWithReadAccess);
 
                 usersWithoutFullAccess = [
                     { user: userWithReadAccess, token: userWithReadAccessToken },
@@ -1002,7 +1003,7 @@ describe('Endpoint.PatchOrganization', () => {
                 })
                     .create();
 
-                token = await Token.createToken(user);
+                token = await SessionService.createSession(user);
             });
 
             test('should not be able to put roles', async () => {
@@ -1299,7 +1300,7 @@ describe('Endpoint.PatchOrganization', () => {
                 .query({ participant: `iso6523-actorid-upis::${schemeID}:${id}` })
                 .reply(200, {
                     'total-result-count': 1,
-                    matches: [{
+                    'matches': [{
                         participantID: { scheme: 'iso6523-actorid-upis', value: `${schemeID}:${id}` },
                         entities: [{ name: [{ name: entityName }] }],
                     }],
@@ -1326,7 +1327,7 @@ describe('Endpoint.PatchOrganization', () => {
             const scope = mockDirectoryFound('0208', '0123456789');
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1354,7 +1355,7 @@ describe('Endpoint.PatchOrganization', () => {
             await organization.save();
 
             const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1375,7 +1376,7 @@ describe('Endpoint.PatchOrganization', () => {
             const scope = mockDirectoryFound('0088', '5412345000013');
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({ globalPermissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1404,7 +1405,7 @@ describe('Endpoint.PatchOrganization', () => {
             mockDirectoryFound('0088', '5412345000013', 'Directory Name');
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({ globalPermissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1425,7 +1426,7 @@ describe('Endpoint.PatchOrganization', () => {
         test('a KBO custom PEPPOL endpoint id that does not match the company number is rejected', async () => {
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({ globalPermissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1447,11 +1448,11 @@ describe('Endpoint.PatchOrganization', () => {
             nock('https://directory.peppol.eu')
                 .get('/search/1.0/json')
                 .query({ participant: 'iso6523-actorid-upis::0088:5412345000013' })
-                .reply(200, { 'total-result-count': 0, matches: [] } as nock.Body);
+                .reply(200, { 'total-result-count': 0, 'matches': [] } as nock.Body);
 
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({ globalPermissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch = OrganizationStruct.patch({
                 id: organization.id,
@@ -1483,7 +1484,7 @@ describe('Endpoint.PatchOrganization', () => {
             await organization.save();
 
             const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const newPeriod = await new RegistrationPeriodFactory({}).create();
 
@@ -1510,7 +1511,7 @@ describe('Endpoint.PatchOrganization', () => {
             await organization.save();
 
             const user = await new UserFactory({ organization, permissions: Permissions.create({ level: PermissionLevel.Full }) }).create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const otherOrganization = await new OrganizationFactory({ }).create();
             const newPeriod = await new RegistrationPeriodFactory({ organization: otherOrganization }).create();

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -15,7 +15,7 @@ import { MemberUserSyncer } from '../../../../helpers/MemberUserSyncer.js';
 import { RecordAnswerHelper } from '../../../../helpers/RecordAnswerHelper.js';
 import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater.js';
 import { TagHelper } from '../../../../helpers/TagHelper.js';
-import { ViesHelper } from '../../../../helpers/ViesHelper.js';
+import { ViesService } from '@stamhoofd/vies';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
 import { VATService } from '../../../../services/VATService.js';
 import { isAbortedError, isCanceledError } from '@stamhoofd/queues';
@@ -697,7 +697,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
                 // Changed VAT number
                 const prepatched = original.patch(patch);
-                await ViesHelper.checkCompany(prepatched, patch);
+                await ViesService.checkCompany(prepatched, patch);
             }
 
             let c = 0;
@@ -717,7 +717,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     this.requirePeppolPermission();
                 }
 
-                await ViesHelper.checkCompany(put, put);
+                await ViesService.checkCompany(put, null, { forceValidation: true });
             }
         } else {
             if (companies.length > 5) {
@@ -734,7 +734,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     this.requirePeppolPermission();
                 }
 
-                await ViesHelper.checkCompany(company, company);
+                await ViesService.checkCompany(company, null, { forceValidation: true });
             }
         }
     }

package/src/endpoints/organization/dashboard/payments/GetPaymentBreakdownEndpoint.test.ts

@@ -12,6 +12,7 @@ import { exportSlice } from '../../../../../tests/helpers/ExportSlice.js';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { GetPaymentEndpoint } from '../../shared/GetPaymentEndpoint.js';
 import { GetPaymentBreakdownEndpoint } from './GetPaymentBreakdownEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 /**
  * What was ordered: the name of the product, its unit price, how many, and optionally one chosen
@@ -23,7 +24,7 @@ describe('Endpoint.GetPaymentBreakdownEndpoint', () => {
     const endpoint = new GetPaymentBreakdownEndpoint();
 
     const getBreakdown = async ({ filter, path, search, narrowFilter, organization, user }: { filter?: StamhoofdFilter; path?: BreakdownPathItem[]; search?: string; narrowFilter?: StamhoofdFilter; organization: Organization; user: User }) => {
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const request = Request.get({
             path: '/payments/breakdown',

package/src/endpoints/organization/dashboard/payments/GetPaymentsEndpoint.test.ts

@@ -1,12 +1,13 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, User } from '@stamhoofd/models';
-import { BalanceItem, BalanceItemFactory, BalanceItemPayment, OrderFactory, OrganizationFactory, Payment, StripeAccount, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
+import type { Organization, User, BalanceItem } from '@stamhoofd/models';
+import { BalanceItemFactory, BalanceItemPayment, OrderFactory, OrganizationFactory, Payment, StripeAccount, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import type { PaginatedResponse, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
 import { BalanceItemRelation, BalanceItemRelationType, BalanceItemType, LimitedFilteredRequest, PaymentMethod, PaymentProvider, PaymentStatus, PermissionLevel, Permissions, TranslatedString } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { SettlementService } from '../../../../services/SettlementService.js';
 import { GetPaymentsEndpoint } from './GetPaymentsEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 // These tests exercise the balance-item filters reused inside the payments query (balanceItemPayments ->
 // balanceItem -> ...), which is the path where balance_items is joined into another query.
@@ -14,7 +15,7 @@ describe('Endpoint.GetPaymentsEndpoint', () => {
     const endpoint = new GetPaymentsEndpoint();
 
     const getPayments = async ({ filter, organization, user }: { filter: StamhoofdFilter | null; organization: Organization; user: User }) => {
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const request = Request.get({
             path: '/payments',

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

@@ -12,7 +12,7 @@ import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStruct
 import { Context } from '../../../../helpers/Context.js';
 import { BalanceItemService } from '../../../../services/BalanceItemService.js';
 import { PaymentService } from '../../../../services/PaymentService.js';
-import { ViesHelper } from '../../../../helpers/ViesHelper.js';
+import { ViesService } from '@stamhoofd/vies';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -112,7 +112,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             }
 
             if (put.customer?.company) {
-                await ViesHelper.checkCompany(put.customer.company, put.customer.company);
+                await ViesService.checkCompany(put.customer.company, null, { forceValidation: true });
             }
             payment.type = put.type;
 

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

@@ -6,6 +6,7 @@ import { PaymentMethod, PaymentStatus, PermissionLevel, Permissions, ReceivableB
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { GetReceivableBalanceEndpoint } from './GetReceivableBalanceEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 describe('Endpoint.GetReceivableBalanceEndpoint', () => {
     const endpoint = new GetReceivableBalanceEndpoint();
@@ -56,7 +57,7 @@ describe('Endpoint.GetReceivableBalanceEndpoint', () => {
     };
 
     const getReceivableBalance = async ({ type, id, organization, user }: { type: ReceivableBalanceType; id: string; organization: Organization; user: User }) => {
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const request = Request.get({
             path: `/receivable-balances/${type}/${id}`,

package/src/endpoints/organization/dashboard/registration-periods/GetOrganizationRegistrationPeriodsEndpoint.test.ts

@@ -1,9 +1,10 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { GroupType, LimitedFilteredRequest, PermissionLevel, Permissions } from '@stamhoofd/structures';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { GetOrganizationRegistrationPeriodsEndpoint } from './GetOrganizationRegistrationPeriodsEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 const baseUrl = `/organization/registration-periods`;
 
@@ -61,7 +62,7 @@ describe('Endpoint.GetOrganizationRegistrationPeriods', () => {
                 }),
             })
                 .create();
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const otherOrganization = await initOrganization(registrationPeriod1);
 
@@ -145,7 +146,7 @@ describe('Endpoint.GetOrganizationRegistrationPeriods', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const group1 = await new GroupFactory({
                 organization,

package/src/endpoints/organization/dashboard/registration-periods/MoveRegistrationPeriods.test.ts

@@ -1,8 +1,9 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, OrganizationRegistrationPeriod, RegistrationPeriod } from '@stamhoofd/models';
-import { GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, OrganizationRegistrationPeriod, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { Group, GroupCategory, GroupCategorySettings, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, OrganizationRegistrationPeriodSettings, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { PatchOrganizationRegistrationPeriodsEndpoint } from './PatchOrganizationRegistrationPeriodsEndpoint.js';
+import { SessionService } from '../../../../services/SessionService.js';
 
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
@@ -37,7 +38,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriodsEndpoint.MoveRegistration
                     level: PermissionLevel.Full,
                 }),
             }).create();
-            token = await Token.createToken(user);
+            token = await SessionService.createSession(user);
 
             const allGroupsUser = await new UserFactory({
                 organization,
@@ -52,7 +53,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriodsEndpoint.MoveRegistration
                     ]]),
                 }),
             }).create();
-            allGroupsToken = await Token.createToken(allGroupsUser);
+            allGroupsToken = await SessionService.createSession(allGroupsUser);
         });
 
         const patchOrganizationRegistrationPeriods = async ({ patch, organization, token }: { patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> | OrganizationRegistrationPeriodStruct[]; organization: Organization; token: Token }) => {
@@ -317,7 +318,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriodsEndpoint.MoveRegistration
                     level: PermissionLevel.Full,
                 }),
             }).create();
-            token = await Token.createToken(user);
+            token = await SessionService.createSession(user);
         });
 
         const patchOrganizationRegistrationPeriods = async ({ patch, organization, token }: { patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> | OrganizationRegistrationPeriodStruct[]; organization: Organization; token: Token }) => {
@@ -506,7 +507,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriodsEndpoint.MoveCategoryToPe
                 level: PermissionLevel.Full,
             }),
         }).create();
-        token = await Token.createToken(user);
+        token = await SessionService.createSession(user);
     });
 
     const patchOrganizationRegistrationPeriods = async ({ patch }: { patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> }) => {

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

@@ -1,7 +1,8 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization } from '@stamhoofd/models';
-import { Group, GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization, Token } from '@stamhoofd/models';
+import { Group, GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import { GroupCategory, GroupSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, Permissions, TranslatedString, Version } from '@stamhoofd/structures';
+import { SessionService } from '../../../../services/SessionService.js';
 
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
@@ -45,7 +46,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> = new PatchableArray();
 
@@ -77,7 +78,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> = new PatchableArray();
 
@@ -107,7 +108,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> = new PatchableArray();
 
@@ -142,7 +143,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             const patch: PatchableArrayAutoEncoder<OrganizationRegistrationPeriodStruct> = new PatchableArray();
 
@@ -171,7 +172,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             // A waiting list group and a regular group that references it. The regular group is
             // listed BEFORE the waiting list, reproducing the ordering produced by Group.defaultSort
@@ -237,7 +238,7 @@ describe('Endpoint.PatchOrganizationRegistrationPeriods', () => {
                 permissions: Permissions.create({ level: PermissionLevel.Full }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             // create group
             const group = await new GroupFactory({ organization: otherOrganization }).create();

package/src/endpoints/organization/dashboard/settlements/SettlementsExportEndpoint.test.ts

@@ -11,6 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { initMembershipOrganization } from '../../../../../tests/init/initMembershipOrganization.js';
 import { initPlatformAdmin } from '../../../../../tests/init/initPlatformAdmin.js';
+import { SessionService } from '../../../../services/SessionService.js';
 import { SettlementService } from '../../../../services/SettlementService.js';
 import { SettlementsExportEndpoint } from './SettlementsExportEndpoint.js';
 
@@ -34,7 +35,7 @@ describe('Endpoint.SettlementsExport', () => {
             organization,
             permissions: Permissions.create({ level: PermissionLevel.Full }),
         }).create();
-        return { user, token: await TokenModel.createToken(user) };
+        return { user, token: await SessionService.createSession(user) };
     };
 
     const post = async (organization: Organization, token: Token, { start = new Date(2026, 0, 1), end = new Date(2026, 1, 1) } = {}) => {
@@ -115,7 +116,7 @@ describe('Endpoint.SettlementsExport', () => {
 
     test('A user without finance access cannot export settlements', async () => {
         const user = await new UserFactory({ organization: membershipOrganization }).create();
-        const token = await TokenModel.createToken(user);
+        const token = await SessionService.createSession(user);
 
         await expect(post(membershipOrganization, token)).rejects.toThrow(
             STExpect.simpleError({ code: 'permission_denied' }),

package/src/endpoints/organization/dashboard/settlements/SettlementsSyncEndpoint.test.ts

@@ -14,6 +14,7 @@ import { SettlementSyncRunner } from '../../../../helpers/SettlementSyncRunner.j
 import { testServer } from '../../../../../tests/helpers/TestServer.js';
 import { initMembershipOrganization } from '../../../../../tests/init/initMembershipOrganization.js';
 import { initPlatformAdmin } from '../../../../../tests/init/initPlatformAdmin.js';
+import { SessionService } from '../../../../services/SessionService.js';
 import { GetSettlementsSyncStatusEndpoint } from './GetSettlementsSyncStatusEndpoint.js';
 import { SettlementsSyncEndpoint } from './SettlementsSyncEndpoint.js';
 
@@ -174,7 +175,7 @@ describe('Endpoint.SettlementsSync', () => {
 
     test('A user without platform full access cannot run the sync', async () => {
         const user = await new UserFactory({ organization: membershipOrganization }).create();
-        const token = await TokenModel.createToken(user);
+        const token = await SessionService.createSession(user);
 
         await expect(post(membershipOrganization, token)).rejects.toThrow(
             STExpect.simpleError({ code: 'permission_denied' }),