@stamhoofd/backend 2.77.0 → 2.77.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.77.0",
+    "version": "2.77.1",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.20.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.77.0",
-        "@stamhoofd/backend-middleware": "2.77.0",
-        "@stamhoofd/email": "2.77.0",
-        "@stamhoofd/models": "2.77.0",
-        "@stamhoofd/queues": "2.77.0",
-        "@stamhoofd/sql": "2.77.0",
-        "@stamhoofd/structures": "2.77.0",
-        "@stamhoofd/utility": "2.77.0",
+        "@stamhoofd/backend-i18n": "2.77.1",
+        "@stamhoofd/backend-middleware": "2.77.1",
+        "@stamhoofd/email": "2.77.1",
+        "@stamhoofd/models": "2.77.1",
+        "@stamhoofd/queues": "2.77.1",
+        "@stamhoofd/sql": "2.77.1",
+        "@stamhoofd/structures": "2.77.1",
+        "@stamhoofd/utility": "2.77.1",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "209036d412e24fefe961eeeeaa5a8618297bfcd7"
+    "gitHead": "e6d9dce8ddfdfaf5380e98f3a0ffd113a3826955"
 }

package/src/endpoints/global/audit-logs/GetAuditLogsEndpoint.ts

@@ -42,9 +42,18 @@ export class GetAuditLogsEndpoint extends Endpoint<Params, Query, Body, Response
             if (!await Context.auth.hasFullAccess(organization.id)) {
                 throw Context.auth.error();
             }
-            scopeFilter = {
-                organizationId: organization.id,
-            };
+            if (!Context.auth.hasPlatformFullAccess()) {
+                scopeFilter = {
+                    organizationId: organization.id,
+                };
+            } else {
+                if (!q.filter || typeof q.filter !== 'object' || !('objectId' in q.filter)) {
+                    scopeFilter = {
+                        organizationId: organization.id,
+                    };
+                }
+                
+            }
         }
         else {
             if (!Context.auth.hasPlatformFullAccess()) {

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -2,8 +2,8 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
-import { GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
+import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
@@ -17,6 +17,7 @@ import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
 import { RegistrationService } from '../../../services/RegistrationService';
 import { shouldCheckIfMemberIsDuplicateForPatch, shouldCheckIfMemberIsDuplicateForPut } from './shouldCheckIfMemberIsDuplicate';
+import { AuditLogService } from '../../../services/AuditLogService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -794,6 +795,29 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
 
             // Grant temporary access to this member without needing to enter the security code again
             await Context.auth.temporarilyGrantMemberAccess(member, PermissionLevel.Write);
+
+            const log = new AuditLog();
+
+            // a member has multiple organizations, so this is difficult to determine - for now it is only visible in the admin panel
+            log.organizationId = member.organizationId; 
+            
+            log.type = AuditLogType.MemberSecurityCodeUsed;
+            log.source = AuditLogSource.Anonymous;
+
+            if (Context.user) {
+                log.userId = Context.user.id;
+                log.source = AuditLogSource.User;
+            }
+
+            log.objectId = member.id;
+            log.replacements = new Map([
+                ['m', AuditLogReplacement.create({
+                    value: member.details.name,
+                    type: AuditLogReplacementType.Member,
+                    id: member.id,
+                })],
+            ]);
+            await log.save();
         }
         else {
             throw new SimpleError({

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

@@ -87,6 +87,7 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
             expect(member.details.lastName).toBe(lastName);
             expect(member.details.birthDay).toEqual(existingMember.details.birthDay);
             expect(member.details.email).toBe('anewemail@example.com'); // this has been merged
+            expect(member.details.alternativeEmails).toHaveLength(0);
         });
 
         test('A duplicate member with existing registrations returns those registrations after a merge', async () => {
@@ -96,6 +97,7 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
                 firstName,
                 lastName,
                 securityCode: 'ABC-123',
+                email: 'original@example.com',
                 parents: [
                     Parent.create({
                         firstName: 'Jane',
@@ -146,7 +148,8 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
             expect(member.details.firstName).toBe(firstName);
             expect(member.details.lastName).toBe(lastName);
             expect(member.details.birthDay).toEqual(existingMember.details.birthDay);
-            expect(member.details.email).toBe('anewemail@example.com'); // this has been merged
+            expect(member.details.email).toBe('original@example.com'); // this has been merged
+            expect(member.details.alternativeEmails).toEqual(['anewemail@example.com']); // this has been merged
 
             // Check the registration is still there
             expect(member.registrations.length).toBe(1);