- {post.author} - {post.authorDeleted && ' (account removed)'} + {markDeleted(post.author, post.authorDeleted)} {post.editedAt && ' · edited'} {post.status === 'hidden' && ' · hidden'}
diff --git a/client/src/modules/version.js b/client/src/modules/version.js index 138f1b4..f9deb23 100644 --- a/client/src/modules/version.js +++ b/client/src/modules/version.js @@ -11,6 +11,9 @@ // that the two files can drift, so a test asserts they agree // (client/test/moduleRegistry.test.js) rather than trusting a bump to remember // both. +// 1.20.0 — `api.onUserDeleting` (ACCOUNT_DELETION.md §4.1, AD10): a module +// unlinks a person's game links before their account is deleted. Server-side +// only. This file bumps for the reason at the top. // 1.19.0 — an event action may declare `demoRefuses(params)` (DEMO_MODE.md §3.4, // DM18): the demo refuses a step at save. Server-side only; the refusal reaches // the browser as an ordinary DEMO_LOCKED answer. This file bumps for the reason at the top. @@ -105,4 +108,4 @@ // but the two halves state ONE version: a module declares a single coreApi range // and is served one chunk, so a client that claimed 1.0.0 while the server // answered 1.1.0 would be two answers to one question. -export const MODULE_API_VERSION = '1.19.0' +export const MODULE_API_VERSION = '1.20.0' diff --git a/client/src/routes/admin/views/AccountAdmin.jsx b/client/src/routes/admin/views/AccountAdmin.jsx index 0745ce7..181ea8b 100644 --- a/client/src/routes/admin/views/AccountAdmin.jsx +++ b/client/src/routes/admin/views/AccountAdmin.jsx @@ -5,6 +5,7 @@ import RecoveryCodesDisplay from '../../../components/security/RecoveryCodesDisp import TrustedDevicesPanel from '../../../components/security/TrustedDevicesPanel.jsx' import RecoveryCodesPanel from '../../../components/security/RecoveryCodesPanel.jsx' import EmailAddressPanel from '../../../components/security/EmailAddressPanel.jsx' +import DeleteAccountPanel from '../../../components/security/DeleteAccountPanel.jsx' import { IdentitySummary, linkBanner, linkableProviders, unlinkPrompt } from '../../../components/security/linkedIdentities.jsx' import { api } from '../../../api/client.js' @@ -315,6 +316,10 @@ export default function AccountAdmin() { {account &&x
', created_at: new Date(), team_id: 1, thread_title: 'Raid night', + }]) + + for (const role of ['admin', 'editor', 'moderator']) { + // eslint-disable-next-line no-await-in-loop + const [item] = await reports.queue({ viewer: { role } }) + assert.equal(item.reporter, 'Ravenna', role) + assert.equal(item.reporterDeleted, true) + assert.equal(item.handledBy, 'OldMod') + assert.equal(item.handledByDeleted, true) + assert.equal(item.target.author, 'Thorne') + assert.equal(item.target.authorDeleted, true) + } + + // Nothing but a staff viewer sees those names, so a caller that forgot to say + // who is reading cannot leak them. + const [blind] = await reports.queue({}) + assert.equal(blind.reporter, '[deleted player]') + assert.equal(blind.handledBy, '[deleted player]') + assert.equal(blind.target.author, '[deleted player]') +}) + +test('an open report has no handler, which is not a deleted handler', async () => { + patch(reportsDb, 'list', async () => [row()]) + patch(reportsDb, 'threadsByIds', async () => []) + patch(reportsDb, 'postsByIds', async () => []) + patch(reportsDb, 'uploadsByIds', async () => []) + + const [item] = await reports.queue({ viewer: { role: 'admin' } }) + assert.equal(item.handledBy, null) + assert.equal(item.handledByDeleted, false) + assert.equal(item.reporter, 'wanderer') + assert.equal(item.reporterDeleted, false) +}) + // ── handling ─────────────────────────────────────────────────────────────── test('handling records who decided, when, and why', async () => { diff --git a/server/test/demoLocks.test.js b/server/test/demoLocks.test.js index e0111fa..1a14fa6 100644 --- a/server/test/demoLocks.test.js +++ b/server/test/demoLocks.test.js @@ -234,6 +234,7 @@ const SELF_ROWS = [ ['POST', '/auth/me/account/recovery-codes/generate'], ['DELETE', '/auth/me/account/identities/steam'], ['DELETE', '/auth/me/sessions/12'], // DM17 + ['DELETE', '/auth/me/account'], // ACCOUNT_DELETION.md §4.3 ] test('signed in as a shared login, the account cannot be changed or other sessions revoked', async () => { diff --git a/server/test/displayAuthor.test.js b/server/test/displayAuthor.test.js new file mode 100644 index 0000000..d566a73 --- /dev/null +++ b/server/test/displayAuthor.test.js @@ -0,0 +1,159 @@ +// ── Who a deleted account's snapshots show as (ACCOUNT_DELETION.md AD5, AD6) ── +// +// The rule itself, then each place a member can read a snapshot: forum threads +// and posts, the leader's guest list, and the Team digest mail. The Reports +// queue (staff-only) is covered in contentReports.test.js. +process.env.DB_HOST = '127.0.0.1' +process.env.DB_PORT = '59999' + +const { test, afterEach, after } = require('node:test') +const assert = require('node:assert/strict') + +const { displayAuthor, DELETED_PLAYER, seesDeletedNames, hasActor } = require('../src/utils/displayAuthor') +const forum = require('../src/model/teams/teamForum.model') +const grants = require('../src/model/teams/teamGrants.model') +const accessDb = require('../src/model/teams/teamAccess.db') +const teamsDb = require('../src/model/teams/teams.db') +const db = require('../src/utils/db') + +after(() => db.close()) + +const saved = [] +function patch(obj, key, value) { + saved.push([obj, key, obj[key]]) + obj[key] = value +} +afterEach(() => { + while (saved.length) { + const [obj, key, value] = saved.pop() + obj[key] = value + } +}) + +const MEMBER = { role: 'player' } +const STAFF = ['admin', 'editor', 'moderator'].map((role) => ({ role })) + +// ── the rule ─────────────────────────────────────────────────────────────── + +test('a live account shows its name to everyone', () => { + for (const viewer of [null, MEMBER, ...STAFF]) { + assert.deepEqual(displayAuthor({ userId: 4, username: 'Thorne' }, viewer), { name: 'Thorne', deleted: false }) + } +}) + +test('a deleted account reads "[deleted player]" to members and visitors (AD5)', () => { + assert.equal(DELETED_PLAYER, '[deleted player]') + for (const viewer of [null, undefined, MEMBER, { role: 'leader' }, {}]) { + assert.deepEqual(displayAuthor({ userId: null, username: 'Ravenna' }, viewer), { name: DELETED_PLAYER, deleted: true }) + } +}) + +test('staff — admin, editor and moderator — see the stored name, marked deleted (AD6)', () => { + for (const viewer of STAFF) { + assert.equal(seesDeletedNames(viewer), true) + assert.deepEqual(displayAuthor({ userId: null, username: 'Ravenna' }, viewer), { name: 'Ravenna', deleted: true }) + } + // With no snapshot at all there is no name to show anybody. + assert.deepEqual(displayAuthor({ userId: null, username: null }, STAFF[0]), { name: DELETED_PLAYER, deleted: true }) +}) + +test('an absent actor is not a deleted one', () => { + assert.equal(hasActor(null, null), false) + assert.equal(hasActor(null, ''), false) + assert.equal(hasActor(null, 'OldMod'), true) + assert.equal(hasActor(5, null), true) +}) + +// ── forum threads and posts ──────────────────────────────────────────────── + +const threadRow = (over = {}) => ({ + id: 5, type: 'discussion', title: 'Raid night', created_by: null, created_username: 'Ravenna', + created_at: new Date(), last_post_at: new Date(), post_count: 2, pinned: 0, locked: 0, status: 'visible', ...over, +}) +const postRow = (over = {}) => ({ + id: 80, thread_id: 5, author_user_id: null, author_username: 'Ravenna', body_html: 'Guide
', + created_at: new Date(), edited_at: null, status: 'visible', ...over, +}) + +test('a forum thread by a deleted account: "[deleted player]" to a member, the name to staff', () => { + assert.equal(forum.publicThread(threadRow(), MEMBER).author, DELETED_PLAYER) + assert.equal(forum.publicThread(threadRow()).author, DELETED_PLAYER) // no viewer said + assert.equal(forum.publicThread(threadRow(), MEMBER).authorDeleted, true) + for (const viewer of STAFF) { + const t = forum.publicThread(threadRow(), viewer) + assert.equal(t.author, 'Ravenna') + assert.equal(t.authorDeleted, true) + } + assert.equal(forum.publicThread(threadRow({ created_by: 4 }), MEMBER).author, 'Ravenna') + assert.equal(forum.publicThread(threadRow({ created_by: 4 }), MEMBER).authorDeleted, false) +}) + +test('a forum post by a deleted account follows the same rule, and is nobody’s to edit', () => { + const asMember = forum.renderPost(postRow(), 'disabled', { userId: 9, role: 'player', isStaff: false }) + assert.equal(asMember.author, DELETED_PLAYER) + assert.equal(asMember.authorDeleted, true) + assert.equal(asMember.mine, false) + assert.equal(asMember.canEdit, false) + + const asEditor = forum.renderPost(postRow(), 'disabled', { userId: 2, role: 'editor', isStaff: false }) + assert.equal(asEditor.author, 'Ravenna') + assert.equal(asEditor.authorDeleted, true) +}) + +test('the thread list and a thread pass the viewer down to every row', async () => { + const forumDb = require('../src/model/teams/teamForum.db') + const forumSettings = require('../src/model/teams/teamForumSettings.model') + patch(forumDb, 'threadsByTeam', async () => [threadRow()]) + patch(forumDb, 'threadById', async () => ({ ...threadRow(), team_id: 1 })) + patch(forumDb, 'postsByThread', async () => [postRow()]) + patch(forumSettings, 'imageMode', async () => 'disabled') + + const [listedForMember] = await forum.listThreads(1, { viewer: MEMBER }) + assert.equal(listedForMember.author, DELETED_PLAYER) + const [listedForStaff] = await forum.listThreads(1, { viewer: { role: 'moderator' } }) + assert.equal(listedForStaff.author, 'Ravenna') + + const thread = await forum.getThread(1, 5, { viewer: { userId: 9, role: 'player' } }) + assert.equal(thread.author, DELETED_PLAYER) + assert.equal(thread.posts[0].author, DELETED_PLAYER) + const staffThread = await forum.getThread(1, 5, { canModerate: true, viewer: { userId: 2, role: 'admin', isStaff: true } }) + assert.equal(staffThread.author, 'Ravenna') + assert.equal(staffThread.posts[0].author, 'Ravenna') +}) + +// ── the leader's guest list ──────────────────────────────────────────────── + +test('a deleted account is not a forum guest, and a deleted granter reads "[deleted player]" (AD13)', async () => { + patch(accessDb, 'activeGrants', async () => [ + { user_id: 21, username: 'Guest', granted_by: null, granted_username: 'OldLeader', granted_at: new Date(), reason: null }, + { user_id: null, username: 'Ravenna', granted_by: 4, granted_username: 'Leader', granted_at: new Date(), reason: null }, + { user_id: 22, username: 'Member', granted_by: 4, granted_username: 'Leader', granted_at: new Date(), reason: null }, + ]) + patch(teamsDb, 'membersByTeam', async () => [{ user_id: 22 }]) + + const guests = await grants.forumGuests(1, MEMBER) + assert.deepEqual(guests.map((g) => g.username), ['Guest']) + assert.equal(guests[0].grantedBy, DELETED_PLAYER) + + const forStaff = await grants.forumGuests(1, { role: 'moderator' }) + assert.equal(forStaff[0].grantedBy, 'OldLeader') +}) + +// ── the Team digest ──────────────────────────────────────────────────────── + +test('the digest mail names a deleted author "[deleted player]"', async () => { + const worker = require('../src/utils/teamDigestWorker') + const teamNotify = require('../src/model/teams/teamNotify.model') + const templates = require('../src/engagement/templates') + let items = null + patch(teamNotify, 'digestPostsSince', async () => [ + { id: 1, thread_id: 5, body_html: 'a
', created_at: new Date(), author_user_id: null, author_username: 'Ravenna', title: 'Raid night', type: 'discussion' }, + { id: 2, thread_id: 5, body_html: 'b
', created_at: new Date(), author_user_id: 4, author_username: 'Thorne', title: 'Raid night', type: 'discussion' }, + ]) + patch(templates, 'renderByKey', async (key, values) => { + items = values.items + return null // stop before anything is sent + }) + await worker.sendOne({ id: 1, slug: 'wolves', name: 'Iron Wolves' }, { user_id: 9, last_digest_at: null }, null, new Date()) + assert.deepEqual(items.map((i) => i.heading), ['Raid night — [deleted player]', 'Raid night — Thorne']) +}) diff --git a/server/test/emailTemplates.test.js b/server/test/emailTemplates.test.js index 1c4cfe8..7105ffa 100644 --- a/server/test/emailTemplates.test.js +++ b/server/test/emailTemplates.test.js @@ -299,12 +299,13 @@ test('every shipped template validates against the email registry', () => { assert.equal(typeof seed.seedVersion, 'number') assert.equal(['email', 'inapp'].includes(seed.channel), true) } - // The five transactional bodies the system itself depends on are protected. + // The six transactional bodies the system itself depends on are protected. const guarded = SEEDS.filter((s) => s.protected).map((s) => s.key) assert.deepEqual(guarded, [ 'auth.password-reset', 'auth.invite', 'auth.email-verify', + 'auth.account-deleted', 'admin.contact-message', 'admin.test', ]) diff --git a/server/test/eventModuleContract.test.js b/server/test/eventModuleContract.test.js index fe37060..5892182 100644 --- a/server/test/eventModuleContract.test.js +++ b/server/test/eventModuleContract.test.js @@ -112,7 +112,7 @@ test('the version a module declares against satisfies ^1.10.0', () => { // 1.10.0 loading — Module-uo declares exactly `^1.10.0` — and this is the // assertion that says it does. The number itself is pinned in version.js. assert.ok(semver.satisfies(MODULE_API_VERSION, '^1.10.0'), MODULE_API_VERSION) - assert.equal(MODULE_API_VERSION, '1.19.0') + assert.equal(MODULE_API_VERSION, '1.20.0') }) test('a module registers actions, budgets, leases and option sources', () => { diff --git a/server/test/userDeletingHook.test.js b/server/test/userDeletingHook.test.js new file mode 100644 index 0000000..0f7729b --- /dev/null +++ b/server/test/userDeletingHook.test.js @@ -0,0 +1,87 @@ +// ── api.onUserDeleting (MODULE_API 1.20.0, ACCOUNT_DELETION.md AD10) ─────── +// +// Registration and collection only; what the deletion does with the hook is in +// accountDeletion.test.js. Each test builds a throwaway modules directory and +// re-requires the loader, as moduleLoader.test.js does. +process.env.DB_HOST = '127.0.0.1' +process.env.DB_PORT = '59999' + +const fs = require('fs') +const os = require('os') +const path = require('path') + +const { test, after } = require('node:test') +const assert = require('node:assert/strict') +const express = require('express') + +const db = require('../src/utils/db') +const registries = require('../src/modules/registries') + +after(() => db.close()) + +const emptyTiers = () => ({ public: express.Router(), admin: express.Router(), player: express.Router() }) + +function loadOne(server) { + const root = fs.mkdtempSync(path.join(os.tmpdir(), 'rg-deleting-')) + const dir = path.join(root, 'rust') + fs.mkdirSync(dir) + fs.writeFileSync(path.join(dir, 'module.json'), JSON.stringify({ + id: 'rust', + name: 'Rust', + version: '1.0.0', + coreApi: '^1.20.0', + server: 'index.js', + mounts: { admin: ['/rust'] }, + })) + fs.writeFileSync(path.join(dir, 'index.js'), server) + process.env.MODULES_DIR = root + registries._reset() + delete require.cache[require.resolve('../src/modules/loader')] + // eslint-disable-next-line global-require + const loader = require('../src/modules/loader') + loader.load(emptyTiers()) + return loader +} +const stateOf = (loader) => loader.list().find((m) => m.id === 'rust') + +test('onUserDeleting is collected once the module is started, and not before', async () => { + const loader = loadOne(`module.exports = (ctx, api) => { + api.registerRoutes({ admin: { '/rust': ctx.express.Router() } }) + api.onUserDeleting(async (p) => { global.__deleting = p }) + }`) + assert.equal(stateOf(loader).state, 'registered') + // A registered module has not booted: it holds no link it could undo yet. + assert.deepEqual(loader.userDeletingHooks(), []) + + loader.setState('rust', 'started') + const hooks = loader.userDeletingHooks() + assert.deepEqual(hooks.map((h) => h.id), ['rust']) + await hooks[0].hook({ userId: 7, deletedBy: 'self' }) + assert.deepEqual(global.__deleting, { userId: 7, deletedBy: 'self' }) + delete global.__deleting + + loader.setState('rust', 'disabled') + assert.deepEqual(loader.userDeletingHooks(), []) +}) + +test('a module that registers no hook adds nothing', () => { + const loader = loadOne(`module.exports = (ctx, api) => { + api.registerRoutes({ admin: { '/rust': ctx.express.Router() } }) + }`) + loader.setState('rust', 'started') + assert.deepEqual(loader.userDeletingHooks(), []) +}) + +test('onUserDeleting twice, or with no function, is a registration error', () => { + for (const [body, expected] of [ + ['api.onUserDeleting(() => {}); api.onUserDeleting(() => {})', /onUserDeleting\(\) called twice/], + ['api.onUserDeleting("later")', /onUserDeleting: expected a function/], + ]) { + const loader = loadOne(`module.exports = (ctx, api) => { + api.registerRoutes({ admin: { '/rust': ctx.express.Router() } }) + ${body} + }`) + assert.equal(stateOf(loader).state, 'startup_failed') + assert.match(stateOf(loader).reason, expected) + } +})