@stamhoofd/backend 2.83.4 → 2.84.0

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

@@ -50,12 +50,15 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             periods.push(await PatchOrganizationRegistrationPeriodsEndpoint.createOrganizationPeriod(organization, put));
         }
 
+        const forceGroupIds: string[] = [];
+
         for (const patch of request.body.getPatches()) {
             const organizationPeriod = await OrganizationRegistrationPeriod.getByID(patch.id);
             if (!organizationPeriod || organizationPeriod.organizationId !== organization.id) {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Period not found',
+                    human: $t('347463a0-1e9a-40fe-996c-d77ba13bc05b'),
                     statusCode: 404,
                 });
             }
@@ -66,16 +69,16 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Period not found',
+                    human: $t('347463a0-1e9a-40fe-996c-d77ba13bc05b'),
                     statusCode: 404,
                 });
             }
 
             if (period.locked) {
                 throw new SimpleError({
-                    code: 'not_found',
-                    message: 'Period not found',
-                    human: $t(`d19ec3c4-6320-4f65-8890-74ba1a5bc375`) + ' ' + period.getStructure().name + ' ' + $t(`cb4b72b3-3990-4870-ab85-08ef7c7eadaa`),
-                    statusCode: 404,
+                    code: 'locked_period',
+                    message: 'This period is locked',
+                    human: $t(`cc658db0-ee90-40fc-8a8c-1074a4f1f2f2`, { '2000-2001': period.getStructure().nameShort }),
                 });
             }
 
@@ -209,12 +212,14 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
 
             for (const groupPut of patch.groups.getPuts()) {
                 shouldUpdateSetupSteps = true;
-                await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(groupPut.put, organization.id, period, { allowedIds });
+                const group = await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(groupPut.put, organization.id, period, { allowedIds });
                 deleteUnreachable = true;
+                forceGroupIds.push(group.id);
             }
 
             for (const struct of patch.groups.getPatches()) {
-                await PatchOrganizationRegistrationPeriodsEndpoint.patchGroup(struct, period);
+                const group = await PatchOrganizationRegistrationPeriodsEndpoint.patchGroup(struct, period);
+                forceGroupIds.push(group.id);
             }
 
             if (deleteUnreachable) {
@@ -233,7 +238,7 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         }
 
         return new Response(
-            await AuthenticatedStructures.organizationRegistrationPeriods(periods),
+            await AuthenticatedStructures.organizationRegistrationPeriods(periods, undefined, { forceGroupIds }),
         );
     }
 
@@ -272,19 +277,39 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
     static async createOrganizationPeriod(organization: Organization, struct: OrganizationRegistrationPeriodStruct) {
         const period = await RegistrationPeriod.getByID(struct.period.id);
 
-        if (!period || period.locked) {
+        if (!period) {
             throw new SimpleError({
                 code: 'not_found',
                 message: 'Period not found',
+                human: $t('347463a0-1e9a-40fe-996c-d77ba13bc05b'),
                 statusCode: 404,
             });
         }
 
+        if (period?.locked) {
+            throw new SimpleError({
+                code: 'locked_period',
+                message: 'Period is locked',
+                human: $t(`cc658db0-ee90-40fc-8a8c-1074a4f1f2f2`, { '2000-2001': period.getStructure().nameShort }),
+            });
+        }
+
         const maximumStart = 1000 * 60 * 60 * 24 * 31 * 2; // 2 months in advance
-        if (period.startDate > new Date(Date.now() + maximumStart)) {
+        if (STAMHOOFD.environment !== 'development' && period.startDate > new Date(Date.now() + maximumStart)) {
             throw new SimpleError({
                 code: 'invalid_field',
-                message: 'Het werkjaar die je wilt instellen is nog niet gestart',
+                message: 'Period start date is too far in the future',
+                human: $t('2655c006-55af-47e6-959c-16acdb1917dc'),
+                field: 'period',
+            });
+        }
+
+        // Period has ended
+        if (STAMHOOFD.environment !== 'development' && period.endDate < new Date()) {
+            throw new SimpleError({
+                code: 'invalid_field',
+                message: 'Period has ended',
+                human: $t('44ff6618-ecbf-408b-9cc1-b1479e8ba8a2'),
                 field: 'period',
             });
         }
@@ -450,6 +475,8 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
 
         await model.updateOccupancy();
         await model.save();
+
+        return model;
     }
 
     static async createGroup(struct: GroupStruct, organizationId: string, period: RegistrationPeriod, options?: { allowedIds?: string[] }): Promise<Group> {
@@ -465,6 +492,9 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
                 }
             }
         }
