mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-22 06:41:46 +00:00
Maurice
20791a29a7
* Migrate TREK 3 to NestJS + React 19 with a shared Zod contract layer
Brownfield strangler migration of the backend onto NestJS modules
(auth, trips, days, places, assignments, packing, todo, budget,
reservations, collab, files, photos, journey, share, settings, backup,
oidc, oauth, admin, atlas, vacay, weather, airports, maps, categories,
tags, notifications, system-notices) served through a per-prefix
dispatcher, keeping the existing SQLite/better-sqlite3 DB and JWT
httpOnly cookie auth, with behavioural parity for every route.
Client: React 19 upgrade, "page = wiring container + data hook"
pattern across all pages, per-domain Zustand stores bound to
@trek/shared contracts, and decomposition of the large components
(DayPlanSidebar, PackingListPanel, CollabNotes, FileManager,
MemoriesPanel, PlacesSidebar, CollabChat, SystemNoticeModal,
BudgetPanel, PlaceFormModal, ...) into focused render units backed by
in-file hooks.
Apply the shared global request pipeline (helmet/CSP, CORS, HSTS,
forced HTTPS, the global MFA policy and request logging) to the NestJS
instance as well, so a migrated route is protected identically to the
legacy fallback rather than bypassing it.
* Finish the NestJS migration — drop the legacy Express app
NestJS now serves the whole surface: every /api domain plus the platform
routes (uploads, /mcp, the OAuth/MCP SDK + /.well-known metadata and the
production SPA fallback). Removed server/src/app.ts, all of
server/src/routes/* and the strangler dispatcher; index.ts and the
integration suite share a single buildApp() bootstrap so prod and tests
can't drift.
- Platform/transport routes extracted to nest/platform/platform.routes.ts
and mounted before app.init() — Nest's router answers an unmatched
request with a 404, so a route registered after init is never reached.
The SPA fallback is a NotFoundException filter and the catch-all uses a
RegExp (Express 5's path-to-regexp rejects a bare '*').
- New modules: memories (/api/integrations/memories — the Journey
gallery's Immich/Synology proxy), addons (GET /api/addons) and the
cross-trip GET /api/reservations/upcoming.
- TrekExceptionFilter reproduces the old multer / err.statusCode handling
so upload rejections keep their 400/413 { error } body and non-ASCII
filenames survive (defParamCharset).
- addTripToJourney and the MCP get_journey_share_link tool gained the
trip-access check they were missing.
- Re-pointed the 34 integration tests + the websocket test onto the Nest
app; removed the now-meaningless Express-vs-Nest parity tests and a few
orphaned client components.
* Restore the reset-password rate limit and fix copyTrip reservation links
Two correctness/security gaps the NestJS migration introduced:
- POST /api/auth/reset-password lost its per-IP rate limiter. Restore it
(5 attempts / 15 min on a dedicated bucket, same as the old resetLimiter)
so reset tokens can't be brute-forced unthrottled. Covered by AUTH-019.
- copyTripById did not copy reservations.end_day_id (a day reference — now
remapped through dayMap like day_id) or needs_review, so a duplicated trip
lost multi-day transport end-day links and reset the review flag.
* Clean up dead code, dedupe helpers, fix the reset-password contract
- Remove server exports orphaned by the Express removal: the immich
album-link helpers, seven route-only service exports, getFileByIdFull;
de-export internal-only helpers (utcSuffix).
- De-duplicate verifyTripAccess (9 identical copies -> services/tripAccess.ts)
and avatarUrl (3 -> services/avatarUrl.ts); name the bcrypt cost
(BCRYPT_COST) and the email regex (EMAIL_REGEX). Public API unchanged.
- resetPasswordRequestSchema declared `password`, but the client sends and
the service reads `new_password` — rename it so the contract matches and
the client types resolve.
- Make ATLAS-013 deterministic: stub the admin-1 GeoJSON download instead of
fetching ~4600 features from GitHub during the test (it hung the suite).
* Make the client typecheck runnable (vitest/vite ambient types)
The client had no `typecheck` script and tsc couldn't even start (the
baseUrl deprecation errored out, same as server/shared already silence).
Add `ignoreDeprecations: "6.0"` to match the other workspaces, a `typecheck`
npm script, and a src/vite-env.d.ts referencing vite/client + vitest/globals
so tsc knows the test globals (describe/it/expect/vi). This turns ~3600
phantom "Cannot find name" errors into a real, measurable count (~590 actual
type errors remain, to be worked down). Type-only; no runtime change.
* Derive client domain types from the shared schema contracts
Add entity/response Zod schemas to @trek/shared (place, trip, assignment, day, budget, packing, reservation), each matched against the producing server service, and re-export them from client types.ts instead of the hand-written duplicates that had drifted (name/title, amount/total_price, owner_id/user_id, cover_url/cover_image, ...). Updates the call sites and test fixtures the corrected types surfaced; type-only, no runtime behaviour change.
* chore(db): log swallowed errors in addon-disable migration + guard against destructive migrations
The migration that disables the legacy "memories" addon swallowed any
error in an empty catch, as did ~30 other catch blocks in the migration
runner (column adds, the journey rebuild, index probes). Replace each
silent catch with the existing console.warn('[migrations] ...') log so
failures are visible. Control flow is unchanged: every step stays
non-fatal, nothing new is thrown.
Add a static guardrail test that scans the migration source and fails
when a new destructive statement (DROP TABLE / DROP COLUMN / TRUNCATE /
DELETE FROM / ALTER ... DROP) appears outside a reviewed allowlist, and
when an empty/silent catch block is reintroduced. The existing
destructive statements are all legitimate table rebuilds or
bounded cleanups and are recorded in the allowlist with a reason.
* Re-check SSRF on every redirect hop when resolving short links
Replace the one-shot checkSsrf + fetch(redirect:'follow') in the maps and place short-link resolvers with safeFetchFollow, which follows redirects manually and re-runs checkSsrf against the DNS-pinned IP of each hop (max 5). A redirect to an internal/loopback address is now blocked even when the initial URL is public, while legitimate cross-host redirects (goo.gl -> maps.google.com) still resolve.
* Reject WebSocket tokens minted before a password change
Stamp the user's password_version onto the ephemeral ws token and verify it on connect, closing the socket (4001) when it no longer matches, so a token issued before a password reset can't be replayed. Tokens minted without a version are treated as version 0, matching the JWT pv-claim semantics.
* fix(i18n): guard locale key parity and finish the OAuth consent page strings
Every non-en locale now exposes the exact same flat key set as en. Keys that
had drifted out of sync are backfilled with the English source value (tagged
en-fallback) so t() resolves a real string instead of relying on the silent
runtime fallback; no existing translation was touched and no key was removed.
Add a parity test that imports each aggregated locale bundle and asserts its
key set matches en, with a diagnostic listing of any missing/extra keys. This
complements the file-level check in shared/scripts by guarding the merged
export the app actually serves.
Finish internationalising OAuthAuthorizePage: the ~15 remaining hardcoded
English chrome strings now go through oauth.authorize.* keys (English source
in en, en-fallback placeholders elsewhere). Markup and behaviour are unchanged.
* Add semantic theme color tokens to Tailwind
Map the CSS theme variables from src/index.css (:root light / .dark dark) to named Tailwind utilities — bg-surface, text-content, border-edge, bg-accent and their variants. This gives components a Tailwind-native target for the theme colors so we can replace inline `style={{ ... 'var(--...)' }}` with utility classes without changing the rendered values.
* Surface silent store failures to the user and validate API responses in dev
Reservation toggle, todo/packing toggle and budget reorder were swallowing API errors after rolling back, so the user saw the change silently snap back with no explanation. Route those failures through the existing toast channel (new store/notify.ts bridges to window.__addToast, the same channel SystemNoticeBanner uses); the reservation toggle re-throws so ReservationsPanel's own translated toast finally fires. Also wire the existing parseInDev/checkInDev response validation into the maps and notification-test endpoints to catch contract drift in dev.
* Migrate static theme inline styles to Tailwind utilities and extract page sub-components
Replace the static, color-only inline `style={{ ... 'var(--bg-primary)' ... }}` props with the new semantic Tailwind utilities (bg-surface, text-content, border-edge, ...) wherever the result is byte-identical; dynamic/conditional theme styles and hardcoded status colors are left inline. Extract the Atlas country-search autocomplete, the Admin update banner, and two Journey dialogs into their own presentational components to shrink the oversized page files, keeping behaviour and markup identical.
* Remove the unrouted photos page and its dead photo components
PhotosPage was never wired into the router and its usePhotos hook read a tripStore photos slice that was never implemented; the Photos gallery, lightbox and upload components were only reachable through it. Per-trip photos now live in the Journey gallery (Immich/Synology). Removed the dead page, hook and components — the live Journey PhotoLightbox is a separate component and stays.
* Resolve the remaining client type errors and the trip.title navbar bug
Drive the client typecheck to zero without any/ts-ignore: convert the tripId route param to a number once at the page boundary so it matches the numeric props and store actions it feeds, fix trip.name -> trip.title (the wire field is title, so the old read rendered blank in the files/offline views), and tighten the scattered handler-arity, DOM-cast and untyped-payload sites. No runtime behaviour change.
* Convert the remaining dynamic and hardcoded inline styles to Tailwind utilities
Second styling pass over the components and pages: move conditional theme colors into className ternaries (bg-accent / bg-surface-hover etc.), turn reused CSSProperties constants into className constants, and express static hardcoded hex/rgba colors as Tailwind arbitrary values so the exact rendered colour is preserved. Truly dynamic styling (computed geometry, gradients, multi-part shadows, data-driven colours, the undefined --sidebar/--nav layout vars) stays inline as it cannot be expressed as a static class. Updated three component tests that asserted the old inline active-state styles to assert the equivalent utility class instead.
Verified: client typecheck 0, full client suite green, and a live light/dark render check in the dev server confirms the semantic theme tokens resolve correctly (the earlier 'transparent popups' were a stale dev server that pre-dated the tailwind.config token addition, not a code issue).
* Add eslint flat-config for client and server and gate typecheck, lint and pages in CI
client and server had lint scripts but no eslint config (only shared was linted in CI). Add flat configs mirroring shared's stack (js + typescript-eslint recommended + eslint-config-prettier) plus the client's react-hooks/react-refresh plugins. Pre-existing patterns in this never-linted code (explicit any, require() in the CommonJS server, empty catches, exhaustive-deps) are set to 'warn' rather than 'error' so the gate passes at 0 errors without a repo-wide reformat — these can be ratcheted to errors over time. Wire blocking typecheck + lint + lint:pages steps into the client and server CI jobs (now that both typechecks are clean) and promote the server typecheck from informational to blocking.
* Decompose the remaining God Components into hooks, helpers and sub-components
FE6: split the oversized page and panel components into thin layout shells plus colocated use<Component> hooks, .constants.ts, .helpers.ts (with tests) and presentational sub-components, following the established 'logic in a hook, render in slices' pattern. Behaviour, markup, classes and effect order are unchanged. Largest reductions: PackingListPanel 1598->42, FileManager 1055->36, AdminPage 1525->167, BudgetPanel 1266->146, JourneyDetailPage 2822->547, PlacesSidebar 945->66, CollabChat 861->106, CollabNotes 1417->532. DayPlanSidebar's drag-and-drop render body was left intact (ref-identity sensitive) and only its toolbar/modals/constants were extracted.
* Fix duplicate React keys in the file-assign place list
When a place is assigned to the same day more than once it appeared twice in a day's list, so the place-button key={p.id} collided and React warned about duplicate keys. Key by place id + render index so siblings stay unique. Pre-existing in the old FileManager; behaviour unchanged.
* Format the shared package and drop an unused import to satisfy the lint gate
The i18n and schema changes added code that wasn't prettier-formatted, and place.schema.ts imported categorySchema without using it. Run prettier over shared and remove the import so 'npm run lint' + 'format:check' pass.
* Install all workspaces in the server CI job so SWC's native binary is present
The server vitest config transforms via unplugin-swc, which needs @swc/core's platform-specific native binary. A workspace-scoped 'npm ci --workspace server' skips that optional dependency, so vitest failed to load the config on the Linux runner. Use a full 'npm ci'.
* Re-resolve dependencies with npm install in the server CI job for SWC
Full 'npm ci' still skipped @swc/core's Linux native binary because the committed lockfile was generated on Windows and lacks the Linux optional-dep install metadata. 'npm install' re-resolves and fetches the platform-matching binary, which the server's unplugin-swc transform needs to load vitest.config.ts.
* Install @swc/core's Linux binary explicitly in the server CI job
Neither npm ci nor npm install fetched @swc/core-linux-x64-gnu on the Linux runner because the lockfile was generated on Windows and lacks the Linux optional-dep metadata. Add a step that installs the matching @swc/core-linux-x64-gnu version (no-save, no-lockfile) so unplugin-swc can load the server's vitest config.
* Use legacy-peer-deps when installing the SWC Linux binary in CI
The explicit @swc/core-linux-x64-gnu install re-resolved the tree and hit the pre-existing lucide-react/react-19 peer conflict that the lockfile was generated around. Add --legacy-peer-deps so the step matches the project's resolution and installs the binary.
* Keep the lockfile when installing the SWC binary so other deps stay pinned
Dropping --no-package-lock made npm re-resolve the whole tree and upgrade eslint, whose newer recommended config flagged no-useless-assignment as an error in the server lint step. Keep the lockfile so only @swc/core-linux-x64-gnu is added and every other dependency (incl. eslint) stays at its locked version.
102 lines
6.1 KiB
TypeScript
102 lines
6.1 KiB
TypeScript
import type { TranslationStrings } from '../types';
|
|
|
|
const oauth: TranslationStrings = {
|
|
'oauth.scope.group.trips': '行程',
|
|
'oauth.scope.group.places': '地點',
|
|
'oauth.scope.group.atlas': 'Atlas',
|
|
'oauth.scope.group.packing': '行李',
|
|
'oauth.scope.group.todos': '待辦事項',
|
|
'oauth.scope.group.budget': '預算',
|
|
'oauth.scope.group.reservations': '預訂',
|
|
'oauth.scope.group.collab': '協作',
|
|
'oauth.scope.group.notifications': '通知',
|
|
'oauth.scope.group.vacay': '假期',
|
|
'oauth.scope.group.geo': 'Geo',
|
|
'oauth.scope.group.weather': '天氣',
|
|
'oauth.scope.group.journey': '旅程',
|
|
'oauth.scope.trips:read.label': '檢視行程與旅遊計畫',
|
|
'oauth.scope.trips:read.description': '讀取行程、天數、每日筆記及成員',
|
|
'oauth.scope.trips:write.label': '編輯行程與旅遊計畫',
|
|
'oauth.scope.trips:write.description': '建立及更新行程、天數、筆記並管理成員',
|
|
'oauth.scope.trips:delete.label': '刪除行程',
|
|
'oauth.scope.trips:delete.description': '永久刪除整個行程——此操作無法復原',
|
|
'oauth.scope.trips:share.label': '管理分享連結',
|
|
'oauth.scope.trips:share.description': '建立、更新及撤銷行程的公開分享連結',
|
|
'oauth.scope.places:read.label': '檢視地點與地圖資料',
|
|
'oauth.scope.places:read.description': '讀取地點、每日指派、標籤及類別',
|
|
'oauth.scope.places:write.label': '管理地點',
|
|
'oauth.scope.places:write.description': '建立、更新及刪除地點、指派及標籤',
|
|
'oauth.scope.atlas:read.label': '檢視 Atlas',
|
|
'oauth.scope.atlas:read.description': '讀取已造訪的國家、地區及願望清單',
|
|
'oauth.scope.atlas:write.label': '管理 Atlas',
|
|
'oauth.scope.atlas:write.description': '標記已造訪的國家及地區，管理願望清單',
|
|
'oauth.scope.packing:read.label': '檢視行李清單',
|
|
'oauth.scope.packing:read.description': '讀取行李物品、行李袋及類別負責人',
|
|
'oauth.scope.packing:write.label': '管理行李清單',
|
|
'oauth.scope.packing:write.description':
|
|
'新增、更新、刪除、勾選及重新排序行李物品和行李袋',
|
|
'oauth.scope.todos:read.label': '檢視待辦清單',
|
|
'oauth.scope.todos:read.description': '讀取行程待辦事項及類別負責人',
|
|
'oauth.scope.todos:write.label': '管理待辦清單',
|
|
'oauth.scope.todos:write.description':
|
|
'建立、更新、勾選、刪除及重新排序待辦事項',
|
|
'oauth.scope.budget:read.label': '檢視預算',
|
|
'oauth.scope.budget:read.description': '讀取預算項目及費用明細',
|
|
'oauth.scope.budget:write.label': '管理預算',
|
|
'oauth.scope.budget:write.description': '建立、更新及刪除預算項目',
|
|
'oauth.scope.reservations:read.label': '檢視預訂',
|
|
'oauth.scope.reservations:read.description': '讀取預訂及住宿詳情',
|
|
'oauth.scope.reservations:write.label': '管理預訂',
|
|
'oauth.scope.reservations:write.description':
|
|
'建立、更新、刪除及重新排序預訂',
|
|
'oauth.scope.collab:read.label': '檢視協作',
|
|
'oauth.scope.collab:read.description': '讀取協作筆記、投票及訊息',
|
|
'oauth.scope.collab:write.label': '管理協作',
|
|
'oauth.scope.collab:write.description':
|
|
'建立、更新及刪除協作筆記、投票及訊息',
|
|
'oauth.scope.notifications:read.label': '檢視通知',
|
|
'oauth.scope.notifications:read.description': '讀取應用程式通知及未讀數量',
|
|
'oauth.scope.notifications:write.label': '管理通知',
|
|
'oauth.scope.notifications:write.description': '將通知標為已讀並回覆',
|
|
'oauth.scope.vacay:read.label': '檢視假期計畫',
|
|
'oauth.scope.vacay:read.description': '讀取假期計畫資料、項目及統計',
|
|
'oauth.scope.vacay:write.label': '管理假期計畫',
|
|
'oauth.scope.vacay:write.description': '建立及管理假期項目、節假日及團隊計畫',
|
|
'oauth.scope.geo:read.label': '地圖與地理編碼',
|
|
'oauth.scope.geo:read.description':
|
|
'搜尋地點、解析地圖 URL 及反向地理編碼坐標',
|
|
'oauth.scope.weather:read.label': '天氣預報',
|
|
'oauth.scope.weather:read.description': '取得行程地點及日期的天氣預報',
|
|
'oauth.scope.journey:read.label': '檢視旅程',
|
|
'oauth.scope.journey:read.description': '讀取旅程、條目及貢獻者清單',
|
|
'oauth.scope.journey:write.label': '管理旅程',
|
|
'oauth.scope.journey:write.description': '建立、更新及刪除旅程及其條目',
|
|
'oauth.scope.journey:share.label': '管理旅程連結',
|
|
'oauth.scope.journey:share.description': '建立、更新及撤銷旅程的公開分享連結',
|
|
'oauth.authorize.authorizing': 'Authorizing…', // en-fallback
|
|
'oauth.authorize.loading': 'Loading…', // en-fallback
|
|
'oauth.authorize.errorTitle': 'Authorization Error', // en-fallback
|
|
'oauth.authorize.loginTitle': 'Sign in to continue', // en-fallback
|
|
'oauth.authorize.loginDescription':
|
|
'{client} wants access to your TREK account. Please sign in first.', // en-fallback
|
|
'oauth.authorize.loginButton': 'Sign in to TREK', // en-fallback
|
|
'oauth.authorize.requestLabel': 'Authorization Request', // en-fallback
|
|
'oauth.authorize.requestDescription':
|
|
'This application is requesting access to your TREK account.', // en-fallback
|
|
'oauth.authorize.trustNote':
|
|
'Only grant access to applications you trust. Your data stays on your server.', // en-fallback
|
|
'oauth.authorize.selectScope': 'Select at least one scope', // en-fallback
|
|
'oauth.authorize.approveOneScope': 'Approve ({count} scope)', // en-fallback
|
|
'oauth.authorize.approveManyScopes': 'Approve ({count} scopes)', // en-fallback
|
|
'oauth.authorize.approveAccess': 'Approve Access', // en-fallback
|
|
'oauth.authorize.deny': 'Deny', // en-fallback
|
|
'oauth.authorize.choosePermissions': 'Choose which permissions to grant', // en-fallback
|
|
'oauth.authorize.permissionsRequested': 'Permissions requested', // en-fallback
|
|
'oauth.authorize.alwaysIncluded': 'Always included', // en-fallback
|
|
'oauth.authorize.alwaysTool.listTrips':
|
|
'List your trips so the AI can discover trip IDs', // en-fallback
|
|
'oauth.authorize.alwaysTool.getTripSummary':
|
|
'Read a trip overview needed to use any other tool', // en-fallback
|
|
};
|
|
export default oauth;
|