@stamhoofd/backend 2.26.0 → 2.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.26.0",
+    "version": "2.28.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.26.0",
-        "@stamhoofd/backend-middleware": "2.26.0",
-        "@stamhoofd/email": "2.26.0",
-        "@stamhoofd/models": "2.26.0",
-        "@stamhoofd/queues": "2.26.0",
-        "@stamhoofd/sql": "2.26.0",
-        "@stamhoofd/structures": "2.26.0",
-        "@stamhoofd/utility": "2.26.0",
+        "@stamhoofd/backend-i18n": "2.28.0",
+        "@stamhoofd/backend-middleware": "2.28.0",
+        "@stamhoofd/email": "2.28.0",
+        "@stamhoofd/models": "2.28.0",
+        "@stamhoofd/queues": "2.28.0",
+        "@stamhoofd/sql": "2.28.0",
+        "@stamhoofd/structures": "2.28.0",
+        "@stamhoofd/utility": "2.28.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "28425ef8a576223beaec1677bcd89e405dac20e4"
+    "gitHead": "3598a1baed3fc513175f081cd0aa1e6741226fbd"
 }

package/src/crons.ts

@@ -586,7 +586,11 @@ let lastDripCheck: Date | null = null
 let lastDripId = ""
 async function checkDrips() {
     if (STAMHOOFD.environment === "development") {
-        //return;
+        return;
+    }
+
+    if (STAMHOOFD.userMode === 'platform') {
+        return;
     }
 
     if (lastDripCheck && lastDripCheck > new Date(new Date().getTime() - 6 * 60 * 60 * 1000)) {

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

@@ -4,9 +4,10 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Member, Platform } from '@stamhoofd/models';
 import { SQL, compileToSQLFilter, compileToSQLSorter } from "@stamhoofd/sql";
-import { CountFilteredRequest, LimitedFilteredRequest, MembersBlob, PaginatedResponse, PermissionLevel, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import { CountFilteredRequest, Country, LimitedFilteredRequest, MembersBlob, PaginatedResponse, PermissionLevel, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
 import { DataValidator } from '@stamhoofd/utility';
 
+import parsePhoneNumber from "libphonenumber-js/max";
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../helpers/Context';
 import { memberFilterCompilers } from '../../../sql-filters/members';
@@ -131,11 +132,55 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
         }
 
         if (q.search) {
-            let searchFilter: StamhoofdFilter|null = null
+            let searchFilter: StamhoofdFilter|null = null           
+
+            // is phone?
+            if (!searchFilter && q.search.match(/^\+?[0-9\s-]+$/)) {
+                // Try to format as phone so we have 1:1 space matches
+                try {
+                    const phoneNumber = parsePhoneNumber(q.search, (Context.i18n.country as Country) || Country.Belgium)
+                    if (phoneNumber && phoneNumber.isValid()) {
+                        const formatted = phoneNumber.formatInternational();
+                        searchFilter = {
+                            $or: [
+                                {
+                                    phone: {
+                                        $eq: formatted
+                                    }
+                                },
+                                {
+                                    parentPhone: {
+                                        $eq: formatted
+                                    }
+                                },
+                                {
+                                    unverifiedPhone: {
+                                        $eq: formatted
+                                    }
+                                }
+                            ]
+                        }
+                        
+                    }
+                } catch (e) {
+                    console.error('Failed to parse phone number', q.search, e)
+                }
+            }
+
+             // Is lidnummer?
+             if (!searchFilter && q.search.match(/^[0-9]{4}-[0-9]{6}-[0-9]{1,2}$/) || q.search.match(/^[0-9]{10}$/)) {
+                searchFilter = {
+                    memberNumber: {
+                        $eq: q.search
+                    }
+                }
+            }
 
             // Two search modes:
             // e-mail or name based searching
-            if (q.search.includes('@')) {
+            if (searchFilter) {
+                // already done
+            } else if (q.search.includes('@')) {
                 const isCompleteAddress = DataValidator.isEmailValid(q.search);
 
                 // Member email address contains, or member parent contains
@@ -150,6 +195,11 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                             parentEmail: {
                                 [(isCompleteAddress ? '$eq' : '$contains')]: q.search
                             }
+                        },
+                        {
+                            unverifiedEmail: {
+                                [(isCompleteAddress ? '$eq' : '$contains')]: q.search
+                            }
                         }
                     ]
                 } as any as StamhoofdFilter
@@ -162,7 +212,6 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             }
 
             // todo: Address search detection
-            // todo: Phone number search detection
 
             if (searchFilter) {
                 query.where(compileToSQLFilter(searchFilter, filterCompilers))

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

@@ -81,6 +81,9 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             let deleteUnreachable = false
             const allowedIds: string[] = []
 
+            //#region prevent patch category lock if no full platform access
+            const originalCategories = organizationPeriod.settings.categories;
+
             if (await Context.auth.hasFullAccess(organization.id)) {
                 if (patch.settings) {
                     if(patch.settings.categories) {
@@ -117,6 +120,49 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
                 }
             }
 
+            //#region handle locked categories
+            if(!Context.auth.hasPlatformFullAccess()) {
+                const categoriesAfterPatch = organizationPeriod.settings.categories;
+
+                for(const categoryBefore of originalCategories) {
+                    const locked = categoryBefore.settings.locked;
+
+                    if(locked) {
+                        // todo: use existing function, now a category could still be deleted if the category is moved to another category and that catetory is deleted
+                        const categoryId = categoryBefore.id;
+                        const refCountBefore = originalCategories.filter(c => c.categoryIds.includes(categoryId)).length;
+                        const refCountAfter = categoriesAfterPatch.filter(c => c.categoryIds.includes(categoryId)).length;
+                        const isDeleted = refCountAfter < refCountBefore;
+
+                        if(isDeleted) {
+                            throw Context.auth.error('Je hebt geen toegangsrechten om deze vergrendelde categorie te verwijderen.')
+                        }
+                    }
+
+                    const categoryAfter = categoriesAfterPatch.find(c => c.id === categoryBefore.id);
+                    
+                    if(!categoryAfter) {
+                        if(locked) {
+                            throw Context.auth.error('Je hebt geen toegangsrechten om deze vergrendelde categorie te verwijderen.')
+                        }
+                    } else if(locked !== categoryAfter.settings.locked) {
+                        throw Context.auth.error('Je hebt geen toegangsrechten om deze categorie te vergrendelen of ontgrendelen.')
+                    }
+
+                    if(!locked || !categoryAfter) {
+                        continue;
+                    }
+
+                    const settingsBefore = categoryBefore.settings;
+                    const settingsAfter = categoryAfter.settings;
+
+                    if(settingsBefore.name !== settingsAfter.name) {
+                        throw Context.auth.error('Je hebt geen toegangsrechten de naam van deze vergrendelde categorie te wijzigen.')
+                    }
+                }
+            }
+            //#endregion
+
             await organizationPeriod.save();
 
             // Check changes to groups

package/src/helpers/MemberUserSyncer.ts

@@ -9,8 +9,12 @@ export class MemberUserSyncerStatic {
      * - email addresses have changed
      */
     async onChangeMember(member: MemberWithRegistrations, unlinkUsers: boolean = false) {
+        console.log('onchange member', member.id, 'unlink', unlinkUsers)
+
         const {userEmails, parentAndUnverifiedEmails} = this.getMemberAccessEmails(member.details)
 
+        console.log('emails', userEmails, parentAndUnverifiedEmails)
+
         // Make sure all these users have access to the member
         for (const email of userEmails) {
             // Link users that are found with these email addresses.
@@ -18,8 +22,11 @@ export class MemberUserSyncerStatic {
         }
 
         for (const email of parentAndUnverifiedEmails) {
+            if (userEmails.includes(email)) {
+                continue;
+            }
+            
             // Link parents and unverified emails
-
             // Now we add the responsibility permissions to the parent if there are no userEmails
             await this.linkUser(email, member, userEmails.length > 0, userEmails.length > 0)
         }
@@ -59,7 +66,7 @@ export class MemberUserSyncerStatic {
         }
 
         const unverifiedEmails: string[] = details.unverifiedEmails;
-        const parentAndUnverifiedEmails = details.parentsHaveAccess ? details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails).concat(unverifiedEmails) : []
+        const parentAndUnverifiedEmails = details.parentsHaveAccess ? details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails).concat(unverifiedEmails) : details.unverifiedEmails
 
         return {
             userEmails,
@@ -163,6 +170,8 @@ export class MemberUserSyncerStatic {
     }
 
     async linkUser(email: string, member: MemberWithRegistrations, asParent: boolean, updateNameIfEqual = true) {
+        console.log('Linking user', email, 'to member', member.id, 'as parent', asParent, 'update name if equal', updateNameIfEqual)
+
         let user = member.users.find(u => u.email.toLocaleLowerCase() === email.toLocaleLowerCase()) ?? await User.getForAuthentication(member.organizationId, email, {allowWithoutAccount: true})
 
         if (user) {

package/src/sql-filters/members.ts

@@ -9,6 +9,7 @@ import { registrationFilterCompilers } from "./registrations";
 export const memberFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
     id: createSQLColumnFilterCompiler('id'),
+    memberNumber: createSQLColumnFilterCompiler('memberNumber'),
     firstName: createSQLColumnFilterCompiler('firstName'),
     lastName: createSQLColumnFilterCompiler('lastName'),
     name: createSQLExpressionFilterCompiler(
@@ -49,6 +50,26 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         {isJSONValue: true, isJSONObject: true}
     ),
 
+    unverifiedEmail: createSQLExpressionFilterCompiler(
+        SQL.jsonValue(SQL.column('details'), '$.value.unverifiedEmails'),
+        {isJSONValue: true, isJSONObject: true}
+    ),
+
+    phone: createSQLExpressionFilterCompiler(
+        SQL.jsonValue(SQL.column('details'), '$.value.phone'),
+        {isJSONValue: true}
+    ),
+
+    parentPhone: createSQLExpressionFilterCompiler(
+        SQL.jsonValue(SQL.column('details'), '$.value.parents[*].phone'),
+        {isJSONValue: true, isJSONObject: true}
+    ),
+
+    unverifiedPhone: createSQLExpressionFilterCompiler(
+        SQL.jsonValue(SQL.column('details'), '$.value.unverifiedPhones'),
+        {isJSONValue: true, isJSONObject: true}
+    ),
+
     registrations: createSQLRelationFilterCompiler(
         SQL.select()
             .from(