mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
247433fb2a
* fix(journey): authorize reads of the journey share link GET /api/journeys/:id/share-link now requires journey access (canAccessJourney), matching the create/delete share-link routes and the get_journey_share_link MCP tool. Returns no link when the caller lacks access to the journey. * feat(costs): rework Budget into Costs — Splitwise-style, multi-currency, mobile Renames the Budget addon to "Costs" (UI only) and reworks it into a Tricount/ Splitwise-style cost tracker: multiple payers per expense, equal split across chosen members, settle-up with persisted history + undo, 12 fixed categories, per-expense currency with live FX conversion to a user-set display currency (Settings -> Display), and locale-correct money formatting. Adds a desktop and a dedicated mobile layout. A migration backfills existing budget items (single payer, split members, currency). Closes #551 (per-expense currency). Also switches the app font to self-hosted Poppins (Geist for secondary subtext), replacing the Google Fonts CDN dependency. * fix(costs): neutral dashboard dark palette + liquid glass, full page width, entry-count badge - Dark mode used a warm oklch palette that read brownish; switch to the neutral zinc tokens used by the dashboard (#121215 bg, #f4f4f5 ink) and add a subtle backdrop-blur glass on cards. - Costs now uses the full available page width on desktop instead of a 1280px cap. - Render the expense count next to the Expenses title as a badge. - Adapt budget/journey unit tests to the new payer-based settlement model and the Costs rename (category default 'other', Costs tab/CostsPanel). * fix(costs): drop the entry-count badge, always show row edit/delete actions Removes the count badge next to the Expenses title and makes the per-row edit/delete actions permanently visible (no longer hover-only) on desktop too. * feat(costs): currency-native money formatting, custom select/date, rename addon to Costs - Format every amount in its own currency convention (symbol position, grouping and decimal separators) regardless of app language, via a currency->locale map (EUR -> '12,00 €', USD -> '$12.00', JPY -> '¥12', ...). Previously Intl used the app locale, so EUR showed the symbol in front under an English UI. - Use TREK's CustomSelect (searchable, with symbols) and CustomDatePicker in the add/edit expense modal instead of the native <select>/<input type=date>. - Rename the 'Budget Planner' add-on to 'Costs' in the admin list (display only; id/tables/permissions/MCP stay 'budget') via seed + a migration for existing DBs. * feat(auth): configurable session duration via SESSION_DURATION Adds a SESSION_DURATION env var (ms-style strings: 1h, 7d, 30d, ...) controlling how long a session stays valid before re-login. It drives both the trek_session JWT exp claim and the cookie maxAge from one source, so they never drift. Invalid values warn at startup and fall back to the default (24h — unchanged). The MFA challenge token and MCP OAuth tokens keep their own TTL. Implements the request from discussion #946. Documented in the env-var wiki page, .env.example and docker-compose.yml.
407 lines
14 KiB
TypeScript
407 lines
14 KiB
TypeScript
/**
|
|
* Maps integration tests.
|
|
* Covers MAPS-001 to MAPS-008.
|
|
*
|
|
* External API calls (Nominatim, Google Places, Wikipedia) are tested at the
|
|
* input validation level. Full integration tests would require live external APIs.
|
|
*/
|
|
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
|
import request from 'supertest';
|
|
import type { Application } from 'express';
|
|
import type { INestApplication } from '@nestjs/common';
|
|
|
|
const { testDb, dbMock } = vi.hoisted(() => {
|
|
const Database = require('better-sqlite3');
|
|
const db = new Database(':memory:');
|
|
db.exec('PRAGMA journal_mode = WAL');
|
|
db.exec('PRAGMA foreign_keys = ON');
|
|
db.exec('PRAGMA busy_timeout = 5000');
|
|
const mock = {
|
|
db,
|
|
closeDb: () => {},
|
|
reinitialize: () => {},
|
|
getPlaceWithTags: (placeId: number) => {
|
|
const place: any = db.prepare(`SELECT p.*, c.name as category_name, c.color as category_color, c.icon as category_icon FROM places p LEFT JOIN categories c ON p.category_id = c.id WHERE p.id = ?`).get(placeId);
|
|
if (!place) return null;
|
|
const tags = db.prepare(`SELECT t.* FROM tags t JOIN place_tags pt ON t.id = pt.tag_id WHERE pt.place_id = ?`).all(placeId);
|
|
return { ...place, category: place.category_id ? { id: place.category_id, name: place.category_name, color: place.category_color, icon: place.category_icon } : null, tags };
|
|
},
|
|
canAccessTrip: (tripId: any, userId: number) =>
|
|
db.prepare(`SELECT t.id, t.user_id 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),
|
|
isOwner: (tripId: any, userId: number) =>
|
|
!!db.prepare('SELECT id FROM trips WHERE id = ? AND user_id = ?').get(tripId, userId),
|
|
};
|
|
return { testDb: db, dbMock: mock };
|
|
});
|
|
|
|
vi.mock('../../src/db/database', () => dbMock);
|
|
vi.mock('../../src/config', () => ({
|
|
JWT_SECRET: 'test-jwt-secret-for-trek-testing-only',
|
|
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
|
updateJwtSecret: () => {},
|
|
SESSION_DURATION: '24h',
|
|
SESSION_DURATION_MS: 86400000,
|
|
SESSION_DURATION_SECONDS: 86400,
|
|
DEFAULT_LANGUAGE: 'en',
|
|
}));
|
|
vi.mock('../../src/websocket', () => ({ broadcast: vi.fn(), broadcastToUser: vi.fn() }));
|
|
|
|
// Default mock: resolveGoogleMapsUrl rejects with 400 (SSRF-like behaviour for
|
|
// URLs that look internal); individual tests override with mockResolvedValueOnce.
|
|
vi.mock('../../src/services/mapsService', () => ({
|
|
searchPlaces: vi.fn(),
|
|
autocompletePlaces: vi.fn(),
|
|
getPlaceDetails: vi.fn(),
|
|
getPlacePhoto: vi.fn(),
|
|
reverseGeocode: vi.fn(),
|
|
resolveGoogleMapsUrl: vi.fn().mockRejectedValue(
|
|
Object.assign(new Error('SSRF or invalid URL'), { status: 400 })
|
|
),
|
|
}));
|
|
|
|
import { buildApp } from '../../src/bootstrap';
|
|
import { createTables } from '../../src/db/schema';
|
|
import { runMigrations } from '../../src/db/migrations';
|
|
import { resetTestDb, resetRateLimits } from '../helpers/test-db';
|
|
import { createUser } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
import * as mapsService from '../../src/services/mapsService';
|
|
|
|
let nestApp: INestApplication;
|
|
let app: Application;
|
|
|
|
beforeAll(async () => {
|
|
createTables(testDb);
|
|
runMigrations(testDb);
|
|
nestApp = await buildApp();
|
|
app = nestApp.getHttpAdapter().getInstance();
|
|
});
|
|
|
|
beforeEach(() => {
|
|
resetTestDb(testDb);
|
|
resetRateLimits(nestApp);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await nestApp.close();
|
|
testDb.close();
|
|
});
|
|
|
|
describe('Maps authentication', () => {
|
|
it('POST /maps/search without auth returns 401', async () => {
|
|
const res = await request(app)
|
|
.post('/api/maps/search')
|
|
.send({ query: 'Paris' });
|
|
expect(res.status).toBe(401);
|
|
});
|
|
|
|
it('GET /maps/reverse without auth returns 401', async () => {
|
|
const res = await request(app)
|
|
.get('/api/maps/reverse?lat=48.8566&lng=2.3522');
|
|
expect(res.status).toBe(401);
|
|
});
|
|
});
|
|
|
|
describe('Maps validation', () => {
|
|
it('MAPS-001 — POST /maps/search without query returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/search')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({});
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-006 — GET /maps/reverse without lat/lng returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/reverse')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-007 — POST /maps/resolve-url without url returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/resolve-url')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({});
|
|
expect(res.status).toBe(400);
|
|
});
|
|
});
|
|
|
|
describe('Maps SSRF protection', () => {
|
|
it('MAPS-007 — POST /maps/resolve-url with internal IP is blocked', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
// SSRF: should be blocked by ssrfGuard
|
|
const res = await request(app)
|
|
.post('/api/maps/resolve-url')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ url: 'http://192.168.1.1/admin' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-007 — POST /maps/resolve-url with loopback IP is blocked', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/resolve-url')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ url: 'http://127.0.0.1/secret' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
});
|
|
|
|
describe('Maps happy paths (mocked service)', () => {
|
|
it('MAPS-002 — POST /maps/search returns results from service', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.searchPlaces).mockResolvedValueOnce({
|
|
results: [{ address: 'Paris, France', source: 'nominatim' }],
|
|
} as any);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/search')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ query: 'Paris' });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.results).toHaveLength(1);
|
|
expect(res.body.results[0].address).toBe('Paris, France');
|
|
});
|
|
|
|
it('MAPS-003 — GET /maps/details/:placeId returns place details', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.getPlaceDetails).mockResolvedValueOnce({
|
|
name: 'Eiffel Tower',
|
|
address: 'Champ de Mars, Paris',
|
|
} as any);
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/details/ChIJLU7jZClu5kcR4PcOOO6p3I0')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.name).toBe('Eiffel Tower');
|
|
});
|
|
|
|
it('MAPS-004 — GET /maps/place-photo/:placeId returns photo url', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.getPlacePhoto).mockResolvedValueOnce({
|
|
url: 'https://example.com/photo.jpg',
|
|
source: 'wikimedia',
|
|
} as any);
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/place-photo/ChIJLU7jZClu5kcR4PcOOO6p3I0?lat=48.8584&lng=2.2945')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.url).toBe('https://example.com/photo.jpg');
|
|
});
|
|
|
|
it('MAPS-005 — GET /maps/reverse returns geocoded location', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.reverseGeocode).mockResolvedValueOnce({
|
|
name: 'Eiffel Tower',
|
|
address: 'Champ de Mars, Paris',
|
|
} as any);
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/reverse?lat=48.8584&lng=2.2945')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.name).toBe('Eiffel Tower');
|
|
});
|
|
|
|
it('MAPS-008 — POST /maps/resolve-url returns extracted coordinates', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.resolveGoogleMapsUrl).mockResolvedValueOnce({
|
|
lat: 48.8584,
|
|
lng: 2.2945,
|
|
} as any);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/resolve-url')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ url: 'https://maps.google.com/place/eiffel-tower' });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.lat).toBe(48.8584);
|
|
expect(res.body.lng).toBe(2.2945);
|
|
});
|
|
|
|
it('MAPS-002 — search service error propagates correct status', async () => {
|
|
const { user } = createUser(testDb);
|
|
const err = Object.assign(new Error('No API key'), { status: 503 });
|
|
vi.mocked(mapsService.searchPlaces).mockRejectedValueOnce(err);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/search')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ query: 'Anywhere' });
|
|
|
|
expect(res.status).toBe(503);
|
|
});
|
|
|
|
it('MAPS-003 — getPlaceDetails error returns 500', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.getPlaceDetails).mockRejectedValueOnce(new Error('External API failure'));
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/details/some-place-id')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(500);
|
|
expect(res.body).toHaveProperty('error');
|
|
});
|
|
|
|
it('MAPS-004 — getPlacePhoto error with status returns that status', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.getPlacePhoto).mockRejectedValueOnce(
|
|
Object.assign(new Error('Photo not found'), { status: 404 })
|
|
);
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/place-photo/some-place-id?lat=48.8&lng=2.3')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(404);
|
|
expect(res.body).toHaveProperty('error');
|
|
});
|
|
|
|
it('MAPS-005 — reverseGeocode error returns null values', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.reverseGeocode).mockRejectedValueOnce(new Error('Geocode failed'));
|
|
|
|
const res = await request(app)
|
|
.get('/api/maps/reverse?lat=48.8584&lng=2.2945')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.name).toBeNull();
|
|
expect(res.body.address).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe('Maps autocomplete', () => {
|
|
it('MAPS-009 — POST /maps/autocomplete without auth returns 401', async () => {
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.send({ input: 'Paris' });
|
|
expect(res.status).toBe(401);
|
|
});
|
|
|
|
it('MAPS-010 — POST /maps/autocomplete without input returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({});
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-011 — POST /maps/autocomplete with non-string input returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 123 });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-012 — POST /maps/autocomplete with invalid locationBias returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'Paris', locationBias: { low: { lat: NaN, lng: 2.3 }, high: { lat: 49, lng: 3 } } });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('MAPS-013 — POST /maps/autocomplete returns suggestions from service', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.autocompletePlaces).mockResolvedValueOnce({
|
|
suggestions: [
|
|
{ placeId: 'ChIJ1234', mainText: 'Paris', secondaryText: 'France' },
|
|
],
|
|
source: 'google',
|
|
});
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'Paris' });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.suggestions).toHaveLength(1);
|
|
expect(res.body.suggestions[0].mainText).toBe('Paris');
|
|
expect(res.body.source).toBe('google');
|
|
});
|
|
|
|
it('MAPS-014 — POST /maps/autocomplete passes lang and locationBias to service', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.autocompletePlaces).mockResolvedValueOnce({
|
|
suggestions: [],
|
|
source: 'google',
|
|
});
|
|
|
|
await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'test', lang: 'fr', locationBias: { low: { lat: 48.5, lng: 2.0 }, high: { lat: 49.0, lng: 2.8 } } });
|
|
|
|
expect(mapsService.autocompletePlaces).toHaveBeenCalledWith(
|
|
user.id,
|
|
'test',
|
|
'fr',
|
|
{ low: { lat: 48.5, lng: 2.0 }, high: { lat: 49.0, lng: 2.8 } },
|
|
);
|
|
});
|
|
|
|
it('MAPS-015 — autocomplete service error propagates correct status', async () => {
|
|
const { user } = createUser(testDb);
|
|
const err = Object.assign(new Error('Rate limited'), { status: 429 });
|
|
vi.mocked(mapsService.autocompletePlaces).mockRejectedValueOnce(err);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'test' });
|
|
|
|
expect(res.status).toBe(429);
|
|
expect(res.body.error).toBe('Rate limited');
|
|
});
|
|
|
|
it('MAPS-016 — autocomplete service error without status returns 500', async () => {
|
|
const { user } = createUser(testDb);
|
|
vi.mocked(mapsService.autocompletePlaces).mockRejectedValueOnce(new Error('Unknown'));
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'test' });
|
|
|
|
expect(res.status).toBe(500);
|
|
});
|
|
|
|
it('MAPS-017 — POST /maps/autocomplete with input > 200 chars returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/maps/autocomplete')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ input: 'a'.repeat(201) });
|
|
|
|
expect(res.status).toBe(400);
|
|
expect(res.body.error).toMatch(/too long/i);
|
|
});
|
|
});
|