@stamhoofd/backend 2.79.4 → 2.79.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.79.4",
+    "version": "2.79.6",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -38,14 +38,14 @@
         "@simonbackx/simple-encoding": "2.21.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.79.4",
-        "@stamhoofd/backend-middleware": "2.79.4",
-        "@stamhoofd/email": "2.79.4",
-        "@stamhoofd/models": "2.79.4",
-        "@stamhoofd/queues": "2.79.4",
-        "@stamhoofd/sql": "2.79.4",
-        "@stamhoofd/structures": "2.79.4",
-        "@stamhoofd/utility": "2.79.4",
+        "@stamhoofd/backend-i18n": "2.79.6",
+        "@stamhoofd/backend-middleware": "2.79.6",
+        "@stamhoofd/email": "2.79.6",
+        "@stamhoofd/models": "2.79.6",
+        "@stamhoofd/queues": "2.79.6",
+        "@stamhoofd/sql": "2.79.6",
+        "@stamhoofd/structures": "2.79.6",
+        "@stamhoofd/utility": "2.79.6",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "db09440c68c3af4e7b834b2a739f717e302fbc7c"
+    "gitHead": "5ed5677f28e62a73283527518b8e7ac0c8b4818e"
 }

package/src/endpoints/global/registration/RegisterMembersEndpoint.test.ts

@@ -2213,7 +2213,7 @@ describe('Endpoint.RegisterMembers', () => {
             // #endregion
 
             // #region act and assert
-            await expect(async () => await post(body, organization, token)).rejects.toThrow(new RegExp('Je hebt geen toegangsrechten om deze inschrijving te verwijderen'));
+            await expect(async () => await post(body, organization, token)).rejects.toThrow(/No permission to delete this registration/);
             // #endregion
         });
 
@@ -2343,7 +2343,7 @@ describe('Endpoint.RegisterMembers', () => {
 
             // #region act and assert
             await post(body1, organization, token);
-            await expect(async () => await post(body2, organization, token)).rejects.toThrow(new RegExp('Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw'));
+            await expect(async () => await post(body2, organization, token)).rejects.toThrow(/No permission to delete this registration/);
             // #endregion
         });
     });

package/src/endpoints/global/registration/RegisterMembersEndpoint.ts

@@ -400,7 +400,8 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (!await Context.auth.canAccessRegistration(existingRegistration, PermissionLevel.Write)) {
                 throw new SimpleError({
                     code: 'forbidden',
-                    message: 'Je hebt geen toegangsrechten om deze inschrijving te verwijderen.',
+                    message: 'No permission to delete this registration',
+                    human: 'Je hebt geen toegangsrechten om deze inschrijving te verwijderen.',
                     statusCode: 403,
                 });
             }
@@ -408,7 +409,8 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (existingRegistration.deactivatedAt || !existingRegistration.registeredAt) {
                 throw new SimpleError({
                     code: 'invalid_data',
-                    message: 'Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw.',
+                    message: 'Cannot delete inactive registration',
+                    human: 'Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw.',
                 });
             }
 

package/src/helpers/AdminPermissionChecker.ts

@@ -344,6 +344,11 @@ export class AdminPermissionChecker {
      * Note: only checks admin permissions. Users that 'own' this member can also access it but that does not use the AdminPermissionChecker
      */
     async canAccessRegistration(registration: Registration, permissionLevel: PermissionLevel = PermissionLevel.Read) {
+        if (registration.deactivatedAt || !registration.registeredAt) {
+            // No full access: cannot access deactivated registrations
+            return false;
+        }
+
         const organizationPermissions = await this.getOrganizationPermissions(registration.organizationId);
 
         if (!organizationPermissions) {
@@ -355,11 +360,6 @@ export class AdminPermissionChecker {
             return true;
         }
 
-        if (registration.deactivatedAt || !registration.registeredAt) {
-            // No full access: cannot access deactivated registrations
-            return false;
-        }
-
         const allGroups = await this.getOrganizationGroups(registration.organizationId);
         const group = allGroups.find(g => g.id === registration.groupId);
         if (!group || group.deletedAt) {