mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 05:26:47 +00:00
ed18c37903
Every file the release touches was read once more, and what survived an independent check against the code is fixed here, with a test for each. Data and credentials - A document sync connection edited to a new address no longer carries the stored token along: a blank form under another origin is refused, the same rule the probe route already had. Dawarich and AirTrail testConnection send the stored key only to the host it was stored for. - The key rotation script now covers document_connections.secrets and trip_document_links.webhook_secret, which it had skipped. - Turning a booked night into a pause in the road trip popup asks first and says that the booking and its expense go with it. Deleting a place says the same when a night is booked there, on the desktop and on the phone. - A moved version marker over unchanged bytes no longer replaces the TREK file and its attachments; a real revision carries the attachments over. Planner - A drop in the day plan names the row it lands ahead of in the full day, so a hidden hotel stop no longer shifts it one slot early; the store sorts before it splices. Via re-anchoring, the booked-night guard and the sidebar's day membership read the stored day, the index space the server uses. - A hotel stop placed mid-day re-pins the road trip vias of that day, and the booking session receives the new stop order too. The Public API and the iCal feed list a booked hotel once. A plugin can no longer write a stay against another trip's day. Road trip and map - The route overview paces its requests to the public routers and retries a rate limit, and it says which legs it could not route instead of quietly reporting a shorter trip. A click on a via handle no longer drops a second via; handles hide when zooming out. Read-only members cannot edit the driving limits. The phone shows a way back when no day is picked and prints the night drive departure in the chosen clock format. Integrations and search - Google transit keeps conventional trains when the train chip is on. TREK_PLACES_ENABLED=false stops the details and enrichment calls too, and accepts the whole boolean family. A caller-supplied description no longer lands in the instance-wide enrichment cache. Nominatim searches carry a timeout. An OSM place id is checked for shape before it reaches Overpass. - Dawarich puts a stay on the trip whose dates hold it, the Atlas hand-off knows what the Atlas already shows, and a host change with a new key clears the old instance's state. - Document sync: a webhook address pasted by hand works on the token alone, deleting a connection unregisters its subscriptions, Nextcloud under a sub-path connects, Synology answers a name collision before uploading and verifies a move into the bin, Paperless titles are capped at 128 characters, a DNS failure reads as unreachable rather than as a policy verdict, videos from the store are accepted like uploads, and remote_missing has a way out. Conflict buttons only for the owner, a refused choice is reported, a refused credential gets a Reconnect button, disconnecting asks first on the desktop as it does on the phone, and the folder picker no longer spins forever. Release - The server holds the release notice back from a bundle that cannot draw it, so the previous shell served from the service worker cache after an update no longer shows bare keys and no longer lets a click use the notice up. - Import into an existing list gets the same body limit as a new list. Chat images say when the limit is reached and the new controls are translated. The transit backend switch reports a failed save. The Helm chart carries the Amap credentials in its Secret; the shipped templates document the Places API and Amap variables and the Overpass default. The wiki follows.
650 lines
32 KiB
TypeScript
650 lines
32 KiB
TypeScript
/**
|
|
* Public API v1 e2e — the real ApiTokenGuard and real SQL against a temp SQLite db.
|
|
*
|
|
* The unit tests pin the shaping; this one exists for the question a mock cannot
|
|
* answer: does a token actually only reach its owner's trips? Two users, two trips,
|
|
* and every path that could leak one into the other is exercised — the list, the
|
|
* detail route, and a trip shared by membership (which must be visible, because
|
|
* that is TREK's access model, not an exception to it).
|
|
*/
|
|
import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
|
|
import request from 'supertest';
|
|
import type { Server } from 'http';
|
|
import { Test } from '@nestjs/testing';
|
|
import { createHash } from 'crypto';
|
|
|
|
const { db } = vi.hoisted(() => {
|
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
const Database = require('better-sqlite3');
|
|
const tmp = new Database(':memory:');
|
|
tmp.exec('PRAGMA journal_mode = WAL');
|
|
tmp.exec(`
|
|
CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT NOT NULL,
|
|
email TEXT NOT NULL UNIQUE, role TEXT NOT NULL DEFAULT 'user', password_version INTEGER NOT NULL DEFAULT 0);
|
|
-- scope_mode/api_scopes are spelled exactly as the scopes migration adds
|
|
-- them (NOT NULL DEFAULT 'all', and a nullable JSON list): a row here has to
|
|
-- be able to be the row the guard reads in production, or the scope cases
|
|
-- below would be passing against a table that does not exist anywhere else.
|
|
CREATE TABLE mcp_tokens (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL,
|
|
name TEXT NOT NULL, token_hash TEXT NOT NULL, token_prefix TEXT NOT NULL,
|
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, last_used_at DATETIME,
|
|
kind TEXT NOT NULL DEFAULT 'mcp',
|
|
scope_mode TEXT NOT NULL DEFAULT 'all', api_scopes TEXT);
|
|
CREATE TABLE trips (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL,
|
|
title TEXT NOT NULL, description TEXT, start_date TEXT, end_date TEXT, currency TEXT,
|
|
is_archived INTEGER DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP);
|
|
CREATE TABLE trip_members (trip_id INTEGER NOT NULL, user_id INTEGER NOT NULL);
|
|
CREATE TABLE days (id INTEGER PRIMARY KEY AUTOINCREMENT, trip_id INTEGER NOT NULL,
|
|
day_number INTEGER NOT NULL, date TEXT NOT NULL, notes TEXT, title TEXT);
|
|
CREATE TABLE places (id INTEGER PRIMARY KEY AUTOINCREMENT, trip_id INTEGER NOT NULL,
|
|
name TEXT NOT NULL, address TEXT, lat REAL, lng REAL, category_id INTEGER,
|
|
place_time TEXT, end_time TEXT, duration_minutes INTEGER, notes TEXT, transport_mode TEXT,
|
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP);
|
|
CREATE TABLE categories (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL);
|
|
CREATE TABLE day_assignments (id INTEGER PRIMARY KEY AUTOINCREMENT, day_id INTEGER NOT NULL,
|
|
place_id INTEGER NOT NULL, order_index INTEGER NOT NULL DEFAULT 0, accommodation_id INTEGER);
|
|
CREATE TABLE day_notes (id INTEGER PRIMARY KEY AUTOINCREMENT, day_id INTEGER NOT NULL,
|
|
trip_id INTEGER NOT NULL, text TEXT NOT NULL, time TEXT, icon TEXT, sort_order REAL DEFAULT 0);
|
|
CREATE TABLE day_accommodations (id INTEGER PRIMARY KEY AUTOINCREMENT, trip_id INTEGER NOT NULL,
|
|
place_id INTEGER, start_day_id INTEGER, end_day_id INTEGER, check_in TEXT, check_in_end TEXT,
|
|
check_out TEXT, confirmation TEXT, notes TEXT);
|
|
CREATE TABLE reservations (id INTEGER PRIMARY KEY AUTOINCREMENT, trip_id INTEGER NOT NULL,
|
|
day_id INTEGER, end_day_id INTEGER, place_id INTEGER, assignment_id INTEGER, title TEXT,
|
|
accommodation_id TEXT, reservation_time TEXT, reservation_end_time TEXT, location TEXT,
|
|
confirmation_number TEXT, notes TEXT, status TEXT, type TEXT);
|
|
CREATE TABLE bucket_list (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL,
|
|
name TEXT NOT NULL, lat REAL, lng REAL, country_code TEXT, notes TEXT,
|
|
target_date TEXT, created_at DATETIME DEFAULT CURRENT_TIMESTAMP);
|
|
`);
|
|
return { db: tmp };
|
|
});
|
|
|
|
vi.mock('../../src/db/database', async (importActual) => {
|
|
const actual = await importActual<typeof import('../../src/db/database')>();
|
|
return {
|
|
...actual,
|
|
db,
|
|
closeDb: () => {},
|
|
reinitialize: () => {},
|
|
canAccessTrip: (tripId: number | string, userId: number) =>
|
|
db
|
|
.prepare(
|
|
`SELECT t.id, t.user_id, t.currency FROM trips t
|
|
LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ?
|
|
WHERE t.id = ? AND (t.user_id = ? OR m.user_id IS NOT NULL)`,
|
|
)
|
|
.get(userId, tripId, userId),
|
|
};
|
|
});
|
|
|
|
import { DatabaseModule } from '../../src/nest/database/database.module';
|
|
import { RateLimitModule } from '../../src/nest/common/rate-limit.module';
|
|
import { PublicApiModule } from '../../src/nest/public-api/public-api.module';
|
|
import { ApiTokenGuard } from '../../src/nest/public-api/api-token.guard';
|
|
import { TokensModule } from '../../src/nest/tokens/tokens.module';
|
|
import { PublicStatsController } from '../../src/nest/atlas/public-stats.controller';
|
|
import { AtlasService } from '../../src/nest/atlas/atlas.service';
|
|
import { TrekExceptionFilter } from '../../src/nest/common/trek-exception.filter';
|
|
|
|
/** Mints a token the way TokenService does, so the guard's hash lookup is real. */
|
|
function seedToken(userId: number, raw: string, kind: 'api' | 'mcp' = 'api'): string {
|
|
db.prepare('INSERT INTO mcp_tokens (user_id, name, token_hash, token_prefix, kind) VALUES (?, ?, ?, ?, ?)').run(
|
|
userId,
|
|
'test',
|
|
createHash('sha256').update(raw).digest('hex'),
|
|
raw.slice(0, 13),
|
|
kind,
|
|
);
|
|
return raw;
|
|
}
|
|
|
|
/**
|
|
* The same mint, narrowed. `rawScopes` goes into the column verbatim — including
|
|
* the deliberately unparseable value one case needs, which is why this takes a
|
|
* string rather than an array.
|
|
*/
|
|
function seedLimitedToken(userId: number, raw: string, rawScopes: string): string {
|
|
db.prepare(
|
|
'INSERT INTO mcp_tokens (user_id, name, token_hash, token_prefix, kind, scope_mode, api_scopes) VALUES (?, ?, ?, ?, ?, ?, ?)',
|
|
).run(
|
|
userId,
|
|
'test-limited',
|
|
createHash('sha256').update(raw).digest('hex'),
|
|
raw.slice(0, 13),
|
|
'api',
|
|
'limited',
|
|
rawScopes,
|
|
);
|
|
return raw;
|
|
}
|
|
|
|
const ADA_TOKEN = 'trek_' + 'a'.repeat(48);
|
|
const BOB_TOKEN = 'trek_' + 'b'.repeat(48);
|
|
/** A valid credential for /mcp — must not open this surface. */
|
|
const MCP_TOKEN = 'trek_' + 'c'.repeat(48);
|
|
/** Narrowed keys, all Ada's, so only the grant differs between them. */
|
|
const TRIPS_ONLY_TOKEN = 'trek_' + 'd'.repeat(48);
|
|
const TRIPS_DAYS_TOKEN = 'trek_' + 'e'.repeat(48);
|
|
/** Places without days: the grant that used to get the day spine anyway. */
|
|
const TRIPS_PLACES_TOKEN = 'trek_' + '1'.repeat(48);
|
|
/** api_scopes that cannot be parsed — the fall-back-to-everything case. */
|
|
const BROKEN_SCOPES_TOKEN = 'trek_' + 'f'.repeat(48);
|
|
|
|
/** Stubbed so /api/v1/stats can be mounted without AtlasModule's whole graph. */
|
|
const STATS = {
|
|
getTravelStats: () => ({
|
|
countries: ['JP', 'IT'],
|
|
cities: ['tokyo'],
|
|
coords: [],
|
|
totalTrips: 2,
|
|
totalDays: 3,
|
|
totalPlaces: 4,
|
|
totalDistanceKm: 1234,
|
|
}),
|
|
lastTrip: () => null,
|
|
};
|
|
|
|
describe('Public API v1 e2e (real guard + real SQL)', () => {
|
|
let server: Server;
|
|
let app: Awaited<ReturnType<typeof build>>;
|
|
|
|
async function build() {
|
|
const moduleRef = await Test.createTestingModule({
|
|
imports: [DatabaseModule, RateLimitModule, TokensModule, PublicApiModule],
|
|
// `/api/v1/stats` lives in atlas/ because its figures do, but it is guarded
|
|
// and scoped by this directory's code — so it is mounted here with the real
|
|
// guard and a stubbed AtlasService. Importing AtlasModule instead would pull
|
|
// AuthModule and the storage registry, which reads app_settings on init and
|
|
// would need half the schema this file deliberately does not carry. What is
|
|
// under test is the refusal, not the arithmetic (public-stats.controller.test
|
|
// owns that), and the refusal happens before AtlasService is ever touched.
|
|
controllers: [PublicStatsController],
|
|
providers: [ApiTokenGuard, { provide: AtlasService, useValue: STATS }],
|
|
}).compile();
|
|
const nest = moduleRef.createNestApplication();
|
|
nest.useGlobalFilters(new TrekExceptionFilter());
|
|
await nest.init();
|
|
return nest;
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
db.prepare("INSERT INTO users (id, username, email) VALUES (1, 'ada', 'ada@example.com')").run();
|
|
db.prepare("INSERT INTO users (id, username, email) VALUES (2, 'bob', 'bob@example.com')").run();
|
|
seedToken(1, ADA_TOKEN);
|
|
seedToken(2, BOB_TOKEN);
|
|
seedToken(1, MCP_TOKEN, 'mcp');
|
|
// ADA_TOKEN above is seeded without ever naming the two scope columns — the
|
|
// row a key minted before the feature existed leaves behind. It is the
|
|
// backwards-compatibility case and every existing test in this file rides on
|
|
// it, so if narrowing ever leaks into the default those tests fail first.
|
|
seedLimitedToken(1, TRIPS_ONLY_TOKEN, JSON.stringify(['trips']));
|
|
seedLimitedToken(1, TRIPS_DAYS_TOKEN, JSON.stringify(['trips', 'days', 'notes']));
|
|
seedLimitedToken(1, TRIPS_PLACES_TOKEN, JSON.stringify(['trips', 'places']));
|
|
seedLimitedToken(1, BROKEN_SCOPES_TOKEN, '{"not":"a list"');
|
|
|
|
// Ada owns trip 1; Bob owns trip 2; trip 3 is Bob's but Ada is a member.
|
|
db.prepare(
|
|
"INSERT INTO trips (id, user_id, title, description, start_date, end_date, currency) VALUES (1, 1, 'Toskana', 'Wein', '2026-06-14', '2026-06-16', 'EUR')",
|
|
).run();
|
|
db.prepare("INSERT INTO trips (id, user_id, title, start_date) VALUES (2, 2, 'Bobs Secret', '2026-07-01')").run();
|
|
db.prepare("INSERT INTO trips (id, user_id, title, start_date) VALUES (3, 2, 'Shared', '2026-08-01')").run();
|
|
db.prepare('INSERT INTO trip_members (trip_id, user_id) VALUES (3, 1)').run();
|
|
|
|
db.prepare("INSERT INTO days (id, trip_id, day_number, date, title, notes) VALUES (1, 1, 1, '2026-06-14', 'Ankunft', 'Schlüssel beim Nachbarn abholen')").run();
|
|
db.prepare("INSERT INTO days (id, trip_id, day_number, date) VALUES (2, 1, 2, '2026-06-15')").run();
|
|
db.prepare("INSERT INTO categories (id, name) VALUES (1, 'Museum')").run();
|
|
db.prepare(
|
|
"INSERT INTO places (id, trip_id, name, address, lat, lng, category_id, place_time, duration_minutes, transport_mode) VALUES (1, 1, 'Uffizien', 'Firenze', 43.76, 11.25, 1, '14:00', 180, 'walking')",
|
|
).run();
|
|
db.prepare("INSERT INTO places (id, trip_id, name, lat, lng) VALUES (2, 1, 'Ponte Vecchio', 43.76, 11.24)").run();
|
|
db.prepare("INSERT INTO places (id, trip_id, name) VALUES (3, 1, 'Hotel Alba')").run();
|
|
// Deliberately inserted out of order to prove order_index decides the sequence.
|
|
db.prepare('INSERT INTO day_assignments (day_id, place_id, order_index) VALUES (1, 2, 1)').run();
|
|
// Ein Ort auf der Shortlist: Koordinaten, aber noch kein Tag.
|
|
db.prepare("INSERT INTO places (id, trip_id, name, lat, lng, notes) VALUES (4, 1, 'Boboli-Garten', 43.762, 11.248, 'vielleicht')").run();
|
|
// Eine Buchung, die keinen Tag (mehr) hat.
|
|
db.prepare("INSERT INTO reservations (trip_id, day_id, type, title, location, reservation_time, status) VALUES (1, NULL, 'flight', 'LH 1234', 'FRA', '2026-06-14T08:00', 'confirmed')").run();
|
|
db.prepare("INSERT INTO bucket_list (user_id, name, lat, lng, country_code, notes, target_date) VALUES (1, 'Hokkaido', 43.06, 141.35, 'JP', 'im Winter', '2027-02-01')").run();
|
|
db.prepare("INSERT INTO bucket_list (user_id, name, lat, lng) VALUES (2, 'Bobs Traumziel', 1.0, 2.0)").run();
|
|
db.prepare('INSERT INTO day_assignments (day_id, place_id, order_index) VALUES (1, 1, 0)').run();
|
|
db.prepare("INSERT INTO day_notes (day_id, trip_id, text, time, sort_order) VALUES (1, 1, 'Tickets mitnehmen', '09:00', 0)").run();
|
|
db.prepare(
|
|
"INSERT INTO reservations (trip_id, day_id, type, title, location, reservation_time, status) VALUES (1, 1, 'flight', 'LH 1234', 'FRA', '2026-06-14T08:00', 'confirmed')",
|
|
).run();
|
|
db.prepare(
|
|
"INSERT INTO day_accommodations (id, trip_id, place_id, start_day_id, end_day_id, check_in, check_out) VALUES (1, 1, 3, 1, 2, '15:00', '11:00')",
|
|
).run();
|
|
// The stop a booked night puts on its check-in day, so the route can reach the
|
|
// hotel. It belongs to the stay, not to the day's plan.
|
|
db.prepare('INSERT INTO day_assignments (day_id, place_id, order_index, accommodation_id) VALUES (1, 3, 2, 1)').run();
|
|
|
|
app = await build();
|
|
server = app.getHttpServer() as Server;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await app?.close();
|
|
});
|
|
|
|
const get = (path: string, token?: string) => {
|
|
const req = request(server).get(path);
|
|
return token ? req.set('Authorization', `Bearer ${token}`) : req;
|
|
};
|
|
|
|
/**
|
|
* Several reads in a row, one after the other.
|
|
*
|
|
* Not `Promise.all`: the Nest app is never told to listen, so supertest binds
|
|
* an ephemeral port itself on the first request. Fired in parallel, four
|
|
* requests race four `listen(0)` calls on the same server and the losers come
|
|
* back as ECONNRESET — reliably on a loaded CI runner, almost never here.
|
|
*/
|
|
const getEach = async (...calls: Array<[string, string?]>) => {
|
|
const out = [];
|
|
for (const [path, token] of calls) out.push(await get(path, token));
|
|
return out;
|
|
};
|
|
|
|
describe('authentication', () => {
|
|
it('401s without a token', async () => {
|
|
const res = await get('/api/v1/trips');
|
|
expect(res.status).toBe(401);
|
|
expect(res.body).toEqual({ error: 'API token required', code: 'API_TOKEN_REQUIRED' });
|
|
});
|
|
|
|
it('401s on an unknown token', async () => {
|
|
expect((await get('/api/v1/trips', 'trek_' + 'z'.repeat(48))).status).toBe(401);
|
|
});
|
|
|
|
it('refuses a valid MCP token — different kind, different door', async () => {
|
|
const res = await get('/api/v1/trips', MCP_TOKEN);
|
|
expect(res.status).toBe(401);
|
|
expect(res.body).toEqual({ error: 'Invalid API token', code: 'API_TOKEN_INVALID' });
|
|
});
|
|
|
|
it('accepts the token via X-API-Key too', async () => {
|
|
const res = await request(server).get('/api/v1/trips').set('X-API-Key', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it('records last_used_at so a stale token is visible in settings', async () => {
|
|
await get('/api/v1/trips', ADA_TOKEN);
|
|
const row = db.prepare('SELECT last_used_at FROM mcp_tokens WHERE user_id = 1').get() as {
|
|
last_used_at: string | null;
|
|
};
|
|
expect(row.last_used_at).not.toBeNull();
|
|
});
|
|
});
|
|
|
|
/** The isolation tests. Everything else is convenience; these are the point. */
|
|
describe('access isolation', () => {
|
|
it("lists only the caller's own and shared trips", async () => {
|
|
const res = await get('/api/v1/trips', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.trips.map((t: { id: number }) => t.id).sort()).toEqual([1, 3]);
|
|
});
|
|
|
|
it("does not leak another user's trip into the list", async () => {
|
|
const res = await get('/api/v1/trips', BOB_TOKEN);
|
|
expect(res.body.trips.map((t: { id: number }) => t.id).sort()).toEqual([2, 3]);
|
|
expect(JSON.stringify(res.body)).not.toContain('Toskana');
|
|
});
|
|
|
|
it("404s on another user's trip, identically to one that does not exist", async () => {
|
|
const foreign = await get('/api/v1/trips/2', ADA_TOKEN);
|
|
const missing = await get('/api/v1/trips/424242', ADA_TOKEN);
|
|
expect(foreign.status).toBe(404);
|
|
expect(foreign.body).toEqual({ error: 'Trip not found' });
|
|
expect(missing.status).toBe(foreign.status);
|
|
expect(missing.body).toEqual(foreign.body);
|
|
});
|
|
|
|
it('serves a trip shared by membership, because that is the access model', async () => {
|
|
const res = await get('/api/v1/trips/3', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.title).toBe('Shared');
|
|
});
|
|
});
|
|
|
|
describe('payload', () => {
|
|
it('returns the whole itinerary by default, in planned order', async () => {
|
|
const res = await get('/api/v1/trips/1', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toMatchObject({
|
|
id: 1,
|
|
title: 'Toskana',
|
|
description: 'Wein',
|
|
start_date: '2026-06-14',
|
|
currency: 'EUR',
|
|
archived: false,
|
|
});
|
|
expect(res.body.days).toHaveLength(2);
|
|
|
|
const [first] = res.body.days;
|
|
expect(first.date).toBe('2026-06-14');
|
|
expect(first.title).toBe('Ankunft');
|
|
expect(first.places.map((p: { name: string }) => p.name)).toEqual(['Uffizien', 'Ponte Vecchio']);
|
|
expect(first.places[0]).toMatchObject({
|
|
lat: 43.76,
|
|
time: '14:00',
|
|
duration_minutes: 180,
|
|
category: 'Museum',
|
|
transport_mode: 'walking',
|
|
});
|
|
expect(first.day_notes).toEqual([{ text: 'Tickets mitnehmen', time: '09:00' }]);
|
|
expect(first.reservations[0]).toMatchObject({ type: 'flight', title: 'LH 1234', status: 'confirmed' });
|
|
});
|
|
|
|
it('resolves accommodation day ids into ISO dates', async () => {
|
|
const res = await get('/api/v1/trips/1', ADA_TOKEN);
|
|
expect(res.body.accommodations).toEqual([
|
|
{
|
|
name: 'Hotel Alba',
|
|
address: null,
|
|
lat: null,
|
|
lng: null,
|
|
start_date: '2026-06-14',
|
|
end_date: '2026-06-15',
|
|
check_in: '15:00',
|
|
check_out: '11:00',
|
|
notes: null,
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('reports the night once, under accommodations, not again as a place on its check-in day', async () => {
|
|
// The stop a booking puts on its check-in day is how the route reaches the
|
|
// hotel. To a consumer it is the same booking twice: a hotel that is also a
|
|
// planned place reads as two different intentions.
|
|
const res = await get('/api/v1/trips/1?include=places,accommodations', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days[0].places.map((p: { name: string }) => p.name)).toEqual(['Uffizien', 'Ponte Vecchio']);
|
|
expect(res.body.accommodations.map((a: { name: string }) => a.name)).toEqual(['Hotel Alba']);
|
|
});
|
|
|
|
it('lists travellers by name, owner first, without ids or emails', async () => {
|
|
const res = await get('/api/v1/trips/3?include=travellers', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.travellers).toEqual([
|
|
{ name: 'bob', owner: true },
|
|
{ name: 'ada', owner: false },
|
|
]);
|
|
expect(JSON.stringify(res.body)).not.toContain('@example.com');
|
|
});
|
|
|
|
it('returns shortlisted places, which are half of a real trip', async () => {
|
|
const res = await get('/api/v1/trips/1?include=places', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.unplanned_places).toEqual([
|
|
expect.objectContaining({ name: 'Boboli-Garten', lat: 43.762, lng: 11.248, notes: 'vielleicht' }),
|
|
]);
|
|
// Hotel Alba stands on a day only through the stop its booking put there. It
|
|
// is the accommodation and is reported as such: a shortlist that includes
|
|
// your hotel is not a shortlist.
|
|
expect(res.body.unplanned_places.map((p: { name: string }) => p.name)).not.toContain('Hotel Alba');
|
|
// And the scheduled ones still sit on their day, not in both places.
|
|
expect(res.body.days[0].places.map((p: { name: string }) => p.name)).toEqual(['Uffizien', 'Ponte Vecchio']);
|
|
});
|
|
|
|
it('returns bookings that lost their day instead of dropping them', async () => {
|
|
const res = await get('/api/v1/trips/1?include=reservations', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.unscheduled_reservations).toEqual([
|
|
expect.objectContaining({ type: 'flight', title: 'LH 1234', location: 'FRA' }),
|
|
]);
|
|
});
|
|
|
|
it('implies days when asked for something that lives on one', async () => {
|
|
// The section Evgenii named first. Before days were implied this answered
|
|
// the trip summary and nothing else, without saying so.
|
|
const res = await get('/api/v1/trips/1?include=notes', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days).toBeDefined();
|
|
expect(res.body.days[0].day_notes.length).toBeGreaterThan(0);
|
|
// Still only what was asked for: no places came along for the ride.
|
|
expect(res.body.days[0].places).toEqual([]);
|
|
expect(res.body.unplanned_places).toBeUndefined();
|
|
});
|
|
|
|
it('never exposes internal ids or foreign keys', async () => {
|
|
const res = await get('/api/v1/trips/1', ADA_TOKEN);
|
|
const serialised = JSON.stringify(res.body);
|
|
for (const leak of ['user_id', 'day_id', 'place_id', 'order_index', 'trip_id', 'assignment_id']) {
|
|
expect(serialised).not.toContain(leak);
|
|
}
|
|
});
|
|
|
|
it('omits sections the caller did not ask for, rather than sending them empty', async () => {
|
|
const res = await get('/api/v1/trips/1?include=days,notes', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.accommodations).toBeUndefined();
|
|
expect(res.body.days[0].day_notes).toHaveLength(1);
|
|
expect(res.body.days[0].places).toEqual([]);
|
|
expect(res.body.days[0].reservations).toEqual([]);
|
|
});
|
|
|
|
it('400s on an unknown include section', async () => {
|
|
const res = await get('/api/v1/trips/1?include=days,nope', ADA_TOKEN);
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('400s on a non-numeric trip id', async () => {
|
|
expect((await get('/api/v1/trips/abc', ADA_TOKEN)).status).toBe(400);
|
|
});
|
|
});
|
|
|
|
describe('bucket list', () => {
|
|
it("returns the caller's own wishlist, with coordinates", async () => {
|
|
const res = await get('/api/v1/bucket-list', ADA_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.items).toEqual([
|
|
{ name: 'Hokkaido', lat: 43.06, lng: 141.35, country_code: 'JP', notes: 'im Winter', target_date: '2027-02-01' },
|
|
]);
|
|
});
|
|
|
|
it("does not leak another user's wishlist", async () => {
|
|
const res = await get('/api/v1/bucket-list', BOB_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.items).toEqual([
|
|
{ name: 'Bobs Traumziel', lat: 1, lng: 2, country_code: null, notes: null, target_date: null },
|
|
]);
|
|
});
|
|
|
|
it('needs a token like everything else here', async () => {
|
|
const res = await request(server).get('/api/v1/bucket-list');
|
|
expect(res.status).toBe(401);
|
|
});
|
|
});
|
|
/**
|
|
* Read scopes (#2279).
|
|
*
|
|
* The question a mock cannot answer: does a key stored in the database a
|
|
* particular way actually reach the sections it should, and stop at the ones it
|
|
* should not? Every case below starts from a real row and ends at a real HTTP
|
|
* status, because the two halves — what the column says and what the route does
|
|
* — are written in different files and have no reason to agree on their own.
|
|
*
|
|
* The first case is the important one. Narrowing is a feature; not breaking the
|
|
* keys that already exist is a promise.
|
|
*/
|
|
describe('read scopes', () => {
|
|
it('PUBAPI-SCOPE-001: a key minted before scopes existed is stored as a full grant', () => {
|
|
const row = db
|
|
.prepare('SELECT scope_mode, api_scopes FROM mcp_tokens WHERE token_prefix = ?')
|
|
.get(ADA_TOKEN.slice(0, 13)) as { scope_mode: string; api_scopes: string | null };
|
|
// The two columns were never named at insert time — exactly the row the
|
|
// ALTER leaves behind for a key that already existed.
|
|
expect(row).toEqual({ scope_mode: 'all', api_scopes: null });
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-002: and still reads every section, which is the whole promise', async () => {
|
|
const [trips, bucket, stats, trip] = await getEach(
|
|
['/api/v1/trips', ADA_TOKEN],
|
|
['/api/v1/bucket-list', ADA_TOKEN],
|
|
['/api/v1/stats', ADA_TOKEN],
|
|
['/api/v1/trips/1', ADA_TOKEN],
|
|
);
|
|
expect([trips.status, bucket.status, stats.status, trip.status]).toEqual([200, 200, 200, 200]);
|
|
expect(stats.body).toMatchObject({ total_trips: 2, total_countries: 2 });
|
|
// The full payload, not a narrowed one: every section is there.
|
|
expect(trip.body.days).toHaveLength(2);
|
|
expect(trip.body.accommodations).toBeDefined();
|
|
expect(trip.body.travellers).toBeDefined();
|
|
expect(trip.body.unplanned_places).toBeDefined();
|
|
expect(trip.body.unscheduled_reservations).toBeDefined();
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-003: a key narrowed to trips reads trips', async () => {
|
|
const res = await get('/api/v1/trips', TRIPS_ONLY_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.trips.map((t: { id: number }) => t.id).sort()).toEqual([1, 3]);
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-004: and is refused the bucket list, with a code of its own', async () => {
|
|
const res = await get('/api/v1/bucket-list', TRIPS_ONLY_TOKEN);
|
|
expect(res.status).toBe(403);
|
|
expect(res.body).toEqual({
|
|
error: 'This API key is not allowed to read bucket-list',
|
|
code: 'API_SCOPE_FORBIDDEN',
|
|
required_scope: 'bucket-list',
|
|
});
|
|
// And nothing of the withheld list leaked out through the refusal.
|
|
expect(JSON.stringify(res.body)).not.toContain('Hokkaido');
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-005: and refused the stats route, the widest answer on the surface', async () => {
|
|
const res = await get('/api/v1/stats', TRIPS_ONLY_TOKEN);
|
|
expect(res.status).toBe(403);
|
|
expect(res.body).toEqual({
|
|
error: 'This API key is not allowed to read stats',
|
|
code: 'API_SCOPE_FORBIDDEN',
|
|
required_scope: 'stats',
|
|
});
|
|
});
|
|
|
|
/**
|
|
* A valid credential that may not read something is not an authentication
|
|
* problem, and the two have to stay distinguishable: re-minting a key fixes a
|
|
* 401 and does nothing at all for a 403.
|
|
*/
|
|
it('PUBAPI-SCOPE-006: the refusal is a 403 and leaves both 401 bodies exactly as they were', async () => {
|
|
const [none, unknown, wrongKind, noneOnStats] = await getEach(
|
|
['/api/v1/trips'],
|
|
['/api/v1/trips', 'trek_' + 'z'.repeat(48)],
|
|
['/api/v1/trips', MCP_TOKEN],
|
|
['/api/v1/stats'],
|
|
);
|
|
expect(none.status).toBe(401);
|
|
expect(none.body).toEqual({ error: 'API token required', code: 'API_TOKEN_REQUIRED' });
|
|
expect(unknown.status).toBe(401);
|
|
expect(unknown.body).toEqual({ error: 'Invalid API token', code: 'API_TOKEN_INVALID' });
|
|
expect(wrongKind.status).toBe(401);
|
|
expect(wrongKind.body).toEqual({ error: 'Invalid API token', code: 'API_TOKEN_INVALID' });
|
|
expect(noneOnStats.status).toBe(401);
|
|
expect(noneOnStats.body).toEqual({ error: 'API token required', code: 'API_TOKEN_REQUIRED' });
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-007: a trip asked for without include carries only the granted sections', async () => {
|
|
const res = await get('/api/v1/trips/1', TRIPS_ONLY_TOKEN);
|
|
// Not a refusal: `include` absent means "everything", and a key that never
|
|
// named a forbidden section gets what it may have.
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toMatchObject({ id: 1, title: 'Toskana' });
|
|
expect(res.body.days).toBeUndefined();
|
|
expect(res.body.accommodations).toBeUndefined();
|
|
expect(res.body.travellers).toBeUndefined();
|
|
expect(res.body.unplanned_places).toBeUndefined();
|
|
expect(res.body.unscheduled_reservations).toBeUndefined();
|
|
expect(JSON.stringify(res.body)).not.toContain('Uffizien');
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-008: a wider grant fills in exactly the sections it covers', async () => {
|
|
const res = await get('/api/v1/trips/1', TRIPS_DAYS_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days).toHaveLength(2);
|
|
expect(res.body.days[0].day_notes).toEqual([{ text: 'Tickets mitnehmen', time: '09:00' }]);
|
|
// notes was granted, places was not — and days is not a back door to them.
|
|
expect(res.body.days[0].places).toEqual([]);
|
|
expect(res.body.accommodations).toBeUndefined();
|
|
expect(JSON.stringify(res.body)).not.toContain('Uffizien');
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-008b: a grant without `days` gets the day shell, not the day', async () => {
|
|
// Places hang off days, so the day container is implied and has to be. It is
|
|
// the join key, though, not a way back to the section the key was narrowed to
|
|
// exclude: the day's title and its own free-text notes stay behind.
|
|
const res = await get('/api/v1/trips/1?include=places', TRIPS_PLACES_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days).toHaveLength(2);
|
|
expect(res.body.days[0]).toMatchObject({ date: '2026-06-14', title: null, notes: null });
|
|
expect(res.body.days[0].places.map((pl: { name: string }) => pl.name)).toEqual(['Uffizien', 'Ponte Vecchio']);
|
|
const serialised = JSON.stringify(res.body);
|
|
expect(serialised).not.toContain('Ankunft');
|
|
expect(serialised).not.toContain('Nachbarn');
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-008c: the same key with no include at all is narrowed the same way', async () => {
|
|
// The route that made it a bypass rather than an oddity: `include` absent
|
|
// means every section, and narrowToGrant reduces it to ['places'], which
|
|
// implies days all over again.
|
|
const res = await get('/api/v1/trips/1', TRIPS_PLACES_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days[0]).toMatchObject({ title: null, notes: null });
|
|
expect(JSON.stringify(res.body)).not.toContain('Nachbarn');
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-008d: a key that was granted days still reads both fields', async () => {
|
|
const res = await get('/api/v1/trips/1', TRIPS_DAYS_TOKEN);
|
|
expect(res.body.days[0]).toMatchObject({ title: 'Ankunft', notes: 'Schlüssel beim Nachbarn abholen' });
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-009: an include the key does cover still answers', async () => {
|
|
const res = await get('/api/v1/trips/1?include=days,notes', TRIPS_DAYS_TOKEN);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.days[0].day_notes).toHaveLength(1);
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-010: naming a forbidden section is refused rather than silently dropped', async () => {
|
|
const res = await get('/api/v1/trips/1?include=days,places', TRIPS_DAYS_TOKEN);
|
|
expect(res.status).toBe(403);
|
|
expect(res.body).toEqual({
|
|
error: 'This API key is not allowed to read places',
|
|
code: 'API_SCOPE_FORBIDDEN',
|
|
required_scope: 'places',
|
|
});
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-011: a key that says it is narrowed and cannot say how reads nothing', async () => {
|
|
// The direction matters. A key that never said 'limited' keeps the full
|
|
// access it was minted with; one that HAS said it is restricted must not
|
|
// widen because its list became unreadable — a hand-edited row, or a scope
|
|
// constant a later version renamed away. Failing closed turns that into a
|
|
// support ticket instead of a key quietly reading every trip.
|
|
const [bucket, trip] = await getEach(
|
|
['/api/v1/bucket-list', BROKEN_SCOPES_TOKEN],
|
|
['/api/v1/trips/1', BROKEN_SCOPES_TOKEN],
|
|
);
|
|
expect(bucket.status).toBe(403);
|
|
expect(bucket.body).toMatchObject({ code: 'API_SCOPE_FORBIDDEN' });
|
|
expect(trip.status).toBe(403);
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-012: a scope never widens access — the owner check still decides', async () => {
|
|
// 'trips' granted, Bob's trip asked for: a grant narrows what a key may read
|
|
// and can never hand it a row its owner cannot reach.
|
|
const res = await get('/api/v1/trips/2', TRIPS_ONLY_TOKEN);
|
|
expect(res.status).toBe(404);
|
|
expect(res.body).toEqual({ error: 'Trip not found' });
|
|
});
|
|
|
|
it('PUBAPI-SCOPE-013: a narrowed key is stamped as used like any other', async () => {
|
|
await get('/api/v1/trips', TRIPS_ONLY_TOKEN);
|
|
const row = db
|
|
.prepare('SELECT last_used_at FROM mcp_tokens WHERE token_prefix = ?')
|
|
.get(TRIPS_ONLY_TOKEN.slice(0, 13)) as { last_used_at: string | null };
|
|
expect(row.last_used_at).not.toBeNull();
|
|
});
|
|
});
|
|
});
|