@stamhoofd/backend 2.27.2 → 2.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.27.2",
+    "version": "2.29.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.27.2",
-        "@stamhoofd/backend-middleware": "2.27.2",
-        "@stamhoofd/email": "2.27.2",
-        "@stamhoofd/models": "2.27.2",
-        "@stamhoofd/queues": "2.27.2",
-        "@stamhoofd/sql": "2.27.2",
-        "@stamhoofd/structures": "2.27.2",
-        "@stamhoofd/utility": "2.27.2",
+        "@stamhoofd/backend-i18n": "2.29.0",
+        "@stamhoofd/backend-middleware": "2.29.0",
+        "@stamhoofd/email": "2.29.0",
+        "@stamhoofd/models": "2.29.0",
+        "@stamhoofd/queues": "2.29.0",
+        "@stamhoofd/sql": "2.29.0",
+        "@stamhoofd/structures": "2.29.0",
+        "@stamhoofd/utility": "2.29.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": "4c7804970b02fa339d884ace0105a6efc6dab179"
+    "gitHead": "0579111a61319f41f3789c570e9f494a648bd07c"
 }

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/global/registration/RegisterMembersEndpoint.ts

@@ -121,7 +121,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 throw new SimpleError({
                     code: "forbidden",
                     message: "No permission to register this member",
-                    human: 'Je hebt niet de juiste toegangsrechten om dit lid in te schrijven.',
+                    human: 'Je hebt niet de juiste toegangsrechten om dit lid in te schrijven. Je kan enkel leden inschrijven als je minstens bewerkrechten hebt voor dat lid.',
                     statusCode: 403
                 });
             }

package/src/helpers/AdminPermissionChecker.ts

@@ -271,9 +271,14 @@ 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) {
+        if (!group || group.deletedAt) {
             return false;
         }
 

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(