@stamhoofd/backend 2.144.0 → 2.145.0

package/src/endpoints/global/events/PatchEventsEndpoint.test.ts

@@ -8,6 +8,7 @@ import { AccessRight, Event, Group, GroupSettings, GroupType, OrganizationEventT
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { PatchEventsEndpoint } from './PatchEventsEndpoint.js';
+import { SessionService } from '../../../services/SessionService.js';
 
 const baseUrl = `/events`;
 const endpoint = new PatchEventsEndpoint();
@@ -32,7 +33,7 @@ const TestRequest = {
     }) {
         const request = Request.buildJson('PATCH', baseUrl, options.organization?.getApiHost(), options.body);
         if (options.user) {
-            const token = await Token.createToken(options.user);
+            const token = await SessionService.createSession(options.user);
             request.headers.authorization = 'Bearer ' + token.accessToken;
         }
         return await testServer.test(endpoint, request);

package/src/endpoints/global/files/UploadFile.test.ts

@@ -6,6 +6,7 @@ import { TestUtils } from '@stamhoofd/test-utils';
 import { promises as fs } from 'fs';
 import type { IncomingMessage } from 'node:http';
 import { Readable } from 'node:stream';
+import { SessionService } from '../../../services/SessionService.js';
 
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { UploadFile } from './UploadFile.js';
@@ -59,7 +60,7 @@ describe('Endpoint.UploadFile', () => {
             organization,
             permissions: Permissions.create({ level: PermissionLevel.Full }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const boundary = '--------------------------StamhoofdTest';
         const body = Buffer.concat([

package/src/endpoints/global/files/UploadImage.test.ts

@@ -5,6 +5,7 @@ import { PermissionLevel, Permissions } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import type { IncomingMessage } from 'node:http';
 import { Readable } from 'node:stream';
+import { SessionService } from '../../../services/SessionService.js';
 
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { UploadImage } from './UploadImage.js';
@@ -52,7 +53,7 @@ describe('Endpoint.UploadImage', () => {
             organization,
             permissions: Permissions.create({ level: PermissionLevel.Full }),
         }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const boundary = '--------------------------StamhoofdTest';
         const body = Buffer.concat([

package/src/endpoints/global/files/upload-security.test.ts

@@ -7,6 +7,7 @@ import { File, PermissionLevel, Permissions } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import type { IncomingMessage } from 'node:http';
 import { Readable } from 'node:stream';
+import { SessionService } from '../../../services/SessionService.js';
 
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { FileSignService } from '../../../services/FileSignService.js';
@@ -116,12 +117,12 @@ describe('Upload security', () => {
             permissions: Permissions.create({ level: PermissionLevel.Full }),
         }).create();
         adminUserId = admin.id;
-        adminToken = (await Token.createToken(admin)).accessToken;
+        adminToken = (await SessionService.createSession(admin)).accessToken;
 
         // A user without any permissions: it may only upload private files
         const member = await new UserFactory({ organization }).create();
         memberUserId = member.id;
-        memberToken = (await Token.createToken(member)).accessToken;
+        memberToken = (await SessionService.createSession(member)).accessToken;
     });
 
     beforeEach(() => {

package/src/endpoints/global/groups/GetGroupsEndpoint.test.ts

@@ -1,6 +1,6 @@
 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 type { StamhoofdFilter } from '@stamhoofd/structures';
 import { BundleDiscountGroupPriceSettings, GroupPrice, GroupType, LimitedFilteredRequest } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
@@ -8,6 +8,7 @@ import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { initAdmin, initBundleDiscount, initPlatformAdmin } from '../../../../tests/init/index.js';
 import { GetGroupsEndpoint } from './GetGroupsEndpoint.js';
 import { Database } from '@simonbackx/simple-database';
+import { SessionService } from '../../../services/SessionService.js';
 
 const baseUrl = `/groups`;
 
@@ -68,7 +69,7 @@ describe('Endpoint.GetGroupsEndpoint', () => {
         const { organization: otherOrganization } = await initOrganization(registrationPeriod1);
 
         const user = await new UserFactory({ organization }).create();
-        const token = await Token.createToken(user);
+        const token = await SessionService.createSession(user);
 
         const waitingList = await new GroupFactory({
             organization,

package/src/endpoints/global/members/GetMembersEndpoint.test.ts

@@ -1,13 +1,14 @@
 import type { Endpoint } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { MemberWithUsersRegistrationsAndGroups, RegistrationPeriod } from '@stamhoofd/models';
-import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RecordCategoryFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { MemberWithUsersRegistrationsAndGroups, RegistrationPeriod, Token } from '@stamhoofd/models';
+import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RecordCategoryFactory, RegistrationFactory, RegistrationPeriodFactory, UserFactory } from '@stamhoofd/models';
 import type { SortList } from '@stamhoofd/structures';
 import { AccessRight, EventMeta, GroupType, LimitedFilteredRequest, NamedObject, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, RecordAnswer, RecordDateAnswer, RecordTextAnswer, RecordType, ResourcePermissions, SortItemDirection } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { GetMembersEndpoint } from './GetMembersEndpoint.js';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { initPlatformRecordCategory } from '../../../../tests/init/initPlatformRecordCategory.js';
+import { SessionService } from '../../../services/SessionService.js';
 
 const baseUrl = `/members`;
 const endpoint = new GetMembersEndpoint();
@@ -53,7 +54,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
@@ -126,7 +127,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
@@ -195,7 +196,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
@@ -276,7 +277,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
@@ -347,7 +348,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -422,7 +423,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -477,7 +478,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -567,7 +568,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -661,7 +662,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -746,7 +747,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -825,7 +826,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -925,7 +926,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -1013,7 +1014,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -1115,7 +1116,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -1220,7 +1221,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
 
@@ -1305,7 +1306,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -1391,7 +1392,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const member2 = await new MemberFactory({ }).create();
             const member3 = await new MemberFactory({ }).create();
@@ -1473,7 +1474,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             // The member we are looking for: answered with a time of day that is not midnight
             const member1 = await new MemberFactory({}).create();
@@ -1614,7 +1615,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
 
@@ -1743,7 +1744,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
 
@@ -1840,7 +1841,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const member1 = await new MemberFactory({ }).create();
             const controlMember = await new MemberFactory({ }).create();
             const group = await new GroupFactory({ organization, period }).create();
@@ -2046,7 +2047,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
             })
                 .create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
 
             // Try to request all members at organization
             const request = Request.get({
@@ -2101,7 +2102,7 @@ describe('Endpoint.GetMembersEndpoint', () => {
                 }),
             }).create();
 
-            const token = await Token.createToken(user);
+            const token = await SessionService.createSession(user);
             const group = await new GroupFactory({ organization, period }).create();
 
             const members: MemberWithUsersRegistrationsAndGroups[] = [];