diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md index 67ce149..dc0f8e4 100644 --- a/apps/events/CHANGELOG.md +++ b/apps/events/CHANGELOG.md @@ -7,6 +7,27 @@ and this project follows [Semantic Versioning](https://semver.org/). ## [Unreleased] +## [1.51.12] - 2026-10-29 + +### Added + +- **API v2 — tickets and attendance:** `/me/tickets` (+ `/email`), `/tickets` (the staff list, one + ticket, sending, issuing, scan stats and recent scans, the ticket for a QR code), transfers + (`/tickets/{id}/transfer`, `/ticket-transfers/{token}` to accept or decline), `/events/{id}/tickets`; + offline scanning (`/scan-locks`: take tickets offline, snapshot, sync, release, reports); the + attendance register (`/events/{id}/attendance`, its PDF/Excel export) and certificates (issue, + send, revoke, download, preview, verify, `/me/certificates`); allocations (`/events/{id}/allocations`, + `/allocation-sets`, `/allocation-groups`, `/me/allocation-groups`). +- Frontend: `apiV2Raw()` for screens whose helpers pass the path as a string; file downloads + read v2's error shape. +- `v1Route` can run a v1 router (with `map: () => ({ url })`); a chain that answers nothing is a + 404 instead of waiting. + +### Changed + +- Tickets, transfers, offline scanning, attendance, certificates, allocations and the kids room + set-up use v2. + ## [1.51.11] - 2026-10-29 ### Added diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md index a27cd6f..e5f8166 100644 --- a/apps/events/WHATS-NEW.md +++ b/apps/events/WHATS-NEW.md @@ -12,6 +12,12 @@ Write for church admins, not developers: no environment variables, endpoints or developer log is CHANGELOG.md. A tagged version without a section here shows "No details given". --> +## 1.51.12 + +- **More groundwork for 2.0.** Tickets, ticket transfers, offline scanning, the attendance register, + certificates and group allocations now run on the new version of the server's connection to the + app. They work just as before. + ## 1.51.11 - **More groundwork for 2.0.** Payments, cash-ups, the waitlist, sponsorship, consent forms and diff --git a/apps/events/backend/package-lock.json b/apps/events/backend/package-lock.json index 6ae34a6..bd94810 100644 --- a/apps/events/backend/package-lock.json +++ b/apps/events/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "event-management-backend", - "version": "1.51.11", + "version": "1.51.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "event-management-backend", - "version": "1.51.11", + "version": "1.51.12", "hasInstallScript": true, "dependencies": { "@cj-tech-master/excelts": "^10.2.0", diff --git a/apps/events/backend/package.json b/apps/events/backend/package.json index 99b7822..00cc374 100644 --- a/apps/events/backend/package.json +++ b/apps/events/backend/package.json @@ -1,6 +1,6 @@ { "name": "event-management-backend", - "version": "1.51.11", + "version": "1.51.12", "description": "Event Management System Backend", "main": "src/index.js", "scripts": { diff --git a/apps/events/backend/src/v2/deprecation.ts b/apps/events/backend/src/v2/deprecation.ts index 1de54a4..dacbb26 100644 --- a/apps/events/backend/src/v2/deprecation.ts +++ b/apps/events/backend/src/v2/deprecation.ts @@ -46,6 +46,52 @@ const SUCCESSORS: Successor[] = [ { method: 'POST', v1: /^\/api\/events\/([^/]+)\/copy-from$/, v2: m => `/api/v2/events/${m[1]}/copy-from` }, { method: 'GET', v1: /^\/api\/events\/([^/]+)\/notify-recipients$/, v2: m => `/api/v2/events/${m[1]}/notify-recipients` }, { method: 'PUT', v1: /^\/api\/events\/([^/]+)\/notify-recipients$/, v2: m => `/api/v2/events/${m[1]}/notify-recipients` }, + // 1.51.12: tickets, scan locks, attendance and certificates, allocations + { method: 'GET', v1: /^\/api\/tickets\/mytickets$/, v2: () => '/api/v2/me/tickets' }, + { method: 'POST', v1: /^\/api\/tickets\/email$/, v2: () => '/api/v2/me/tickets/email' }, + { method: 'GET', v1: /^\/api\/tickets\/scans\/recent$/, v2: () => '/api/v2/tickets/scans/recent' }, + { method: 'GET', v1: /^\/api\/tickets\/scans\/stats$/, v2: () => '/api/v2/tickets/scans/stats' }, + { method: 'POST', v1: /^\/api\/tickets\/send-to$/, v2: () => '/api/v2/tickets/send' }, + { method: 'POST', v1: /^\/api\/tickets\/generate$/, v2: () => '/api/v2/tickets/generate' }, + { method: 'PUT', v1: /^\/api\/tickets\/email-sent$/, v2: () => '/api/v2/tickets/email-sent' }, + { method: 'GET', v1: /^\/api\/tickets\/qr\/([^/]+)$/, v2: m => `/api/v2/tickets/qr/${m[1]}` }, + { method: 'GET', v1: /^\/api\/tickets\/event\/([^/]+)$/, v2: m => `/api/v2/events/${m[1]}/tickets` }, + { method: 'GET', v1: /^\/api\/tickets\/transfer-offer\/([^/]+)$/, v2: m => `/api/v2/ticket-transfers/${m[1]}` }, + { method: 'POST', v1: /^\/api\/tickets\/transfer-offer\/([^/]+)\/(accept|decline)$/, v2: m => `/api/v2/ticket-transfers/${m[1]}/${m[2]}` }, + { method: 'GET', v1: /^\/api\/tickets\/?$/, v2: () => '/api/v2/tickets' }, + { method: 'GET', v1: /^\/api\/tickets\/([^/]+)\/transfers$/, v2: m => `/api/v2/tickets/${m[1]}/transfers` }, + { method: 'POST', v1: /^\/api\/tickets\/([^/]+)\/transfer$/, v2: m => `/api/v2/tickets/${m[1]}/transfer` }, + { method: 'DELETE', v1: /^\/api\/tickets\/([^/]+)\/transfer$/, v2: m => `/api/v2/tickets/${m[1]}/transfer` }, + { method: 'GET', v1: /^\/api\/tickets\/([^/]+)$/, v2: m => `/api/v2/tickets/${m[1]}` }, + { method: 'GET', v1: /^\/api\/scan-locks\/?$/, v2: () => '/api/v2/scan-locks' }, + { method: 'POST', v1: /^\/api\/scan-locks\/?$/, v2: () => '/api/v2/scan-locks' }, + { method: 'GET', v1: /^\/api\/scan-locks\/reports$/, v2: () => '/api/v2/scan-locks/reports' }, + { method: 'POST', v1: /^\/api\/scan-locks\/reports\/([^/]+)\/review$/, v2: m => `/api/v2/scan-locks/reports/${m[1]}/review` }, + { method: 'GET', v1: /^\/api\/scan-locks\/([^/]+)\/snapshot$/, v2: m => `/api/v2/scan-locks/${m[1]}/snapshot` }, + { method: 'POST', v1: /^\/api\/scan-locks\/([^/]+)\/(sync|force-release)$/, v2: m => `/api/v2/scan-locks/${m[1]}/${m[2]}` }, + { method: 'DELETE', v1: /^\/api\/scan-locks\/([^/]+)$/, v2: m => `/api/v2/scan-locks/${m[1]}` }, + { method: 'GET', v1: /^\/api\/attendance\/certificates\/verify\/([^/]+)$/, v2: m => `/api/v2/certificates/verify/${m[1]}` }, + { method: 'GET', v1: /^\/api\/attendance\/certificates\/mine$/, v2: () => '/api/v2/me/certificates' }, + { method: 'POST', v1: /^\/api\/attendance\/certificates\/preview$/, v2: () => '/api/v2/certificates/preview' }, + { method: 'GET', v1: /^\/api\/attendance\/certificates\/([^/]+)\/pdf$/, v2: m => `/api/v2/certificates/${m[1]}/pdf` }, + { method: 'POST', v1: /^\/api\/attendance\/certificates\/([^/]+)\/revoke$/, v2: m => `/api/v2/certificates/${m[1]}/revoke` }, + { method: 'GET', v1: /^\/api\/attendance\/([^/]+)\/export$/, v2: m => `/api/v2/events/${m[1]}/attendance/export` }, + { method: 'POST', v1: /^\/api\/attendance\/([^/]+)\/mark$/, v2: m => `/api/v2/events/${m[1]}/attendance` }, + { method: 'POST', v1: /^\/api\/attendance\/([^/]+)\/certificates$/, v2: m => `/api/v2/events/${m[1]}/certificates` }, + { method: 'POST', v1: /^\/api\/attendance\/([^/]+)\/certificates\/send$/, v2: m => `/api/v2/events/${m[1]}/certificates/send` }, + { method: 'GET', v1: /^\/api\/attendance\/([^/]+)\/certificates\.pdf$/, v2: m => `/api/v2/events/${m[1]}/certificates.pdf` }, + { method: 'GET', v1: /^\/api\/attendance\/([^/]+)$/, v2: m => `/api/v2/events/${m[1]}/attendance` }, + { method: 'GET', v1: /^\/api\/allocations\/my-groups$/, v2: () => '/api/v2/me/allocation-groups' }, + { method: 'GET', v1: /^\/api\/allocations\/event\/([^/]+)$/, v2: m => `/api/v2/events/${m[1]}/allocations` }, + { method: 'POST', v1: /^\/api\/allocations\/sets$/, v2: () => '/api/v2/allocation-sets' }, + { method: 'PUT', v1: /^\/api\/allocations\/sets\/([^/]+)$/, v2: m => `/api/v2/allocation-sets/${m[1]}` }, + { method: 'DELETE', v1: /^\/api\/allocations\/sets\/([^/]+)$/, v2: m => `/api/v2/allocation-sets/${m[1]}` }, + { method: 'GET', v1: /^\/api\/allocations\/sets\/([^/]+)\/lists$/, v2: m => `/api/v2/allocation-sets/${m[1]}/lists` }, + { method: 'POST', v1: /^\/api\/allocations\/sets\/([^/]+)\/(groups|auto)$/, v2: m => `/api/v2/allocation-sets/${m[1]}/${m[2]}` }, + { method: 'PUT', v1: /^\/api\/allocations\/sets\/([^/]+)\/assignments$/, v2: m => `/api/v2/allocation-sets/${m[1]}/assignments` }, + { method: 'DELETE', v1: /^\/api\/allocations\/sets\/([^/]+)\/assignments$/, v2: m => `/api/v2/allocation-sets/${m[1]}/assignments` }, + { method: 'PUT', v1: /^\/api\/allocations\/groups\/([^/]+)$/, v2: m => `/api/v2/allocation-groups/${m[1]}` }, + { method: 'DELETE', v1: /^\/api\/allocations\/groups\/([^/]+)$/, v2: m => `/api/v2/allocation-groups/${m[1]}` }, // 1.51.11: money (payments, cash-ups, provider transactions, waitlist, sponsorship, consent, forms, feedback) { method: 'GET', v1: /^\/api\/payments\/providers$/, v2: () => '/api/v2/payments/providers' }, { method: 'GET', v1: /^\/api\/payments\/providers\/settings$/, v2: () => '/api/v2/payments/providers/settings' }, diff --git a/apps/events/backend/src/v2/index.ts b/apps/events/backend/src/v2/index.ts index 6b68e13..0986d05 100644 --- a/apps/events/backend/src/v2/index.ts +++ b/apps/events/backend/src/v2/index.ts @@ -15,6 +15,7 @@ import './resources/me'; import './resources/registrations'; import './resources/registrationsManage'; import './resources/money'; +import './resources/attendance'; import './resources/checkin'; import './resources/auth'; diff --git a/apps/events/backend/src/v2/resources/attendance.ts b/apps/events/backend/src/v2/resources/attendance.ts new file mode 100644 index 0000000..c1fbdf0 --- /dev/null +++ b/apps/events/backend/src/v2/resources/attendance.ts @@ -0,0 +1,195 @@ +/** + * Tickets and attendance on v2 (1.51.12): tickets (mine, one, sending, transfers, the staff + * lists, generating), scan locks (offline scanning), the attendance register and certificates, + * and allocations (groups, rooms, teams). Each route runs the v1 handler (viaV1.ts) behind the + * same access and campus checks as v1. Scanning itself is /checkin (1.51.2). + */ +import { z } from 'zod'; +import { id, idParams } from '../schemas'; +import { v1Route } from '../viaV1'; + +/* eslint-disable @typescript-eslint/no-explicit-any -- v1 handlers and middleware are JavaScript */ +const cs = require('../../utils/campusScope') as { + scopeEvent(opts?: { need?: 'view' | 'manage'; resolve?: string; from?: (req: any) => unknown; ownerOk?: boolean; nameCampus?: boolean }): any; + scopeBody(targets: [string, string][], opts?: { need?: 'view' | 'manage'; orphan?: 'pass' | 'deny' }): any; + scopeList: any; + campusIndependent(reason: string): any; +}; +const t = require('../../controllers/ticketController'); +const locks = require('../../controllers/scanLockController'); +const att = require('../../controllers/attendanceController'); +const alloc = require('../../controllers/allocationController'); + +const filters = (...names: string[]) => z.looseObject(Object.fromEntries(names.map(n => [n, z.string().max(4000).optional()]))); +const asEvent = (ctx: any) => ({ params: { ...ctx.req.params, eventId: ctx.params.id } }); +const loose = z.looseObject({}); +const tokenParams = z.object({ token: z.string().min(1).max(200) }); +const SCOPE_LIST = 'scopeList (the handler filters by listWhere)'; +const ticketOwner = cs.scopeEvent({ resolve: 'ticket', ownerOk: true }); +const qrScope = cs.scopeEvent({ resolve: 'ticketQr', from: (req: any) => req.params.qrCode, nameCampus: true }); + +// ─── Tickets ───────────────────────────────────────────────────────────────── + +v1Route({ method: 'get', path: '/me/tickets', tag: 'Tickets', summary: 'My tickets', description: 'Including ones transferred to me.', access: 'user', v1: t.getUserTickets }); +v1Route({ + method: 'post', path: '/me/tickets/email', tag: 'Tickets', summary: 'Send me my tickets', + description: 'For a registration (`registrationId`) or chosen tickets (`ticketIds`), by email and/or WhatsApp (`channel`).', + access: 'user', body: z.looseObject({ registrationId: id.optional(), ticketIds: z.array(id).max(500).optional(), channel: z.string().max(20).optional() }), v1: t.emailTickets, +}); +v1Route({ + method: 'get', path: '/tickets/scans/recent', tag: 'Tickets', summary: 'Recent scans', access: 'staff', campusScope: SCOPE_LIST, middleware: [cs.scopeList], query: filters('eventId', 'limit'), v1: t.getRecentScans, +}); +v1Route({ + method: 'get', path: '/tickets/scans/stats', tag: 'Tickets', summary: 'Scan counts', access: 'staff', campusScope: SCOPE_LIST, middleware: [cs.scopeList], query: filters('eventId'), v1: t.getScanStats, +}); +v1Route({ + method: 'post', path: '/tickets/send', tag: 'Tickets', summary: 'Send tickets to someone', + description: 'Staff: a registration\'s tickets (or chosen ones) to an email address or phone number.', + access: 'staff', campusScope: 'scopeBody(registrationId, ticketIds)', middleware: [cs.scopeBody([['registrationId', 'registration'], ['ticketIds', 'ticket']])], body: loose, v1: t.sendTicketsTo, +}); +v1Route({ + method: 'post', path: '/tickets/generate', tag: 'Tickets', summary: 'Issue a registration\'s tickets', + access: 'supervisor', campusScope: 'scopeBody(registrationId)', middleware: [cs.scopeBody([['registrationId', 'registration']])], body: z.looseObject({ registrationId: id }), v1: t.generateTickets, +}); +v1Route({ + method: 'post', path: '/tickets/email-sent', tag: 'Tickets', summary: 'Mark tickets as emailed', access: 'admin', body: loose, v1: t.markTicketsAsEmailSent, +}); +v1Route({ + method: 'get', path: '/tickets', tag: 'Tickets', summary: 'Every ticket', access: 'supervisor', campusScope: SCOPE_LIST, middleware: [cs.scopeList], query: filters('eventId', 'page', 'limit'), v1: t.getTickets, +}); +v1Route({ + method: 'get', path: '/tickets/qr/:qrCode', tag: 'Tickets', summary: 'The ticket for a QR code', + description: 'Without checking it in (that\'s POST /checkin/{qrCode}).', + access: 'staff', campusScope: 'scopeEvent(ticketQr)', middleware: [qrScope], params: z.object({ qrCode: z.string().min(1).max(200) }), v1: t.getTicketByQrCode, +}); +v1Route({ + method: 'get', path: '/events/:id/tickets', tag: 'Tickets', summary: 'An event\'s tickets', + access: 'staff', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, map: asEvent, v1: t.getTicketsByEvent, +}); +v1Route({ + method: 'get', path: '/ticket-transfers/:token', tag: 'Tickets', summary: 'A ticket someone is giving you', + description: 'What the transfer link shows (the token is the credential).', access: 'public', params: tokenParams, v1: t.getTransferOffer, +}); +v1Route({ method: 'post', path: '/ticket-transfers/:token/accept', tag: 'Tickets', summary: 'Accept a ticket', access: 'public', params: tokenParams, body: loose, v1: t.acceptTransferOffer }); +v1Route({ method: 'post', path: '/ticket-transfers/:token/decline', tag: 'Tickets', summary: 'Decline a ticket', access: 'public', params: tokenParams, body: loose, v1: t.declineTransferOffer }); +v1Route({ + method: 'get', path: '/tickets/:id', tag: 'Tickets', summary: 'One ticket', access: 'user', campusScope: 'scopeEvent(ticket, owner-ok)', middleware: [ticketOwner], params: idParams, v1: t.getTicketById, +}); +v1Route({ + method: 'post', path: '/tickets/:id/transfer', tag: 'Tickets', summary: 'Give a ticket to someone', + description: 'Sends them a link to accept it; the ticket is theirs once they do.', + access: 'user', campusScope: 'scopeEvent(ticket, owner-ok)', middleware: [ticketOwner], params: idParams, body: loose, v1: t.transferTicketHandler, +}); +v1Route({ + method: 'delete', path: '/tickets/:id/transfer', tag: 'Tickets', summary: 'Cancel a ticket transfer', access: 'user', campusScope: 'scopeEvent(ticket, owner-ok)', middleware: [ticketOwner], params: idParams, v1: t.cancelTransferHandler, +}); +v1Route({ + method: 'get', path: '/tickets/:id/transfers', tag: 'Tickets', summary: 'A ticket\'s transfers', access: 'user', campusScope: 'scopeEvent(ticket, owner-ok)', middleware: [ticketOwner], params: idParams, v1: t.getTicketTransfers, +}); + +// ─── Scan locks (offline scanning) ─────────────────────────────────────────── + +v1Route({ + method: 'get', path: '/scan-locks', tag: 'Check-in', summary: 'Devices scanning offline for an event', + access: 'staff', campusScope: 'scopeEvent(query.eventId)', middleware: [cs.scopeEvent({ from: (req: any) => req.query.eventId })], query: z.looseObject({ eventId: id }), v1: locks.listLocks, +}); +v1Route({ + method: 'post', path: '/scan-locks', tag: 'Check-in', summary: 'Take tickets offline on this device', + description: 'Locks the chosen tickets to this device until it syncs or releases them.', + access: 'staff', campusScope: 'scopeEvent(body.eventId)', middleware: [cs.scopeEvent({ from: (req: any) => req.body?.eventId })], status: 201, body: z.looseObject({ eventId: id }), v1: locks.createLock, +}); +v1Route({ + method: 'get', path: '/scan-locks/reports', tag: 'Check-in', summary: 'Offline sync reports to review', + access: 'supervisor', campusScope: 'scopeEvent(query.eventId)', middleware: [cs.scopeEvent({ from: (req: any) => req.query.eventId })], query: z.looseObject({ eventId: id, unreviewed: z.string().max(10).optional() }), v1: locks.listReports, +}); +v1Route({ + method: 'post', path: '/scan-locks/reports/:id/review', tag: 'Check-in', summary: 'Mark a sync report reviewed', + access: 'supervisor', campusScope: 'scopeEvent(syncReport)', middleware: [cs.scopeEvent({ resolve: 'syncReport' })], params: idParams, body: loose, v1: locks.reviewReport, +}); +v1Route({ + method: 'get', path: '/scan-locks/:id/snapshot', tag: 'Check-in', summary: 'The tickets a device took offline', + access: 'staff', campusScope: 'scopeEvent(scanLock)', middleware: [cs.scopeEvent({ resolve: 'scanLock' })], params: idParams, query: filters('deviceId'), v1: locks.getSnapshot, +}); +v1Route({ + method: 'post', path: '/scan-locks/:id/sync', tag: 'Check-in', summary: 'Upload scans made offline', + access: 'staff', campusScope: 'scopeEvent(scanLock)', middleware: [cs.scopeEvent({ resolve: 'scanLock' })], params: idParams, body: loose, v1: locks.syncLock, +}); +v1Route({ + method: 'post', path: '/scan-locks/:id/force-release', tag: 'Check-in', summary: 'Release a lost device\'s tickets', + access: 'supervisor', campusScope: 'scopeEvent(scanLock)', middleware: [cs.scopeEvent({ resolve: 'scanLock' })], params: idParams, body: loose, v1: locks.forceRelease, +}); +v1Route({ + method: 'delete', path: '/scan-locks/:id', tag: 'Check-in', summary: 'Release tickets back online', + access: 'staff', campusScope: 'scopeEvent(scanLock)', middleware: [cs.scopeEvent({ resolve: 'scanLock' })], params: idParams, body: z.looseObject({ deviceId: z.string().max(200).optional() }), v1: locks.releaseLock, +}); + +// ─── Attendance and certificates ───────────────────────────────────────────── + +v1Route({ + method: 'get', path: '/certificates/verify/:code', tag: 'Attendance', summary: 'Check a certificate is genuine', + access: 'public', params: z.object({ code: z.string().min(1).max(100) }), v1: att.verifyCertificate, +}); +v1Route({ method: 'get', path: '/me/certificates', tag: 'Me', summary: 'My certificates', access: 'user', v1: att.myCertificates }); +v1Route({ + method: 'post', path: '/certificates/preview', tag: 'Attendance', summary: 'Preview a certificate template', + access: 'supervisor', campusScope: 'campusIndependent (previews a template from the request body)', middleware: [cs.campusIndependent('previews a certificate template from the request body')], body: loose, file: { contentType: 'application/pdf' }, v1: att.previewCertificate, +}); +v1Route({ + method: 'get', path: '/certificates/:id/pdf', tag: 'Attendance', summary: 'Download a certificate', + description: 'Its owner, or staff.', access: 'user', params: idParams, file: { contentType: 'application/pdf' }, v1: att.downloadCertificate, +}); +v1Route({ + method: 'post', path: '/certificates/:id/revoke', tag: 'Attendance', summary: 'Withdraw a certificate', + access: 'supervisor', campusScope: 'scopeEvent(certificate)', middleware: [cs.scopeEvent({ resolve: 'certificate' })], params: idParams, body: loose, v1: att.revokeCertificate, +}); +v1Route({ + method: 'get', path: '/events/:id/attendance', tag: 'Attendance', summary: 'An event\'s attendance register', + access: 'staff', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, map: asEvent, v1: att.getRegister, +}); +v1Route({ + method: 'get', path: '/events/:id/attendance/export', tag: 'Attendance', summary: 'The register as a file', + description: '`format=pdf` or `xlsx`.', access: 'staff', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, query: filters('format', 'sessionId'), + file: { contentType: 'application/pdf' }, map: asEvent, v1: att.exportRegister, +}); +v1Route({ + method: 'post', path: '/events/:id/attendance', tag: 'Attendance', summary: 'Mark attendance', + access: 'supervisor', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, body: loose, map: asEvent, v1: att.markAttendance, +}); +v1Route({ + method: 'post', path: '/events/:id/certificates', tag: 'Attendance', summary: 'Issue certificates', + access: 'supervisor', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, body: loose, map: asEvent, v1: att.issueCertificates, +}); +v1Route({ + method: 'post', path: '/events/:id/certificates/send', tag: 'Attendance', summary: 'Send certificates', + access: 'supervisor', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, body: loose, map: asEvent, v1: att.sendCertificatesHandler, +}); +v1Route({ + method: 'get', path: '/events/:id/certificates.pdf', tag: 'Attendance', summary: 'Every certificate for an event, as one PDF', + access: 'supervisor', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, file: { contentType: 'application/pdf' }, map: asEvent, v1: att.downloadEventCertificates, +}); + +// ─── Allocations (groups, rooms, teams) ────────────────────────────────────── + +v1Route({ + method: 'get', path: '/me/allocation-groups', tag: 'Allocations', summary: 'Groups I lead', + access: 'staff', campusScope: 'campusIndependent (only the groups the signed-in person leads)', middleware: [cs.campusIndependent('only the groups the signed-in person leads')], v1: alloc.getMyGroups, +}); +v1Route({ + method: 'get', path: '/events/:id/allocations', tag: 'Allocations', summary: 'An event\'s allocation board', + access: 'supervisor', campusScope: 'scopeEvent(view)', middleware: [cs.scopeEvent()], params: idParams, map: asEvent, v1: alloc.getBoard, +}); +v1Route({ + method: 'post', path: '/allocation-sets', tag: 'Allocations', summary: 'Start a set of groups', + access: 'supervisor', campusScope: 'scopeEvent(body.eventId)', middleware: [cs.scopeEvent({ from: (req: any) => req.body?.eventId })], status: 201, body: z.looseObject({ eventId: id }), v1: alloc.createSet, +}); +const setScope = cs.scopeEvent({ resolve: 'allocationSet' }); +const groupScope = cs.scopeEvent({ resolve: 'allocationGroup' }); +v1Route({ method: 'patch', path: '/allocation-sets/:id', tag: 'Allocations', summary: 'Change a set', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, body: loose, v1: alloc.updateSet }); +v1Route({ method: 'delete', path: '/allocation-sets/:id', tag: 'Allocations', summary: 'Delete a set', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, v1: alloc.deleteSet }); +v1Route({ method: 'get', path: '/allocation-sets/:id/lists', tag: 'Allocations', summary: 'A set\'s lists (who is in each group)', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, query: filters('medical'), v1: alloc.getSetLists }); +v1Route({ method: 'post', path: '/allocation-sets/:id/groups', tag: 'Allocations', summary: 'Add a group', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], status: 201, params: idParams, body: loose, v1: alloc.createGroup }); +v1Route({ method: 'put', path: '/allocation-sets/:id/assignments', tag: 'Allocations', summary: 'Put people in groups', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, body: loose, v1: alloc.assign }); +v1Route({ method: 'delete', path: '/allocation-sets/:id/assignments', tag: 'Allocations', summary: 'Empty every group', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, v1: alloc.clearAssignments }); +v1Route({ method: 'post', path: '/allocation-sets/:id/auto', tag: 'Allocations', summary: 'Fill the groups automatically', access: 'supervisor', campusScope: 'scopeEvent(allocationSet)', middleware: [setScope], params: idParams, body: loose, v1: alloc.autoAssign }); +v1Route({ method: 'patch', path: '/allocation-groups/:id', tag: 'Allocations', summary: 'Change a group', access: 'supervisor', campusScope: 'scopeEvent(allocationGroup)', middleware: [groupScope], params: idParams, body: loose, v1: alloc.updateGroup }); +v1Route({ method: 'delete', path: '/allocation-groups/:id', tag: 'Allocations', summary: 'Delete a group', access: 'supervisor', campusScope: 'scopeEvent(allocationGroup)', middleware: [groupScope], params: idParams, v1: alloc.deleteGroup }); diff --git a/apps/events/backend/src/v2/viaV1.ts b/apps/events/backend/src/v2/viaV1.ts index 3e3a611..99129cc 100644 --- a/apps/events/backend/src/v2/viaV1.ts +++ b/apps/events/backend/src/v2/viaV1.ts @@ -15,7 +15,8 @@ import type { Request, RequestHandler } from 'express'; import { defineRoute, fileResponse, type Access, type Ctx } from './route'; /* eslint-disable @typescript-eslint/no-explicit-any -- requests and v1 answers are passed through */ -type Parts = { params?: Record; query?: Record; body?: unknown }; +/** `url` (with its query string) is for v1 routers, which route by it. */ +type Parts = { params?: Record; query?: Record; body?: unknown; url?: string }; type V1Answer = { status: number; json?: unknown; body?: Buffer; headers: Record; redirect?: string }; /** A response that records what a v1 handler sends (JSON, `send`, a piped stream or a redirect). */ @@ -86,7 +87,7 @@ class RecordingResponse extends Writable { */ export async function runV1(handlers: RequestHandler | RequestHandler[], req: Request, parts: Parts = {}): Promise { const fake = Object.create(req) as Request; - for (const key of ['params', 'query', 'body'] as const) { + for (const key of ['params', 'query', 'body', 'url'] as const) { if (parts[key] !== undefined) Object.defineProperty(fake, key, { value: parts[key], writable: true, configurable: true, enumerable: true }); } const res = new RecordingResponse(); @@ -97,7 +98,8 @@ export async function runV1(handlers: RequestHandler | RequestHandler[], req: Re advanced = true; if (err) return reject(err); if (i + 1 < chain.length) step(i + 1).then(resolve, reject); - else resolve(); + // Nothing answered (e.g. a v1 router with no matching route). + else reject(Object.assign(new Error('There is no such API endpoint.'), { statusCode: 404 })); }; Promise.resolve(chain[i](fake, res as any, next)).then(() => { if (!advanced) resolve(); }, reject); }); diff --git a/apps/events/backend/tests/v2.test.ts b/apps/events/backend/tests/v2.test.ts index d70cdc1..c410ba7 100644 --- a/apps/events/backend/tests/v2.test.ts +++ b/apps/events/backend/tests/v2.test.ts @@ -52,6 +52,7 @@ jest.mock('../src/utils/campusScope', () => ({ listWhere: async () => ({}), scopeList: (_req: unknown, _res: unknown, next: () => void) => next(), unscopedOnly: (_req: unknown, _res: unknown, next: () => void) => next(), + campusIndependent: () => (_req: unknown, _res: unknown, next: () => void) => next(), })); const mockEvents = { listManagedEvents: jest.fn(), createEvent: jest.fn(), updateEvent: jest.fn(), deactivateEvent: jest.fn(), getNotifyRecipients: jest.fn(), setNotifyRecipients: jest.fn(), copySetupFrom: jest.fn() }; jest.mock('../src/services/events', () => Object.fromEntries(Object.keys(mockEvents).map(k => [k, (...a: unknown[]) => (mockEvents as Record)[k](...a)]))); diff --git a/apps/events/backend/tests/viaV1.test.ts b/apps/events/backend/tests/viaV1.test.ts index 151dc8e..506ab9d 100644 --- a/apps/events/backend/tests/viaV1.test.ts +++ b/apps/events/backend/tests/viaV1.test.ts @@ -72,4 +72,17 @@ describe('v2 routes answered by v1 handlers', () => { expect(res.headers['content-disposition']).toContain('ticket.pdf'); expect((res.body as Buffer).toString()).toBe('%PDF-1.4 end'); }); + + test("a v1 router is given the v1 URL; one with no matching route is a 404", async () => { + const router = express.Router(); + router.get('/today', (req, res) => { res.json({ q: req.query.x }); }); + const app = appWith( + v1Route({ method: 'get', path: '/dash', tag: 'T', summary: 's', access: 'public', v1: router, map: ctx => ({ url: '/today?x=' + String(ctx.req.query.x) }) }), + v1Route({ method: 'get', path: '/nothing', tag: 'T', summary: 's', access: 'public', v1: router, map: () => ({ url: '/missing' }) }), + ); + expect((await request(app).get('/api/v2/dash?x=7')).body).toEqual({ data: { q: '7' } }); + const res = await request(app).get('/api/v2/nothing'); + expect(res.status).toBe(404); + expect(res.body.error.code).toBe('NOT_FOUND'); + }); }); diff --git a/apps/events/docs/HANDOVER.md b/apps/events/docs/HANDOVER.md index 76d3f6f..4752b1f 100644 --- a/apps/events/docs/HANDOVER.md +++ b/apps/events/docs/HANDOVER.md @@ -1,6 +1,6 @@ # Handover — where things stand and how to carry on -Last updated: 2026-10-29, after **1.51.11** (and Hub 1.5.0). The plan itself is in +Last updated: 2026-10-29, after **1.51.12** (and Hub 1.5.0). The plan itself is in [ROADMAP-v2.md](./ROADMAP-v2.md) (decisions table at the end); the previous round of features is in [FEATURES-ROUND-1.md](./FEATURES-ROUND-1.md). @@ -17,6 +17,7 @@ encrypted settings unreadable or break existing installs. | 1.51.3 | **Express 5** (qs query parser and `req.body = {}` kept); scanner and at-the-door on v2 check-in; shared middleware answers v2-shaped on `/api/v2` (`legacyErrorsToV2`, `reason`); v1 `Deprecation` + `successor-version` headers (`src/v2/deprecation.ts`) | | 1.51.2 | **v2 accounts and check-in**: signup, login (+ code step), `PATCH /me`; check-in look-up and scan with `outcome`s. `src/services/auth.ts` (from userController) and `src/services/checkin.ts` (from ticketController); login/signup/profile pages on v2 | | 1.51.1 | **v2 registrations and payments**: register, get, cancel, checkout; create/cancel moved to `src/services/registrations.ts`, online checkout to `src/services/payments.ts` (v1 uses them too); typed frontend calls (`apiV2`, `npm run api:types`); register page, Pay now and My Events cancel on v2 | +| 1.51.12 | **Tickets and attendance on v2** — `resources/attendance.ts`; frontend `apiV2Raw()` for string-path helpers | | 1.51.11 | **Money on v2** — `src/v2/viaV1.ts` (`v1Route`: a v2 route answered by the v1 handler); `resources/money.ts`; `/docs/v2` collapsed with a filter | | 1.51.10 | **Managing registrations on v2** — `src/services/registrationAdmin.ts` (the rest of `registrationController.js`); frontend `fetchAllRegistrations()`; money split out to 1.51.11 | | 1.51.9 | **Series, season passes, bundles, coupons, campuses on v2** — `src/services/series.ts`, `deals.ts`, `campuses.ts`; `reason` on v2 errors from service codes; frontend `apiV2Data()` | @@ -71,7 +72,7 @@ encrypted settings unreadable or break existing installs. Hub 1.1.0 is deployed with update requests rolled out, and `scripts/install.sh` has been tried on a test server (both done 2026-10-28). -1. **1.51.12 – 1.51.16: every endpoint onto v2**, one area per release (roadmap build order, row +1. **1.51.13 – 1.51.16: every endpoint onto v2**, one area per release (roadmap build order, row 11b): services in TS, screens on `apiV2`, v1 routes into `SUCCESSORS`. 1.51.16 gives incoming webhooks and links in sent messages v2 URLs, with the v1 paths still answering (links redirect, webhooks handled by the same code). Then **2.0.0** — AI helpers and v1 removed. diff --git a/apps/events/docs/ROADMAP-v2.md b/apps/events/docs/ROADMAP-v2.md index 52f32e0..c6b5844 100644 --- a/apps/events/docs/ROADMAP-v2.md +++ b/apps/events/docs/ROADMAP-v2.md @@ -42,8 +42,8 @@ pass** shipped. 1.50.1 **pagination and search on long lists** and 1.50.2 **even foundations**, 1.51.1 **v2 registrations and payments**, 1.51.2 **v2 accounts and check-in** and 1.51.3 **Express 5, scanner on v2, v1 deprecation headers** shipped. 1.51.4 **security and dependency updates**, 1.51.5 **Next.js 16** and 1.51.6 **the complete command palette and ExcelTS** , 1.51.7 **setting events up on v2, pg-boss 11** and 1.51.8 **the rest of event set-up on v2** and 1.51.9 -**series, passes, deals and campuses on v2** 1.51.10 **managing registrations on v2** and 1.51.11 **money on v2** shipped. -**Next: 1.51.12 – 1.51.16 (every endpoint onto v2), then 2.0.0.** +**series, passes, deals and campuses on v2** 1.51.10 **managing registrations on v2**, 1.51.11 **money on v2** and 1.51.12 **tickets and +attendance on v2** shipped. **Next: 1.51.13 – 1.51.16 (every endpoint onto v2), then 2.0.0.** **Repositories:** @@ -1012,7 +1012,7 @@ income justify the hardware: | 9 | 1.47.0 ✅ – 1.47.3 ✅, 1.48.0 ✅ | Event series & cloning (1.47.0 clone, 1.47.1 series, 1.47.2 year-on-year reports, 1.47.3 season pass), Outbound webhooks (Wallet passes removed from scope) | Smaller, independent wins | | 10 | 1.49.0 ✅ – 1.49.2 ✅, 1.50.0 ✅, 1.50.1 ✅, 1.50.2 ✅ | Admin dashboard/Ctrl+K/bulk actions/saved filters, Accessibility pass, pagination and search on long lists, event picker and webhook guide (Afrikaans removed from scope) | Polish before the big release | | 11 | 1.51.0 ✅, 1.51.1 ✅, 1.51.2 ✅, 1.51.3 ✅ | TypeScript backend + OpenAPI + `/api/v2` alongside v1: 1.51.0 foundations (build, launcher, route declarations, errors, paging, OpenAPI at `/docs/v2`, first read endpoints); 1.51.1 registrations and payments as TS services, typed frontend calls; 1.51.2 check-in and accounts; 1.51.3 Express 5, the scanner on v2, v1 deprecation headers, v2-shaped shared middleware | The breaking-change groundwork | -| 11b | 1.51.4 ✅ – 1.51.11 ✅, 1.51.12 – 1.51.16 | **Every endpoint on v2 before 2.0** (decided 2026-10-29): 1.51.4 dependency audit and Node 24 LTS; 1.51.5 Next.js 16 and ESLint 10 (ESLint 9 is out of support); 1.51.6 the complete command palette and ExcelTS instead of exceljs; 1.51.7 setting events up (the staff list, create, change, deactivate, copy-from, notification recipients) and pg-boss 11; 1.51.8 the rest of event set-up (the event in full, ticket options and variants, attachments, sections, costs, uploads, calendar file, alias); 1.51.9 series, season passes, bundles, coupons and campuses; 1.51.10 managing registrations (the staff lists, status, at the door, bulk actions, items, coupons, attendees, attendee forms); 1.51.11 money, staff side (payments, cashup, provider transactions, waitlist, sponsorship, consent, form builder, feedback); 1.51.12 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.13 kids check-in and volunteer rosters; 1.51.14 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.15 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.16 **incoming webhooks and links in sent messages**: Yoco, PayFast and WAWP webhooks and the links in emails and WhatsApp (unsubscribe, consent, ticket transfer, calendar feeds, waitlist offers) get v2 URLs — new messages and provider registrations use them, and the v1 paths keep answering (links by a 308 redirect to v2, provider webhooks handled by the same code, since providers may not follow a redirect on a POST). Each puts its area's endpoints on v2 (1.51.1 – 1.51.10 by moving the logic into TS services; from 1.51.11 by `v1Route`, which runs the v1 handler behind a v2 route — moving those handlers into TS services is a 2.x clean-up that doesn't change the API), its screens onto `apiV2`, and its v1 routes into `SUCCESSORS` | 2.0 can then remove v1 | +| 11b | 1.51.4 ✅ – 1.51.12 ✅, 1.51.13 – 1.51.16 | **Every endpoint on v2 before 2.0** (decided 2026-10-29): 1.51.4 dependency audit and Node 24 LTS; 1.51.5 Next.js 16 and ESLint 10 (ESLint 9 is out of support); 1.51.6 the complete command palette and ExcelTS instead of exceljs; 1.51.7 setting events up (the staff list, create, change, deactivate, copy-from, notification recipients) and pg-boss 11; 1.51.8 the rest of event set-up (the event in full, ticket options and variants, attachments, sections, costs, uploads, calendar file, alias); 1.51.9 series, season passes, bundles, coupons and campuses; 1.51.10 managing registrations (the staff lists, status, at the door, bulk actions, items, coupons, attendees, attendee forms); 1.51.11 money, staff side (payments, cashup, provider transactions, waitlist, sponsorship, consent, form builder, feedback); 1.51.12 tickets and attendance, staff side (tickets, scan locks, attendance, allocations); 1.51.13 kids check-in and volunteer rosters; 1.51.14 people and messaging (users, WhatsApp, broadcasts, scheduled emails, automations, banner, saved filters, dashboard, stats, analytics, reports); 1.51.15 privacy and admin (privacy, admin, settings, setup, Hub, outbound webhooks, backups); 1.51.16 **incoming webhooks and links in sent messages**: Yoco, PayFast and WAWP webhooks and the links in emails and WhatsApp (unsubscribe, consent, ticket transfer, calendar feeds, waitlist offers) get v2 URLs — new messages and provider registrations use them, and the v1 paths keep answering (links by a 308 redirect to v2, provider webhooks handled by the same code, since providers may not follow a redirect on a POST). Each puts its area's endpoints on v2 (1.51.1 – 1.51.10 by moving the logic into TS services; from 1.51.11 by `v1Route`, which runs the v1 handler behind a v2 route — moving those handlers into TS services is a 2.x clean-up that doesn't change the API), its screens onto `apiV2`, and its v1 routes into `SUCCESSORS` | 2.0 can then remove v1 | | 12 | **2.0.0** | **AI helpers** (§15 — headline feature: draft an event, summarise reports and feedback, draft messages, improve text; through the Hub with a rand cap per licence), v1 removed (all of it is on v2 by then; the old webhook URLs and links already sent in messages keep forwarding to v2), migration guide, marketing site/docs for selling | The release. AI needs the Hub (phase 6) for the key, metering and caps | Each phase should add matching help content (`frontend/src/content/help/`), diff --git a/apps/events/e2e/api-v2.spec.ts b/apps/events/e2e/api-v2.spec.ts index 681dbaa..25b2fb6 100644 --- a/apps/events/e2e/api-v2.spec.ts +++ b/apps/events/e2e/api-v2.spec.ts @@ -240,6 +240,29 @@ test.describe("API v2", () => { } }); + test("tickets and attendance: mine, the register, a spreadsheet download, links that don't exist", async ({ request }) => { + const staff = { Authorization: `Bearer ${seed().users.staff.token}` }; + const user = { Authorization: `Bearer ${seed().users.user.token}` }; + const mine = await request.get(`${API}/api/v2/me/tickets`, { headers: user }); + expect(mine.status()).toBe(200); + expect(Array.isArray((await mine.json()).data)).toBe(true); + + const reg = await request.get(`${API}/api/v2/events/${seed().events.conference}/attendance`, { headers: staff }); + expect(reg.status()).toBe(200); + + const xlsx = await request.get(`${API}/api/v2/events/${seed().events.conference}/attendance/export?format=xlsx`, { headers: staff }); + expect(xlsx.status()).toBe(200); + expect(xlsx.headers()["content-type"]).toContain("spreadsheetml"); + expect(xlsx.headers()["content-disposition"]).toContain(".xlsx"); + expect((await xlsx.body()).subarray(0, 2).toString()).toBe("PK"); + + // A code that isn't a certificate is an answer, not an error. + expect((await (await request.get(`${API}/api/v2/certificates/verify/NO-SUCH-CODE`)).json()).data).toEqual({ valid: false }); + const transfer = await request.get(`${API}/api/v2/ticket-transfers/not-a-real-token`); + expect(transfer.status()).toBeGreaterThanOrEqual(400); + expect((await transfer.json()).error.code).toMatch(/NOT_FOUND|VALIDATION_FAILED/); + }); + test("an admin can read the OpenAPI reference at /docs/v2", async ({ page, request }) => { const headers = { Authorization: `Bearer ${seed().users.user.token}` }; expect((await request.get(`${API}/api/v2/openapi.json`, { headers })).status()).toBe(403); diff --git a/apps/events/frontend/package-lock.json b/apps/events/frontend/package-lock.json index 47736a9..d4e6070 100644 --- a/apps/events/frontend/package-lock.json +++ b/apps/events/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "hope-events-frontend", - "version": "1.51.11", + "version": "1.51.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hope-events-frontend", - "version": "1.51.11", + "version": "1.51.12", "dependencies": { "@dnd-kit/core": "^6.3.1", "@hookform/resolvers": "^5.2.1", diff --git a/apps/events/frontend/package.json b/apps/events/frontend/package.json index 05baf8d..53898f5 100644 --- a/apps/events/frontend/package.json +++ b/apps/events/frontend/package.json @@ -1,6 +1,6 @@ { "name": "hope-events-frontend", - "version": "1.51.11", + "version": "1.51.12", "private": true, "scripts": { "dev": "next dev", diff --git a/apps/events/frontend/src/app/certificates/verify/[code]/page.tsx b/apps/events/frontend/src/app/certificates/verify/[code]/page.tsx index 9aa1f35..6b20f37 100644 --- a/apps/events/frontend/src/app/certificates/verify/[code]/page.tsx +++ b/apps/events/frontend/src/app/certificates/verify/[code]/page.tsx @@ -2,8 +2,8 @@ import { Metadata } from "next"; import { BadgeCheck, ShieldX } from "lucide-react"; import { Navbar } from "@/components/layout/Navbar"; import { Footer } from "@/components/layout/Footer"; -import { apiFetch } from "@/lib/api"; import { formatDate } from "@/lib/date"; +import { apiV2Data } from "@/lib/apiV2"; export const dynamic = "force-dynamic"; @@ -20,7 +20,7 @@ export default async function VerifyCertificatePage({ params }: { params: Promis const { code } = await params; let result: Verification = { valid: false }; try { - result = await apiFetch(`/api/attendance/certificates/verify/${encodeURIComponent(code)}`, { nextOptions: { cache: "no-store" } }); + result = await (apiV2Data("get", "/certificates/verify/{code}", { params: { code: code }, nextOptions: { cache: "no-store" } }) as Promise); } catch { result = { valid: false }; } diff --git a/apps/events/frontend/src/app/dashboard/staff/event-tickets/page.tsx b/apps/events/frontend/src/app/dashboard/staff/event-tickets/page.tsx index 1e9670c..b849e0b 100644 --- a/apps/events/frontend/src/app/dashboard/staff/event-tickets/page.tsx +++ b/apps/events/frontend/src/app/dashboard/staff/event-tickets/page.tsx @@ -2,7 +2,7 @@ import React, { Suspense, useEffect, useMemo, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; -import { apiFetch, fetchManagedEvents } from "@/lib/api"; +import { fetchManagedEvents } from "@/lib/api"; import { useDismissingState } from "@/hooks/useDismissingState"; import { useRouter, useSearchParams } from "next/navigation"; import { formatDate } from "@/lib/date"; @@ -13,6 +13,7 @@ import { errorMessage } from "@/lib/utils"; import type { Event, Ticket as TicketRecord } from "@/types"; import { BackLink } from "@/components/shared/BackLink"; import { EventPicker } from "@/components/shared/EventPicker"; +import { apiV2Data } from "@/lib/apiV2"; function EventTicketsContent() { const { token, user } = useAuth(); @@ -82,10 +83,10 @@ function EventTicketsContent() { setLoading(true); setError(null); try { - const list = await apiFetch( - `/api/tickets/event/${encodeURIComponent(eventId)}`, - { authToken: token } - ); + const list = await (apiV2Data("get", "/events/{id}/tickets", { + params: { id: eventId }, + authToken: token, + }) as Promise); setTickets(list); } catch (e) { setError(errorMessage(e) || "Failed to load tickets"); diff --git a/apps/events/frontend/src/app/dashboard/staff/my-groups/page.tsx b/apps/events/frontend/src/app/dashboard/staff/my-groups/page.tsx index 6b08c6f..36530a5 100644 --- a/apps/events/frontend/src/app/dashboard/staff/my-groups/page.tsx +++ b/apps/events/frontend/src/app/dashboard/staff/my-groups/page.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; -import { apiFetch } from "@/lib/api"; import { formatDate } from "@/lib/date"; import { Users } from "lucide-react"; import { BackLink } from "@/components/shared/BackLink"; +import { apiV2Data } from "@/lib/apiV2"; type Member = { id: string; name: string; gender: string | null; dateOfBirth: string | null; phone: string | null; @@ -30,7 +30,7 @@ export default function MyGroupsPage() { useEffect(() => { if (!token) return; - apiFetch<{ medicalShown: boolean; groups: MyGroup[] }>("/api/allocations/my-groups", { authToken: token }) + (apiV2Data("get", "/me/allocation-groups", { authToken: token }) as Promise<{ medicalShown: boolean; groups: MyGroup[] }>) .then(setData).catch(e => setError(e?.message || "Failed to load your groups")); }, [token]); diff --git a/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx b/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx index 98b8f54..2f7a5f2 100644 --- a/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx +++ b/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { QRScanner, QRScannerHandle } from "@/components/qr/QRScanner"; import { useAuth } from "@/hooks/useAuth"; -import { apiFetch, fetchManagedEvents } from "@/lib/api"; +import { fetchManagedEvents } from "@/lib/api"; import { useDismissingState } from "@/hooks/useDismissingState"; import { QrCode } from "lucide-react"; import { useOfflineScanning } from "@/components/scanner/useOfflineScanning"; @@ -14,7 +14,7 @@ import type { Event, RecentScan, ScanStats, Section } from "@/types"; import { EventPicker } from "@/components/shared/EventPicker"; import { activeSessions, currentSessionLabel, formatSessionWhen, sessionLabel } from "@/lib/sessions"; import { BackLink } from "@/components/shared/BackLink"; -import { apiV2 } from "@/lib/apiV2"; +import { apiV2, apiV2Data } from "@/lib/apiV2"; import { listSections } from "@/lib/eventSetup"; // What the confirm step needs, from GET /api/v2/checkin/{qrCode}. Offline scans build the @@ -330,7 +330,7 @@ export default function TicketScanningPage() { const loadRecent = useCallback(async () => { if (!token) return; try { - const list = await apiFetch(`/api/tickets/scans/recent?limit=10`, { authToken: token }); + const list = await (apiV2Data("get", "/tickets/scans/recent", { query: { limit: "10" }, authToken: token }) as Promise); setRecentScans(list); } catch {} }, [token]); @@ -338,7 +338,7 @@ export default function TicketScanningPage() { if (!token) return; try { setLoadingStats(true); - const s = await apiFetch(`/api/tickets/scans/stats`, { authToken: token }); + const s = await (apiV2Data("get", "/tickets/scans/stats", { authToken: token }) as Promise); setStats(s); } catch {} finally { setLoadingStats(false); diff --git a/apps/events/frontend/src/app/dashboard/supervisor/allocations/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/allocations/page.tsx index c3957d6..8eebc2d 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/allocations/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/allocations/page.tsx @@ -4,13 +4,14 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; import { useRouter } from "next/navigation"; import { DndContext, DragEndEvent, PointerSensor, TouchSensor, useDraggable, useDroppable, useSensor, useSensors } from "@dnd-kit/core"; -import { apiFetch, fetchManagedEvents } from "@/lib/api"; +import { fetchManagedEvents } from "@/lib/api"; import { useDismissingState } from "@/hooks/useDismissingState"; import { BedDouble, Plus, Wand2, Printer, Trash2, Pencil, Eraser } from "lucide-react"; import { errorMessage } from "@/lib/utils"; import type { Event } from "@/types"; import { BackLink } from "@/components/shared/BackLink"; import { EventPicker } from "@/components/shared/EventPicker"; +import { apiV2Data, apiV2Raw } from "@/lib/apiV2"; type Group = { id: string; name: string; capacity: number | null; gender: "male" | "female" | null; leaderUserId: string | null; leader?: { id: string; name: string } | null }; type AllocSet = { id: string; name: string; showOnTicket: boolean; groups: Group[]; assignments: { attendeeId: string; groupId: string }[] }; @@ -107,7 +108,7 @@ export default function AllocationsPage() { const load = useCallback(async () => { if (!token || !eventId) return; try { - const b = await apiFetch(`/api/allocations/event/${encodeURIComponent(eventId)}`, { authToken: token }); + const b = await (apiV2Data("get", "/events/{id}/allocations", { params: { id: eventId }, authToken: token }) as Promise); setBoard(b); setSetId(id => (b.sets.some(s => s.id === id) ? id : b.sets[0]?.id || "")); } catch (e) { @@ -121,8 +122,9 @@ export default function AllocationsPage() { const membersOf = (groupId: string) => (board?.attendees || []).filter(p => groupOf.get(p.id) === groupId); const unassigned = (board?.attendees || []).filter(p => !groupOf.has(p.id)); - const call = async (path: string, method: string, body?: unknown): Promise => - apiFetch(path, { method, authToken: token!, ...(body !== undefined ? { body } : {}) }); + // Paths are API v2's. + const call = async (path: string, method: "get" | "post" | "put" | "patch" | "delete", body?: unknown): Promise => + apiV2Raw(method, path, { authToken: token, ...(body !== undefined ? { body } : {}) }); const onDragEnd = async (e: DragEndEvent) => { if (!current || !e.over) return; @@ -139,7 +141,7 @@ export default function AllocationsPage() { }), })); try { - await call(`/api/allocations/sets/${current.id}/assignments`, "PUT", { attendeeId, groupId }); + await call(`/allocation-sets/${current.id}/assignments`, "put", { attendeeId, groupId }); } catch (err) { setError(errorMessage(err) || "Couldn't move them"); load(); @@ -160,21 +162,21 @@ export default function AllocationsPage() { }; const addSet = () => run(async () => { - const s = await call<{ id: string }>("/api/allocations/sets", "POST", { eventId, name: newSetName || "Rooms" }); + const s = await call<{ id: string }>("/allocation-sets", "post", { eventId, name: newSetName || "Rooms" }); setNewSetName(""); setSetId(s.id); }); const saveGroup = () => groupForm && current && run(async () => { const body = { name: groupForm.name, capacity: groupForm.capacity || null, gender: groupForm.gender || null, leaderUserId: groupForm.leaderUserId || null }; - if (groupForm.id) await call(`/api/allocations/groups/${groupForm.id}`, "PUT", body); - else await call(`/api/allocations/sets/${current.id}/groups`, "POST", body); + if (groupForm.id) await call(`/allocation-groups/${groupForm.id}`, "patch", body); + else await call(`/allocation-sets/${current.id}/groups`, "post", body); setGroupForm(null); }); const printLists = async (master: boolean, medical: boolean) => { if (!current || !board) return; try { - const data = await apiFetch(`/api/allocations/sets/${current.id}/lists${medical ? "?medical=true" : ""}`, { authToken: token! }); + const data = await apiV2Raw("get", `/allocation-sets/${current.id}/lists`, { query: { medical: medical ? "true" : undefined }, authToken: token }); const w = window.open("", "_blank"); if (!w) return; const row = (m: ListMember) => `${esc(m.name)}${esc(genderLabel(m.gender))}${esc(ageOn(m.dateOfBirth, board.event.startDate) ?? "")}` @@ -249,19 +251,19 @@ export default function AllocationsPage() { <>
- - + + {board.event.requiresParentalConsent && ( )} - - + +
@@ -304,7 +306,7 @@ export default function AllocationsPage() { - + }> {members.map(p => )} diff --git a/apps/events/frontend/src/app/dashboard/supervisor/at-the-door/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/at-the-door/page.tsx index 72dd334..8d38312 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/at-the-door/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/at-the-door/page.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; import { useRouter } from "next/navigation"; -import { apiFetch, fetchManagedEvents, fetchEvent } from "@/lib/api"; +import { fetchManagedEvents, fetchEvent } from "@/lib/api"; import { scoreUser } from "@/lib/fuzzyMatch"; import { useDismissingState } from "@/hooks/useDismissingState"; import { CouponCodeField, AppliedCoupon } from "@/components/shared/CouponCodeField"; @@ -885,7 +885,7 @@ function DoorTicketsPanel({ token, eventId }: { token: string | null; eventId: s (async () => { try { setLoading(true); - const res = await apiFetch(`/api/tickets/event/${eventId}`, { authToken: token }); + const res = await (apiV2Data("get", "/events/{id}/tickets", { params: { id: eventId }, authToken: token }) as Promise); setAllTickets(ticketsFrom(res)); } catch { setAllTickets([]); @@ -919,7 +919,7 @@ function DoorTicketsPanel({ token, eventId }: { token: string | null; eventId: s if (!token || !eventId) return; try { setLoading(true); - const res = await apiFetch(`/api/tickets/event/${eventId}`, { authToken: token }); + const res = await (apiV2Data("get", "/events/{id}/tickets", { params: { id: eventId }, authToken: token }) as Promise); setAllTickets(ticketsFrom(res)); } catch { setAllTickets([]); @@ -1043,7 +1043,7 @@ function DoorCheckInPanel({ token, eventId, registration, setError, setInfo }: { if (!token || !eventId) return; try { setLoading(true); - const res = await apiFetch(`/api/tickets/event/${eventId}`, { authToken: token }); + const res = await (apiV2Data("get", "/events/{id}/tickets", { params: { id: eventId }, authToken: token }) as Promise); const tickets = ticketsFrom(res); setTicketsForEvent(tickets.filter((t) => t.registrationOption?.eventOption?.isMainTicket)); } catch { @@ -1536,10 +1536,9 @@ function SendTicketsModal({ open, onClose, token, registration }: { } setSending(true); try { - await apiFetch("/api/tickets/send-to", { - method: "POST", - authToken: token, - body: { + await apiV2Data("post", "/tickets/send", { + authToken: token, + body: { registrationId: registration?.id, channel, overrideEmail: email.trim() || undefined, diff --git a/apps/events/frontend/src/app/dashboard/supervisor/attendance/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/attendance/page.tsx index 015c842..03c4450 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/attendance/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/attendance/page.tsx @@ -4,13 +4,14 @@ import React, { Suspense, useCallback, useEffect, useMemo, useState } from "reac import { useRouter, useSearchParams } from "next/navigation"; import { ClipboardCheck, Check, Download, FileSpreadsheet, FileText, Send, Award, Search, Ban } from "lucide-react"; import { useAuth } from "@/hooks/useAuth"; -import { apiFetch, API_BASE, fetchManagedEvents } from "@/lib/api"; +import { API_BASE, fetchManagedEvents } from "@/lib/api"; import { useDismissingState } from "@/hooks/useDismissingState"; import { errorMessage } from "@/lib/utils"; import { fetchApiFile, saveBlob } from "@/lib/export"; import type { AttendanceRegister, AttendanceRow, Event } from "@/types"; import { BackLink } from "@/components/shared/BackLink"; import { EventPicker } from "@/components/shared/EventPicker"; +import { apiV2Data, apiV2Raw } from "@/lib/apiV2"; type Filter = "all" | "completed" | "not_completed" | "missed_recent"; @@ -57,7 +58,7 @@ function AttendancePageInner() { if (!token || !eventId) return; setBusy(true); try { - setReg(await apiFetch(`/api/attendance/${encodeURIComponent(eventId)}`, { authToken: token })); + setReg(await (apiV2Data("get", "/events/{id}/attendance", { params: { id: eventId }, authToken: token }) as Promise)); } catch (e) { setError(errorMessage(e) || "Failed to load the register"); } finally { @@ -93,7 +94,7 @@ function AttendancePageInner() { try { // Picked sessions have a ticket per session. const ticketId = row.sessionTickets?.[sessionId] || row.ticketId; - await apiFetch(`/api/attendance/${eventId}/mark`, { method: "POST", authToken: token, body: { ticketId, sessionId, present } }); + await apiV2Data("post", "/events/{id}/attendance", { params: { id: eventId }, authToken: token, body: { ticketId, sessionId, present } }); const col = reg?.columns.find(c => c.id === sessionId); setInfo(`${row.name || "Attendee"} marked ${present ? "present" : "absent"}${multi && col ? ` for ${col.label}` : ""}.`); await load(); @@ -108,7 +109,7 @@ function AttendancePageInner() { if (!token) return; setBusy(true); try { - const r = await apiFetch>(path, { method: "POST", authToken: token, body }); + const r = await apiV2Raw>("post", path, { authToken: token, body }); setInfo(done(r)); await load(); } catch (e) { @@ -173,8 +174,8 @@ function AttendancePageInner() { )}
- - + +
@@ -191,9 +192,9 @@ function AttendancePageInner() {
Certificates are issued automatically when the event ends. You can also: - - - + + +
)} @@ -248,12 +249,12 @@ function AttendancePageInner() { {r.certificate && !r.certificate.revokedAt ? (
{r.certificate.code} - - {canManage && } - {canManage && } + + {canManage && } + {canManage && }
) : canManage ? ( - ) : —} diff --git a/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx index 1b6b299..ab5e8d4 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx @@ -1694,7 +1694,7 @@ function EventModal({ mode, event: ev, source, onClose, onSuccess }: EventModalP uploadButton={(onUploaded) => } onPreview={async () => { if (!token) return; - openBlob(await fetchApiFile(API_BASE, token, "/api/attendance/certificates/preview", { method: "POST", body: { title: draft.title || "Your event", config: attendance.certificate } })); + openBlob(await fetchApiFile(API_BASE, token, "/api/v2/certificates/preview", { method: "POST", body: { title: draft.title || "Your event", config: attendance.certificate } })); }} /> )} diff --git a/apps/events/frontend/src/app/dashboard/supervisor/kids/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/kids/page.tsx index cb7caa6..423c7d7 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/kids/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/kids/page.tsx @@ -9,6 +9,7 @@ import { useDismissingState } from "@/hooks/useDismissingState"; import { Baby, Plus, Trash2 } from "lucide-react"; import { BackLink } from "@/components/shared/BackLink"; import { EventPicker } from "@/components/shared/EventPicker"; +import { apiV2Data } from "@/lib/apiV2"; type Room = { id: string; name: string; capacity: number | null; minAge: number | null; maxAge: number | null; ratio: number | null; order: number }; type Settings = { @@ -69,11 +70,11 @@ export default function KidsSetupPage() { const rooms = s?.sets.find(x => x.id === s.event.kidsRoomSetId)?.groups || []; const roomBody = (d: { name: string; minAge: string; maxAge: string; capacity: string; ratio: string }) => ({ name: d.name, minAge: num(d.minAge), maxAge: num(d.maxAge), capacity: num(d.capacity), ratio: num(d.ratio) }); const addRoom = () => s?.event.kidsRoomSetId && run( - () => apiFetch(`/api/allocations/sets/${s.event.kidsRoomSetId}/groups`, { method: "POST", authToken: token, body: roomBody(newRoom) }), + () => apiV2Data("post", "/allocation-sets/{id}/groups", { params: { id: s.event.kidsRoomSetId! }, authToken: token, body: roomBody(newRoom) }), "Room added.", ).then(ok => { if (ok) setNewRoom({ name: "", minAge: "", maxAge: "", capacity: "", ratio: "" }); }); - const saveRoom = (id: string) => run(() => apiFetch(`/api/allocations/groups/${id}`, { method: "PUT", authToken: token, body: roomBody(draft[id]) }), "Room saved."); - const deleteRoom = (r: Room) => confirm(`Delete ${r.name}? Children checked in to it now will need a new room.`) && run(() => apiFetch(`/api/allocations/groups/${r.id}`, { method: "DELETE", authToken: token }), "Room deleted."); + const saveRoom = (id: string) => run(() => apiV2Data("patch", "/allocation-groups/{id}", { params: { id: id }, authToken: token, body: roomBody(draft[id]) }), "Room saved."); + const deleteRoom = (r: Room) => confirm(`Delete ${r.name}? Children checked in to it now will need a new room.`) && run(() => apiV2Data("delete", "/allocation-groups/{id}", { params: { id: r.id }, authToken: token }), "Room deleted."); const roomRow = (d: { name: string; minAge: string; maxAge: string; capacity: string; ratio: string }, set: (v: typeof d) => void) => ( <> diff --git a/apps/events/frontend/src/app/dashboard/supervisor/offline-scans/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/offline-scans/page.tsx index 2e0f955..179eea3 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/offline-scans/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/offline-scans/page.tsx @@ -3,13 +3,14 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; import { useRouter } from "next/navigation"; -import { apiFetch, fetchManagedEvents } from "@/lib/api"; +import { fetchManagedEvents } from "@/lib/api"; import { useDismissingState } from "@/hooks/useDismissingState"; import { WifiOff, Unlock, CheckCircle2 } from "lucide-react"; import { errorMessage } from "@/lib/utils"; import type { Event } from "@/types"; import { BackLink } from "@/components/shared/BackLink"; import { EventPicker } from "@/components/shared/EventPicker"; +import { apiV2Data } from "@/lib/apiV2"; type Lock = { id: string; sectionName: string | null; deviceName: string | null; user: { name: string }; lockedAt: string; snapshotAt: string | null; lastSyncAt: string | null }; type Report = { @@ -55,8 +56,8 @@ export default function OfflineScansPage() { if (!token || !eventId) return; try { const [l, r] = await Promise.all([ - apiFetch(`/api/scan-locks?eventId=${encodeURIComponent(eventId)}`, { authToken: token }), - apiFetch(`/api/scan-locks/reports?eventId=${encodeURIComponent(eventId)}${onlyOpen ? "&unreviewed=true" : ""}`, { authToken: token }), + (apiV2Data("get", "/scan-locks", { query: { eventId: eventId }, authToken: token }) as Promise), + (apiV2Data("get", "/scan-locks/reports", { query: { eventId, ...(onlyOpen ? { unreviewed: "true" } : {}) }, authToken: token }) as Promise), ]); setLocks(l); setReports(r.filter(x => !onlyOpen || x.conflicts.length > 0 || x.afterForceRelease)); @@ -68,14 +69,14 @@ export default function OfflineScansPage() { const forceRelease = async (l: Lock) => { try { - const res = await apiFetch<{ message: string }>(`/api/scan-locks/${l.id}/force-release`, { method: "POST", authToken: token! }); + const res = await (apiV2Data("post", "/scan-locks/{id}/force-release", { params: { id: l.id }, authToken: token, body: {} }) as Promise<{ message: string }>); setInfo(res.message); load(); } catch (e) { setError(errorMessage(e) || "Failed"); } }; const review = async (r: Report) => { try { - await apiFetch(`/api/scan-locks/reports/${r.id}/review`, { method: "POST", authToken: token! }); + await apiV2Data("post", "/scan-locks/reports/{id}/review", { params: { id: r.id }, authToken: token, body: {} }); load(); } catch (e) { setError(errorMessage(e) || "Failed"); } }; diff --git a/apps/events/frontend/src/app/dashboard/user/page.tsx b/apps/events/frontend/src/app/dashboard/user/page.tsx index 9f6c5a2..896bb77 100644 --- a/apps/events/frontend/src/app/dashboard/user/page.tsx +++ b/apps/events/frontend/src/app/dashboard/user/page.tsx @@ -1,7 +1,7 @@ "use client"; import React, { useEffect, useMemo, useState } from "react"; import { useAuth } from "@/hooks/useAuth"; -import { apiFetch, createFullPaymentCheckout, fetchEvent } from "@/lib/api"; +import { createFullPaymentCheckout, fetchEvent } from "@/lib/api"; import { apiV2, apiV2Data } from "@/lib/apiV2"; import { useOnlinePayments } from "@/lib/onlinePayments"; import { useRouter } from "next/navigation"; @@ -125,7 +125,7 @@ export default function UserDashboardPage() { // their payments had already resolved. const [myRegs, myTicks] = await Promise.all([ (apiV2Data("get", "/me/registrations/full", { query: { past: showPast ? "true" : "false" }, authToken: token }) as Promise), - apiFetch("/api/tickets/mytickets", { authToken: token }), + (apiV2Data("get", "/me/tickets", { authToken: token }) as Promise), ]); setRegistrations(myRegs); setTickets(myTicks); @@ -230,11 +230,10 @@ export default function UserDashboardPage() { // Open loading dialog immediately setDialog({ open: true, message: "Sending tickets…", loading: true }); try { - const res = await apiFetch<{ message?: string }>("/api/tickets/email", { - method: "POST", + const res = await (apiV2Data("post", "/me/tickets/email", { body: { ticketIds }, authToken: token, - }); + }) as Promise<{ message?: string }>); const msg = (res && res.message) ? res.message : `${ticketIds.length} ticket(s) emailed successfully.`; setDialog({ open: true, message: msg, loading: false }); } catch (e) { @@ -250,11 +249,10 @@ export default function UserDashboardPage() { setInfo(null); setDialog({ open: true, message: "Sending to WhatsApp…", loading: true }); try { - const res = await apiFetch<{ message?: string }>("/api/tickets/email", { - method: "POST", + const res = await (apiV2Data("post", "/me/tickets/email", { body: { ticketIds, channel: "whatsapp" }, authToken: token, - }); + }) as Promise<{ message?: string }>); const msg = (res && res.message) ? res.message : `${ticketIds.length} ticket(s) sent to WhatsApp.`; setDialog({ open: true, message: msg, loading: false }); } catch (e) { @@ -422,7 +420,7 @@ export default function UserDashboardPage() { const totalDue = updated?.totalDueComputed ?? 0; setBilling(prev => ({ ...prev, [activeRegId]: { totalDue, totalPaid, outstanding: Math.max(0, totalDue - totalPaid), payments: pays } })); try { - const myTicks = await apiFetch("/api/tickets/mytickets", { authToken: token }); + const myTicks = await (apiV2Data("get", "/me/tickets", { authToken: token }) as Promise); setTickets(myTicks); } catch {} setCodeInput(""); @@ -442,7 +440,7 @@ export default function UserDashboardPage() { try { const myRegs = await (apiV2Data("get", "/me/registrations/full", { query: { past: showPast ? "true" : "false" }, authToken: token }) as Promise); setRegistrations(myRegs); - const myTicks = await apiFetch("/api/tickets/mytickets", { authToken: token }); + const myTicks = await (apiV2Data("get", "/me/tickets", { authToken: token }) as Promise); setTickets(myTicks); } catch {} }; @@ -602,7 +600,7 @@ export default function UserDashboardPage() { const myRegs = await (apiV2Data("get", "/me/registrations/full", { query: { past: showPast ? "true" : "false" }, authToken: token }) as Promise); setRegistrations(myRegs); try { - const myTicks = await apiFetch("/api/tickets/mytickets", { authToken: token }); + const myTicks = await (apiV2Data("get", "/me/tickets", { authToken: token }) as Promise); setTickets(myTicks); } catch {} // Recompute billing totals using the backend's tranche-aware totalDueComputed @@ -921,7 +919,7 @@ export default function UserDashboardPage() { Waiting for {t.transferRequests?.[0]?.toName} to accept