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.
47 lines
1.8 KiB
TypeScript
47 lines
1.8 KiB
TypeScript
import { Request, Response } from 'express';
|
|
import { SESSION_DURATION_MS } from '../config';
|
|
|
|
const COOKIE_NAME = 'trek_session';
|
|
|
|
/**
|
|
* Decide whether the session cookie should carry the `Secure` flag.
|
|
*
|
|
* We previously only derived this from `NODE_ENV=production` or
|
|
* `FORCE_HTTPS=true`. That left behind a common self-host setup:
|
|
* TREK running behind Traefik / Caddy / Cloudflare Tunnel with
|
|
* `NODE_ENV=development` locally and no `FORCE_HTTPS` — the cookie
|
|
* went out without `Secure`, even though the public leg was https.
|
|
*
|
|
* Now we also honour `req.secure`, which Express derives from
|
|
* `X-Forwarded-Proto` once `trust proxy` is set (TREK sets it to `1`
|
|
* in production automatically). If Express sees the request was TLS
|
|
* on the outermost hop, the cookie is `Secure`. `COOKIE_SECURE=false`
|
|
* remains the explicit escape hatch for plain-HTTP LAN testing.
|
|
*/
|
|
export function cookieOptions(clear = false, req?: Request) {
|
|
if (process.env.COOKIE_SECURE?.toLowerCase() === 'false') {
|
|
return buildOptions(clear, false);
|
|
}
|
|
const envSecure = process.env.NODE_ENV?.toLowerCase() === 'production' || process.env.FORCE_HTTPS?.toLowerCase() === 'true';
|
|
const requestSecure = req?.secure === true;
|
|
return buildOptions(clear, envSecure || requestSecure);
|
|
}
|
|
|
|
function buildOptions(clear: boolean, secure: boolean) {
|
|
return {
|
|
httpOnly: true,
|
|
secure,
|
|
sameSite: 'lax' as const,
|
|
path: '/',
|
|
...(clear ? {} : { maxAge: SESSION_DURATION_MS }), // matches the JWT expiry (SESSION_DURATION)
|
|
};
|
|
}
|
|
|
|
export function setAuthCookie(res: Response, token: string, req?: Request): void {
|
|
res.cookie(COOKIE_NAME, token, cookieOptions(false, req));
|
|
}
|
|
|
|
export function clearAuthCookie(res: Response, req?: Request): void {
|
|
res.clearCookie(COOKIE_NAME, cookieOptions(true, req));
|
|
}
|