fix: auth + double sending etc

apps/api/src/admin/admin.controller.ts

@@ -152,7 +152,7 @@ export class AdminController {
   @Post('images/cleanup')
   @HttpCode(HttpStatus.OK)
   cleanupImages(@Body(zod(dryRunSchema)) dto: Body<typeof dryRunSchema>, @CurrentUser() user: AuthUser) {
-    return this.admin.cleanupImages(dto.dryRun, user);
+    return this.admin.cleanupImages(dto.dryRun, { type: 'user', id: user.id });
   }
 
   @Post('email/test')

apps/api/src/admin/admin.module.ts

@@ -4,10 +4,11 @@ import { RemindersModule } from '../reminders/reminders.module';
 import { VenuesModule } from '../venues/venues.module';
 import { AdminController } from './admin.controller';
 import { AdminService } from './admin.service';
+import { HousekeepingService } from './housekeeping.service';
 
 @Module({
   imports: [ImagesModule, RemindersModule, VenuesModule],
   controllers: [AdminController],
-  providers: [AdminService],
+  providers: [AdminService, HousekeepingService],
 })
 export class AdminModule {}

apps/api/src/admin/admin.service.ts

@@ -7,7 +7,7 @@ import {
   SystemHealth,
 } from '@kooltap/shared';
 import { Prisma, PrismaService } from '../prisma/prisma.service';
-import { AuditService } from '../audit/audit.service';
+import { AuditEntry as AuditRecord, AuditService } from '../audit/audit.service';
 import { RealtimeService } from '../realtime/realtime.service';
 import { RemindersService } from '../reminders/reminders.service';
 import { VenuesService } from '../venues/venues.service';
@@ -38,6 +38,11 @@ const ORPHAN_IMAGE_GRACE_MS = 7 * 24 * 60 * 60 * 1000;
 
 const DAY_MS = 24 * 60 * 60 * 1000;
 
+/** Dashboard sessions that expired or were signed out before [before]; they can never be used again. */
+export const endedSessions = (before: Date): Prisma.RefreshTokenWhereInput => ({
+  OR: [{ expiresAt: { lt: before } }, { revokedAt: { lt: before } }],
+});
+
 /** Everything the superadmin page does. */
 @Injectable()
 export class AdminService {
@@ -387,9 +392,13 @@ export class AdminService {
     const venue = venueId ? { venueId } : {};
     const tabEvents = { ...venue, receivedAt: { lt: before } };
     const auditLog = { ...venue, createdAt: { lt: before } };
+    const refreshTokens = { ...endedSessions(before), ...(venueId ? { user: { venueId } } : {}) };
     const run: Record<PurgeTarget, () => Promise<number>> = {
       tabEvents: () => (dryRun ? this.prisma.tabEvent.count({ where: tabEvents }) : this.prisma.tabEvent.deleteMany({ where: tabEvents }).then((r) => r.count)),
       auditLog: () => (dryRun ? this.prisma.auditLog.count({ where: auditLog }) : this.prisma.auditLog.deleteMany({ where: auditLog }).then((r) => r.count)),
+      refreshTokens: () => (dryRun
+        ? this.prisma.refreshToken.count({ where: refreshTokens })
+        : this.prisma.refreshToken.deleteMany({ where: refreshTokens }).then((r) => r.count)),
     };
 
     const counts: Partial<Record<PurgeTarget, number>> = {};
@@ -401,7 +410,7 @@ export class AdminService {
   }
 
   /** Deletes pictures no product uses, after a grace period for terminals that upload before they link. */
-  async cleanupImages(dryRun: boolean, actor: AuthUser) {
+  async cleanupImages(dryRun: boolean, actor: AuditRecord['actor']) {
     const images = await this.prisma.productImage.findMany({
       where: { products: { none: {} }, createdAt: { lt: new Date(Date.now() - ORPHAN_IMAGE_GRACE_MS) } },
       select: { id: true, bytes: true },
@@ -409,7 +418,7 @@ export class AdminService {
     const bytes = images.reduce((sum, image) => sum + image.bytes, 0);
     if (!dryRun && images.length > 0) {
       await this.images.remove(images.map((image) => image.id));
-      await this.audit.log({ venueId: null, actor: { type: 'user', id: actor.id }, action: 'admin_images_cleaned', details: { count: images.length } });
+      await this.audit.log({ venueId: null, actor, action: 'admin_images_cleaned', details: { count: images.length } });
     }
     return { dryRun, count: images.length, bytes };
   }

apps/api/src/admin/housekeeping.service.ts

@@ -0,0 +1,53 @@
+import { Injectable, Logger, OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
+import { PrismaService } from '../prisma/prisma.service';
+import { AdminService, endedSessions } from './admin.service';
+
+const DAY_MS = 24 * 60 * 60 * 1000;
+
+// Out of the way of startup and the migrations, then once a day
+const FIRST_RUN_DELAY_MS = 5 * 60 * 1000;
+const INTERVAL_MS = DAY_MS;
+
+// Ended sessions are kept a while, so a superadmin can still see recent sign-outs while looking into something
+const ENDED_SESSION_RETENTION_MS = 7 * DAY_MS;
+
+/**
+ * Daily cleanup of what can never be used again: ended sessions, used and expired registration codes, and pictures
+ * no product uses. History (terminal events, audit log) is a choice, so it stays with the purge on the admin page.
+ * Every instance runs it; the deletes don't mind running twice.
+ */
+@Injectable()
+export class HousekeepingService implements OnApplicationBootstrap, OnApplicationShutdown {
+  private readonly logger = new Logger(HousekeepingService.name);
+  private timer: NodeJS.Timeout | null = null;
+
+  constructor(
+    private prisma: PrismaService,
+    private admin: AdminService,
+  ) {}
+
+  onApplicationBootstrap() {
+    // Tests run against a database they set up themselves
+    if (process.env.NODE_ENV === 'test') return;
+    this.timer = setTimeout(() => {
+      void this.run();
+      this.timer = setInterval(() => void this.run(), INTERVAL_MS).unref();
+    }, FIRST_RUN_DELAY_MS).unref();
+  }
+
+  onApplicationShutdown() {
+    if (this.timer) clearTimeout(this.timer);
+  }
+
+  /** Never throws: a failure is logged and the next run tries again. */
+  async run() {
+    try {
+      const sessions = await this.prisma.refreshToken.deleteMany({ where: endedSessions(new Date(Date.now() - ENDED_SESSION_RETENTION_MS)) });
+      const codes = await this.admin.cleanupRegistrationCodes();
+      const images = await this.admin.cleanupImages(false, { type: 'system', id: null });
+      this.logger.log(`Deleted ${sessions.count} ended session(s), ${codes.deleted} registration code(s), ${images.count} unused picture(s)`);
+    } catch (error) {
+      this.logger.error(`Housekeeping failed: ${error instanceof Error ? error.stack : error}`);
+    }
+  }
+}

apps/api/src/auth/auth.controller.ts

@@ -21,8 +21,10 @@ export class AuthController {
     return me;
   }
 
+  // A dashboard refreshes about every 15 minutes; this still leaves room for many staff behind a venue's shared IP
   @Post('refresh')
   @HttpCode(HttpStatus.OK)
+  @Throttle({ default: { limit: 30, ttl: 60_000 } })
   async refresh(@Req() req: Request, @Res({ passthrough: true }) res: Response): Promise<Me> {
     try {
       const { me, tokens } = await this.auth.refresh(req.cookies?.[REFRESH_COOKIE]);

apps/api/src/auth/auth.service.ts

@@ -78,9 +78,12 @@ export class AuthService {
       throw new BadRequestException({ code: 'wrong_password', message: 'The current password is not correct' });
     }
 
+    // Revoking the sessions also ends the other sessions' access tokens at once; the new tokens are issued after it,
+    // in the same second or later, so they stay valid
+    const now = new Date();
     await this.prisma.$transaction([
-      this.prisma.user.update({ where: { id: userId }, data: { passwordHash: await hashPassword(newPassword) } }),
-      this.prisma.refreshToken.updateMany({ where: { userId, revokedAt: null }, data: { revokedAt: new Date() } }),
+      this.prisma.user.update({ where: { id: userId }, data: { passwordHash: await hashPassword(newPassword), sessionsRevokedAt: now } }),
+      this.prisma.refreshToken.updateMany({ where: { userId, revokedAt: null }, data: { revokedAt: now } }),
     ]);
     await this.audit.log({ venueId: user.venueId, actor: { type: 'user', id: userId }, action: 'password_changed' });
     return { me: toMe(user), tokens: await this.issueTokens(userId) };

apps/api/src/common/logging.interceptor.ts

@@ -1,18 +1,28 @@
-import { CallHandler, ExecutionContext, Injectable, Logger, NestInterceptor } from '@nestjs/common';
+import { CallHandler, ExecutionContext, HttpException, Injectable, Logger, NestInterceptor } from '@nestjs/common';
 import { Observable, tap } from 'rxjs';
 
+/** One line per request, failed ones included: 4xx as a warning, 5xx as an error. */
 @Injectable()
 export class LoggingInterceptor implements NestInterceptor {
   private readonly logger = new Logger('HTTP');
 
   intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
-    const request = context.switchToHttp().getRequest();
+    const http = context.switchToHttp();
+    const request = http.getRequest();
     const start = Date.now();
+    const line = (status: number) => {
+      const actor = request.user?.id ?? request.device?.id ?? 'anonymous';
+      const venueId = request.user?.venueId ?? request.device?.venueId ?? '-';
+      return `${request.method} ${request.url} ${status} | actor=${actor} venue=${venueId} | ${Date.now() - start}ms`;
+    };
     return next.handle().pipe(
-      tap(() => {
-        const actor = request.user?.id ?? request.device?.id ?? 'anonymous';
-        const venueId = request.user?.venueId ?? request.device?.venueId ?? '-';
-        this.logger.log(`${request.method} ${request.url} | actor=${actor} venue=${venueId} | ${Date.now() - start}ms`);
+      tap({
+        next: () => this.logger.log(line(http.getResponse().statusCode)),
+        error: (error: unknown) => {
+          const status = error instanceof HttpException ? error.getStatus() : 500;
+          if (status >= 500) this.logger.error(line(status));
+          else this.logger.warn(line(status));
+        },
       }),
     );
   }

apps/api/src/email/resend.ts

@@ -3,6 +3,8 @@ import { RenderedEmail } from './email-templates.service';
 
 export type OutgoingEmail = RenderedEmail & { to: string };
 
+const SEND_TIMEOUT_MS = 15_000;
+
 /** Sends email through Resend (RESEND_API_KEY, RESEND_FROM_EMAIL). */
 @Injectable()
 export class Resend {
@@ -23,19 +25,26 @@ export class Resend {
 
   /**
    * Sends up to 100 emails in one request. Resend ignores a request with the same [idempotencyKey] for 24 hours, so a
-   * retry never emails twice. Returns Resend's error text, or null when sent.
+   * retry never emails twice. Returns Resend's error text, or null when sent. Gives up after [SEND_TIMEOUT_MS], so a
+   * slow Resend never holds up the request that sends.
    */
   async sendBatch(emails: OutgoingEmail[], idempotencyKey?: string): Promise<string | null> {
-    const res = await fetch('https://api.resend.com/emails/batch', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${this.apiKey}`,
-        ...(idempotencyKey ? { 'Idempotency-Key': idempotencyKey } : {}),
-      },
-      body: JSON.stringify(emails.map((email) => ({ from: this.from, ...email }))),
-    });
-    return res.ok ? null : await res.text();
+    try {
+      const res = await fetch('https://api.resend.com/emails/batch', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${this.apiKey}`,
+          ...(idempotencyKey ? { 'Idempotency-Key': idempotencyKey } : {}),
+        },
+        body: JSON.stringify(emails.map((email) => ({ from: this.from, ...email }))),
+        signal: AbortSignal.timeout(SEND_TIMEOUT_MS),
+      });
+      return res.ok ? null : await res.text();
+    } catch (error) {
+      if (error instanceof Error && error.name === 'TimeoutError') return `Resend did not answer within ${SEND_TIMEOUT_MS / 1000} seconds`;
+      return `Could not reach Resend: ${error instanceof Error ? error.message : error}`;
+    }
   }
 }
 

apps/api/src/images/images.service.ts

@@ -1,4 +1,5 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { randomBytes } from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { PrismaService } from '../prisma/prisma.service';
@@ -32,8 +33,9 @@ export class ImagesService {
 
     const file = this.file(image.id);
     await fs.mkdir(path.dirname(file), { recursive: true });
-    // Written next to it and renamed, so a picture is never read half-written
-    const temp = `${file}.${process.pid}.tmp`;
+    // Written next to it and renamed, so a picture is never read half-written. Unique, so two uploads of the same
+    // picture at once don't share a temp file
+    const temp = `${file}.${randomBytes(8).toString('hex')}.tmp`;
     await fs.writeFile(temp, image.bytes);
     await fs.rename(temp, file);
 

apps/dashboard/src/lib/api/client.ts

@@ -47,10 +47,13 @@ async function request(endpoint: string, init: RequestInit): Promise<Response> {
   }
 }
 
+// A 401 from these is the answer itself (wrong password, session over), not an expired access token
+const NO_REFRESH_ENDPOINTS = ['/auth/login', '/auth/refresh', '/auth/logout'];
+
 export async function api<T = unknown>(endpoint: string, init: RequestInit = {}): Promise<T> {
   let res = await request(endpoint, init);
 
-  if (res.status === 401 && !endpoint.startsWith('/auth/')) {
+  if (res.status === 401 && !NO_REFRESH_ENDPOINTS.includes(endpoint)) {
     if (await refreshSession()) {
       res = await request(endpoint, init);
     } else {

apps/dashboard/src/locales/en.json

@@ -507,6 +507,8 @@
   "admin.purge.target.tabEvents_hint": "What the terminals reported, drink by drink",
   "admin.purge.target.auditLog": "Audit log",
   "admin.purge.target.auditLog_hint": "Who did what on the dashboard",
+  "admin.purge.target.refreshTokens": "Ended sessions",
+  "admin.purge.target.refreshTokens_hint": "Dashboard sign-ins that expired or were signed out; active sessions stay",
   "admin.purge.days": "Older than (days)",
   "admin.purge.preview": "Preview…",
   "admin.purge.confirm_desc": "Everything older than {days} days:",

apps/dashboard/src/locales/nl.json

@@ -507,6 +507,8 @@
   "admin.purge.target.tabEvents_hint": "Wat de kassa's doorgaven, drankje per drankje",
   "admin.purge.target.auditLog": "Logboek",
   "admin.purge.target.auditLog_hint": "Wie wat deed op het dashboard",
+  "admin.purge.target.refreshTokens": "Beëindigde sessies",
+  "admin.purge.target.refreshTokens_hint": "Aanmeldingen op het dashboard die verlopen of afgemeld zijn; actieve sessies blijven",
   "admin.purge.days": "Ouder dan (dagen)",
   "admin.purge.preview": "Voorbeeld…",
   "admin.purge.confirm_desc": "Alles ouder dan {days} dagen:",