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.
281 lines
10 KiB
TypeScript
281 lines
10 KiB
TypeScript
/**
|
|
* User Profile & Settings integration tests.
|
|
* Covers PROFILE-001 to PROFILE-015.
|
|
*/
|
|
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';
|
|
import path from 'path';
|
|
|
|
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() }));
|
|
|
|
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, createTrip } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
|
|
let nestApp: INestApplication;
|
|
let app: Application;
|
|
const FIXTURE_JPEG = path.join(__dirname, '../fixtures/small-image.jpg');
|
|
const FIXTURE_PDF = path.join(__dirname, '../fixtures/test.pdf');
|
|
|
|
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();
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// Profile
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('PROFILE-001 — Get current user profile', () => {
|
|
it('returns user object with expected fields', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.get('/api/auth/me')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.user).toMatchObject({
|
|
id: user.id,
|
|
email: user.email,
|
|
username: user.username,
|
|
});
|
|
expect(res.body.user.password_hash).toBeUndefined();
|
|
expect(res.body.user.mfa_secret).toBeUndefined();
|
|
expect(res.body.user).toHaveProperty('mfa_enabled');
|
|
expect(res.body.user).toHaveProperty('must_change_password');
|
|
});
|
|
});
|
|
|
|
describe('Avatar', () => {
|
|
it('PROFILE-002 — upload valid JPEG avatar updates avatar_url', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.post('/api/auth/avatar')
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('avatar', FIXTURE_JPEG);
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.avatar_url).toBeDefined();
|
|
expect(typeof res.body.avatar_url).toBe('string');
|
|
});
|
|
|
|
it('PROFILE-003 — uploading non-image (PDF) is rejected', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.post('/api/auth/avatar')
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('avatar', FIXTURE_PDF);
|
|
// multer fileFilter rejects non-image types (cb(null, false) → req.file undefined → 400)
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('PROFILE-005 — DELETE /api/auth/avatar clears avatar_url', async () => {
|
|
const { user } = createUser(testDb);
|
|
// Upload first
|
|
await request(app)
|
|
.post('/api/auth/avatar')
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('avatar', FIXTURE_JPEG);
|
|
|
|
const res = await request(app)
|
|
.delete('/api/auth/avatar')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
|
|
const me = await request(app)
|
|
.get('/api/auth/me')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(me.body.user.avatar_url).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe('Password change', () => {
|
|
it('PROFILE-006 — change password with valid credentials succeeds', async () => {
|
|
const { user, password } = createUser(testDb);
|
|
const res = await request(app)
|
|
.put('/api/auth/me/password')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ current_password: password, new_password: 'NewStr0ng!Pass', confirm_password: 'NewStr0ng!Pass' });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
});
|
|
|
|
it('PROFILE-007 — wrong current password returns 401', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.put('/api/auth/me/password')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ current_password: 'WrongPass1!', new_password: 'NewStr0ng!Pass', confirm_password: 'NewStr0ng!Pass' });
|
|
expect(res.status).toBe(401);
|
|
});
|
|
|
|
it('PROFILE-008 — weak new password is rejected', async () => {
|
|
const { user, password } = createUser(testDb);
|
|
const res = await request(app)
|
|
.put('/api/auth/me/password')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ current_password: password, new_password: 'weak', confirm_password: 'weak' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
});
|
|
|
|
describe('Settings', () => {
|
|
it('PROFILE-009 — PUT /api/settings with key+value persists and GET returns it', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const put = await request(app)
|
|
.put('/api/settings')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ key: 'dark_mode', value: 'dark' });
|
|
expect(put.status).toBe(200);
|
|
|
|
const get = await request(app)
|
|
.get('/api/settings')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(get.status).toBe(200);
|
|
expect(get.body.settings).toHaveProperty('dark_mode', 'dark');
|
|
});
|
|
|
|
it('PROFILE-009 — PUT /api/settings without key returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
const res = await request(app)
|
|
.put('/api/settings')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ value: 'dark' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('PROFILE-010 — POST /api/settings/bulk saves multiple keys atomically', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/settings/bulk')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ settings: { theme: 'dark', language: 'fr', timezone: 'Europe/Paris' } });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
|
|
const get = await request(app)
|
|
.get('/api/settings')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(get.body.settings).toHaveProperty('theme', 'dark');
|
|
expect(get.body.settings).toHaveProperty('language', 'fr');
|
|
expect(get.body.settings).toHaveProperty('timezone', 'Europe/Paris');
|
|
});
|
|
});
|
|
|
|
describe('Account deletion', () => {
|
|
it('PROFILE-013 — DELETE /api/auth/me removes account, subsequent login fails', async () => {
|
|
const { user, password } = createUser(testDb);
|
|
|
|
const del = await request(app)
|
|
.delete('/api/auth/me')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(del.status).toBe(200);
|
|
|
|
// Should not be able to log in
|
|
const login = await request(app)
|
|
.post('/api/auth/login')
|
|
.send({ email: user.email, password });
|
|
expect(login.status).toBe(401);
|
|
});
|
|
|
|
it('PROFILE-013 — admin cannot delete their own account', async () => {
|
|
const { user: admin } = createAdmin(testDb);
|
|
// Admins are protected from self-deletion
|
|
const res = await request(app)
|
|
.delete('/api/auth/me')
|
|
.set('Cookie', authCookie(admin.id));
|
|
// deleteAccount returns 400 when the user is the last admin
|
|
expect(res.status).toBe(400);
|
|
});
|
|
});
|
|
|
|
describe('Travel stats', () => {
|
|
it('PROFILE-014 — GET /api/auth/travel-stats returns stats object', async () => {
|
|
const { user } = createUser(testDb);
|
|
createTrip(testDb, user.id, {
|
|
title: 'France Trip',
|
|
start_date: '2024-06-01',
|
|
end_date: '2024-06-05',
|
|
});
|
|
|
|
const res = await request(app)
|
|
.get('/api/auth/travel-stats')
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toHaveProperty('totalTrips');
|
|
expect(res.body.totalTrips).toBeGreaterThanOrEqual(1);
|
|
});
|
|
});
|
|
|
|
describe('Demo mode protections', () => {
|
|
it('PROFILE-015 — demo user cannot upload avatar (demoUploadBlock)', async () => {
|
|
// demoUploadBlock checks for email === 'demo@nomad.app'
|
|
testDb.prepare(
|
|
"INSERT INTO users (username, email, password_hash, role) VALUES ('demo', 'demo@nomad.app', 'x', 'user')"
|
|
).run();
|
|
const demoUser = testDb.prepare('SELECT id FROM users WHERE email = ?').get('demo@nomad.app') as { id: number };
|
|
process.env.DEMO_MODE = 'true';
|
|
|
|
try {
|
|
const res = await request(app)
|
|
.post('/api/auth/avatar')
|
|
.set('Cookie', authCookie(demoUser.id))
|
|
.attach('avatar', FIXTURE_JPEG);
|
|
expect(res.status).toBe(403);
|
|
} finally {
|
|
delete process.env.DEMO_MODE;
|
|
}
|
|
});
|
|
});
|