refactor(api): collapse /admin/account and /player/account onto /auth/me/account
Self-service account security had three URL surfaces onto one controller. All
three mounted the same `admin/account.controller.js` handlers; each of the three
router files carried a header comment apologising for the arrangement.
`/auth/me/account` was already a strict superset, which settles which to keep:
/admin/account 6 routes noindex, isLoggedIn, staffOnly
/player/account 8 routes noindex, requireAuth
/auth/me/account 10 routes noindex, requireAuth
Neither of the deleted surfaces carried recovery codes, and /admin/account
carried no username or password change at all — so client.js already called
/auth/me/account/recovery-codes/* for two operations on a screen it otherwise
served from /admin/account. The split was leaking before this change.
Gating is equivalent where it overlapped: /player and /auth/me apply identical
`noindex, requireAuth`, and `staffOnly` on /admin/account was strictly narrower
while buying nothing, since every handler is self-scoped to req.user.id. There
is no CSRF layer to differ.
- 14 routes deleted, 0 added, no handler changed.
- account.controller.js moves router/v1/admin/ -> router/v1/auth/, beside the
one router that still reaches it.
- Web client: 14 call sites move onto a root-level api.myAccount /
api.changeUsername / ... group, matching the /auth/me methods already there.
- Android app: no change. MeApi.kt was already 100% /auth/me/account/*.
- Two swagger tags, `Admin · Account` and `Player`, were declared only by the
deleted routes and go with them. The orphaned `AccountStatus` schema goes
too; `PlayerAccount` is re-described as the any-role /auth/me/account shape
(the name is kept so existing $refs resolve).
Breaking to the published OpenAPI surface, accepted deliberately: both consumers
are in this org, and deprecate-then-delete would leave the next phase deciding
whether to add routes to surfaces already marked for removal.
Verification: routes.manifest.json shows exactly 14 deletions and 0 additions.
The OpenAPI spec loses the same 14 paths with zero surviving path definitions
changed; its large textual diff is pure reordering, because removing the
first-mounted router shifts every later path. 1203 server tests, 288 client
tests, 53 bot tests green; check:modules, check:hosts and routes:manifest
--check all pass.
Design of record: docs/website/ENGAGEMENT.md Phase 1a. This lands ahead of
engagement Phase 1b, which adds a self-service email field — written once here
rather than three times.
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,14 +1,17 @@
|
||||
// ── Role-agnostic self-service ("me") under /auth/me ───────────────────────
|
||||
//
|
||||
// The canonical self surface for EVERY authenticated role (player and staff
|
||||
// alike). It reuses the exact same account.controller handlers as
|
||||
// /player/account/* and /admin/account/* — no logic duplication — but gates on
|
||||
// requireAuth ONLY (any authenticated, active account), never on a specific role.
|
||||
// The ONLY self surface, for every authenticated role (player and staff alike).
|
||||
// It gates on requireAuth ONLY (any authenticated, active account), never on a
|
||||
// specific role.
|
||||
//
|
||||
// Why it exists: the Android app wants one self surface it can call regardless of
|
||||
// role, and it must never touch /admin (docs/android/PLAN.md §6.4). The older
|
||||
// /player/account/* and /admin/account/* routes stay for web back-compat; these
|
||||
// /auth/me/* routes are the additive, role-agnostic canonical form.
|
||||
// role, and it must never touch /admin (docs/android/PLAN.md §6.4).
|
||||
//
|
||||
// It used to be the third of three URL surfaces onto account.controller, beside
|
||||
// /player/account/* and /admin/account/*. Those were deleted: both were strictly
|
||||
// smaller than this one (neither carried recovery codes, and /admin/account
|
||||
// carried no username or password change), so the web client already had to reach
|
||||
// in here for part of one screen. New self-service fields go here and only here.
|
||||
//
|
||||
// requireAuth sets req.user to the fresh DB row and enforces the status + session
|
||||
// cutoff/revocation checks on every request, exactly as the account handlers
|
||||
@@ -17,7 +20,7 @@
|
||||
const express = require('express')
|
||||
const { body, param } = require('express-validator')
|
||||
|
||||
const account = require('../admin/account.controller')
|
||||
const account = require('./account.controller')
|
||||
const { requireAuth } = require('../../../auth/session.middleware')
|
||||
const noindex = require('../../../middleware/noindex')
|
||||
const validate = require('../../../middleware/validate')
|
||||
@@ -76,8 +79,8 @@ meRouter.patch(
|
||||
account.changePassword,
|
||||
)
|
||||
|
||||
// TOTP self-enrollment — identical to the player/admin account flow (disable
|
||||
// requires a valid current code; it does not take a password).
|
||||
// TOTP self-enrollment (disable requires a valid current code; it does not take
|
||||
// a password).
|
||||
meRouter.post(
|
||||
'/account/totp/setup',
|
||||
// #swagger.tags = ['Auth · Me']
|
||||
|
||||
Reference in New Issue
Block a user