mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 21:31: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.
184 lines
6.7 KiB
TypeScript
184 lines
6.7 KiB
TypeScript
/**
|
|
* Categories integration tests — CAT-001 through CAT-009.
|
|
* Covers GET/POST/PUT/DELETE /api/categories.
|
|
*/
|
|
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: () => null,
|
|
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() }));
|
|
|
|
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, createAdmin } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
|
|
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('Categories', () => {
|
|
it('CAT-001: GET /api/categories returns seeded default categories', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.get('/api/categories')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(Array.isArray(res.body.categories)).toBe(true);
|
|
// 10 default categories are seeded on reset
|
|
expect(res.body.categories.length).toBeGreaterThanOrEqual(10);
|
|
expect(res.body.categories[0]).toMatchObject({ name: expect.any(String), color: expect.any(String), icon: expect.any(String) });
|
|
});
|
|
|
|
it('CAT-002: POST /api/categories - admin creates a new category', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
const res = await request(app)
|
|
.post('/api/categories')
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ name: 'Museum', color: '#7c3aed', icon: '🏛️' });
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.category).toMatchObject({ name: 'Museum', color: '#7c3aed', icon: '🏛️' });
|
|
expect(res.body.category.id).toBeDefined();
|
|
});
|
|
|
|
it('CAT-003: POST /api/categories - non-admin returns 403', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.post('/api/categories')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Museum' });
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it('CAT-004: POST /api/categories - missing name returns 400', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
const res = await request(app)
|
|
.post('/api/categories')
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ color: '#7c3aed' });
|
|
expect(res.status).toBe(400);
|
|
expect(res.body.error).toBeDefined();
|
|
});
|
|
|
|
it('CAT-005: PUT /api/categories/:id - admin updates a category', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
// First create one
|
|
const createRes = await request(app)
|
|
.post('/api/categories')
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ name: 'Old Name', color: '#aaaaaa', icon: '📌' });
|
|
const catId = createRes.body.category.id;
|
|
|
|
const res = await request(app)
|
|
.put(`/api/categories/${catId}`)
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ name: 'New Name', color: '#bbbbbb' });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.category.name).toBe('New Name');
|
|
expect(res.body.category.color).toBe('#bbbbbb');
|
|
// Icon unchanged
|
|
expect(res.body.category.icon).toBe('📌');
|
|
});
|
|
|
|
it('CAT-006: PUT /api/categories/:id - non-admin returns 403', async () => {
|
|
const { user } = createUser(testDb);
|
|
// Get a seeded category id
|
|
const cat = testDb.prepare('SELECT id FROM categories LIMIT 1').get() as { id: number };
|
|
const res = await request(app)
|
|
.put(`/api/categories/${cat.id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Hacked' });
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it('CAT-007: PUT /api/categories/:id - non-existent category returns 404', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
const res = await request(app)
|
|
.put('/api/categories/99999')
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ name: 'Ghost' });
|
|
expect(res.status).toBe(404);
|
|
});
|
|
|
|
it('CAT-008: DELETE /api/categories/:id - admin deletes a category', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
const createRes = await request(app)
|
|
.post('/api/categories')
|
|
.set('Cookie', authCookie(admin.id))
|
|
.send({ name: 'To Delete' });
|
|
const catId = createRes.body.category.id;
|
|
|
|
const res = await request(app)
|
|
.delete(`/api/categories/${catId}`)
|
|
.set('Cookie', authCookie(admin.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
|
|
// Verify it's gone
|
|
const gone = testDb.prepare('SELECT id FROM categories WHERE id = ?').get(catId);
|
|
expect(gone).toBeUndefined();
|
|
});
|
|
|
|
it('CAT-009: DELETE /api/categories/:id - non-admin returns 403', async () => {
|
|
const { user } = createUser(testDb);
|
|
const cat = testDb.prepare('SELECT id FROM categories LIMIT 1').get() as { id: number };
|
|
const res = await request(app)
|
|
.delete(`/api/categories/${cat.id}`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it('CAT-010: GET /api/categories - unauthenticated returns 401', async () => {
|
|
const res = await request(app).get('/api/categories');
|
|
expect(res.status).toBe(401);
|
|
});
|
|
});
|