Paddy
2405625f99
feedback.auth.ts and tickets.auth.ts each become one binding to requireAppAccess. Everything downstream was already written against requireAdminAuth and res.locals.admin, and both still mean what they meant, so no router or service changed. What changed is the policy: an activated @nachklang.art account is no longer sufficient, an explicit per-app permission is. Three things followed from that and are not obvious from the diff: - APP_ORIGINS gets a production default. It feeds better-auth's trustedOrigins, and this is the first time the tickets and feedback origins matter there - before, the only browser origin that ever reached /admin/auth was the admin app itself. An origin missing from that list fails in a way that is easy to misread: sign-in works, the app works, and only sign-out returns an origin error. - Nothing reads X-Session-* any more; these two files were the last readers, and the calendar module passes its session in query parameters. The headers stay in the CORS allowedHeaders only so a browser still running a pre-cutover bundle gets a clean 401 rather than a preflight failure, and can come out once both frontends are deployed. - 40 admin operations documented a required X-Session-Id/X-Session-Key in swagger. They now declare the AdminSessionCookie scheme the admin module already defined, and each documents a 403 next to its 401. The integration assertions flip as their own comment predicted: one admin cookie opens both /feedback/admin/me and /tickets/admin/me, a user holding only feedback gets 200 and 403 respectively, and a legacy header session gets 401. The unit test that covered the old header authenticator is replaced by one asserting each module is bound to its own app and that neither consults the calendar users service. 163 unit tests and 43 integration tests green. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
188 lines
6.8 KiB
TypeScript
188 lines
6.8 KiB
TypeScript
import express, {Request, Response} from 'express';
|
|
import * as EventsAdminService from './events.admin.service.js';
|
|
import {sendServerError} from '../tickets.errors.js';
|
|
|
|
export const eventsAdminRouter = express.Router();
|
|
|
|
/**
|
|
* @swagger
|
|
* /tickets/admin/events:
|
|
* get:
|
|
* summary: List concerts for the admin event picker
|
|
* description: Wraps the Calendar module's public-calendar admin listing (includes DRAFT events).
|
|
* tags: [tickets-admin]
|
|
* security:
|
|
* - AdminSessionCookie: []
|
|
* responses:
|
|
* 200:
|
|
* description: Success
|
|
* 401:
|
|
* description: Unauthorized
|
|
* 403:
|
|
* description: Signed in without the permission for this app, or account disabled
|
|
*/
|
|
eventsAdminRouter.get('/', async (req: Request, res: Response) => {
|
|
try {
|
|
res.status(200).send(await EventsAdminService.listEventsForPicker());
|
|
} catch (e: any) {
|
|
sendServerError(res, e);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* @swagger
|
|
* /tickets/admin/events/available:
|
|
* get:
|
|
* summary: List public-calendar events not yet added to the ticket shop
|
|
* description: Source list for the "add a concert" picker - the public calendar holds more than concerts, so events only appear in the ticket shop once explicitly added.
|
|
* tags: [tickets-admin]
|
|
* security:
|
|
* - AdminSessionCookie: []
|
|
* responses:
|
|
* 200:
|
|
* description: Success
|
|
* 401:
|
|
* description: Unauthorized
|
|
* 403:
|
|
* description: Signed in without the permission for this app, or account disabled
|
|
*/
|
|
eventsAdminRouter.get('/available', async (req: Request, res: Response) => {
|
|
try {
|
|
res.status(200).send(await EventsAdminService.listAvailableEventsToAdd());
|
|
} catch (e: any) {
|
|
sendServerError(res, e);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* @swagger
|
|
* /tickets/admin/events/{eventId}/stats:
|
|
* get:
|
|
* summary: Get a concert's voucher/capacity stats
|
|
* tags: [tickets-admin]
|
|
* security:
|
|
* - AdminSessionCookie: []
|
|
* parameters:
|
|
* - in: path
|
|
* name: eventId
|
|
* required: true
|
|
* schema:
|
|
* type: integer
|
|
* responses:
|
|
* 200:
|
|
* description: Success
|
|
* content:
|
|
* application/json:
|
|
* schema:
|
|
* $ref: '#/components/schemas/EventStats'
|
|
* 401:
|
|
* description: Unauthorized
|
|
* 403:
|
|
* description: Signed in without the permission for this app, or account disabled
|
|
*/
|
|
eventsAdminRouter.get('/:eventId/stats', async (req: Request, res: Response) => {
|
|
try {
|
|
res.status(200).send(await EventsAdminService.getEventStats(Number(req.params.eventId)));
|
|
} catch (e: any) {
|
|
sendServerError(res, e);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* @swagger
|
|
* /tickets/admin/events/{eventId}/settings:
|
|
* put:
|
|
* summary: Set a concert's voucher settings
|
|
* description: Upserts capacity (null = uncapped), redemption deadline (null = none), and whether to collect a mailing address.
|
|
* tags: [tickets-admin]
|
|
* security:
|
|
* - AdminSessionCookie: []
|
|
* parameters:
|
|
* - in: path
|
|
* name: eventId
|
|
* required: true
|
|
* schema:
|
|
* type: integer
|
|
* requestBody:
|
|
* required: true
|
|
* content:
|
|
* application/json:
|
|
* schema:
|
|
* type: object
|
|
* properties:
|
|
* capacity:
|
|
* type: integer
|
|
* nullable: true
|
|
* redemptionDeadline:
|
|
* type: string
|
|
* format: date-time
|
|
* nullable: true
|
|
* collectAddress:
|
|
* type: boolean
|
|
* requireAddress:
|
|
* type: boolean
|
|
* description: Only meaningful when collectAddress is true.
|
|
* responses:
|
|
* 200:
|
|
* description: Saved
|
|
* 401:
|
|
* description: Unauthorized
|
|
* 403:
|
|
* description: Signed in without the permission for this app, or account disabled
|
|
*/
|
|
eventsAdminRouter.put('/:eventId/settings', async (req: Request, res: Response) => {
|
|
try {
|
|
const {capacity, redemptionDeadline, collectAddress, requireAddress} = req.body || {};
|
|
await EventsAdminService.setEventSettings(Number(req.params.eventId), {
|
|
capacity: capacity ?? null,
|
|
// The mariadb driver needs an actual Date to serialize a DATETIME
|
|
// column correctly - a raw ISO string (as arrives over JSON) gets
|
|
// rejected with "Incorrect datetime value".
|
|
redemptionDeadline: redemptionDeadline ? new Date(redemptionDeadline) : null,
|
|
collectAddress: !!collectAddress,
|
|
requireAddress: !!collectAddress && !!requireAddress
|
|
});
|
|
res.status(200).send({status: 'OK'});
|
|
} catch (e: any) {
|
|
sendServerError(res, e);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* @swagger
|
|
* /tickets/admin/events/{eventId}/settings:
|
|
* delete:
|
|
* summary: Remove an event from the ticket shop
|
|
* description: Deletes its settings row, so it drops out of the picker and reappears in the "add" list. Refused with 409 if vouchers already reference the event - existing vouchers/redemptions stay valid either way.
|
|
* tags: [tickets-admin]
|
|
* security:
|
|
* - AdminSessionCookie: []
|
|
* parameters:
|
|
* - in: path
|
|
* name: eventId
|
|
* required: true
|
|
* schema:
|
|
* type: integer
|
|
* responses:
|
|
* 200:
|
|
* description: Removed
|
|
* 409:
|
|
* description: Vouchers already reference this event
|
|
* 401:
|
|
* description: Unauthorized
|
|
* 403:
|
|
* description: Signed in without the permission for this app, or account disabled
|
|
*/
|
|
eventsAdminRouter.delete('/:eventId/settings', async (req: Request, res: Response) => {
|
|
try {
|
|
const result = await EventsAdminService.removeEvent(Number(req.params.eventId));
|
|
if (result === 'HAS_VOUCHERS') {
|
|
res.status(409).send({status: 'HAS_VOUCHERS', message: 'Für dieses Konzert existieren bereits Gutscheine.'});
|
|
return;
|
|
}
|
|
res.status(200).send({status: 'OK'});
|
|
} catch (e: any) {
|
|
sendServerError(res, e);
|
|
}
|
|
});
|