+        else {
+            // For events, permission checking needs to happen outside this method (access to event = access to group)
+        }
 
         if (period.locked) {
             throw new SimpleError({

package/src/endpoints/organization/dashboard/users/CreateApiUserEndpoint.test.ts

@@ -3,7 +3,7 @@ import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
 
 import { testServer } from '../../../../../tests/helpers/TestServer';
 import { PatchApiUserEndpoint } from './PatchApiUserEndpoint';
-import { SHExpect, TestUtils } from '@stamhoofd/test-utils';
+import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { CreateApiUserEndpoint } from './CreateApiUserEndpoint';
 
@@ -63,7 +63,7 @@ describe('Endpoint.CreateApiUserEndpoint', () => {
         }));
         createRequest.headers.authorization = 'Bearer ' + token.accessToken;
 
-        await expect(testServer.test(endpoint, createRequest)).rejects.toThrow(SHExpect.simpleError({
+        await expect(testServer.test(endpoint, createRequest)).rejects.toThrow(STExpect.simpleError({
             code: 'permission_denied',
         }));
     });

package/src/endpoints/organization/dashboard/users/PatchApiUserEndpoint.test.ts

@@ -3,7 +3,7 @@ import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
 
 import { testServer } from '../../../../../tests/helpers/TestServer';
 import { PatchApiUserEndpoint } from './PatchApiUserEndpoint';
-import { SHExpect, TestUtils } from '@stamhoofd/test-utils';
+import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { CreateApiUserEndpoint } from './CreateApiUserEndpoint';
 import { PatchMap } from '@simonbackx/simple-encoding';
@@ -82,7 +82,7 @@ describe('Endpoint.PatchApiUserEndpoint', () => {
         }));
         r.headers.authorization = 'Bearer ' + token.accessToken;
 
-        await expect(testServer.test(endpoint, r)).rejects.toThrow(SHExpect.simpleError({
+        await expect(testServer.test(endpoint, r)).rejects.toThrow(STExpect.simpleError({
             code: 'permission_denied',
         }));
     });

package/src/endpoints/organization/dashboard/webshops/PatchWebshopEndpoint.ts

@@ -1,7 +1,7 @@
 import { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Token, Webshop } from '@stamhoofd/models';
+import { Webshop } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { PermissionLevel, PrivateWebshop, WebshopPrivateMetaData } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
@@ -52,6 +52,9 @@ export class PatchWebshopEndpoint extends Endpoint<Params, Query, Body, Response
             // Do all updates
             if (request.body.meta) {
                 request.body.meta.domainActive = undefined;
+                if (request.body.meta.customCode !== undefined && !await Context.auth.hasFullAccess(organization.id)) {
+                    throw Context.auth.error($t('c8e499c2-8d90-480c-a15e-d9da5291b40e'));
+                }
                 webshop.meta.patchOrPut(request.body.meta);
             }
 

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, BalanceItemPayment, Order, Payment, Webshop, WebshopCounter } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, TranslatedString, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 import { AuditLogService } from '../../../../services/AuditLogService';
@@ -178,7 +178,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                                 BalanceItemRelationType.Webshop,
                                 BalanceItemRelation.create({
                                     id: webshop.id,
-                                    name: webshop.meta.name,
+                                    name: new TranslatedString(webshop.meta.name),
                                 }),
                             ],
                         ]);

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.ts

@@ -5,7 +5,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, MolliePayment, MollieToken, Order, PayconiqPayment, Payment, RateLimiter, Webshop, WebshopDiscountCode } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, Version, WebshopAuthType, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, TranslatedString, Version, WebshopAuthType, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
@@ -205,7 +205,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                         BalanceItemRelationType.Webshop,
                         BalanceItemRelation.create({
                             id: webshop.id,
-                            name: webshop.meta.name,
+                            name: new TranslatedString(webshop.meta.name),
                         }),
                     ],
                 ]);