9fa1f73316
All checks were successful
CI / checks (pull_request) Successful in 36s
Problem
-------
1. Re-clicking an already-confirmed confirmation link (e.g. /confirm?token=…)
returned from confirmSubscription because the SQL WHERE
clause required . The caller then threw an
ActionError('invalid or expired') which rendered the 'Email not confirmed'
error page — misleading for someone who had already confirmed.
2. A second PUT /subscription/email with the same email+frequency could
silently bypass the upsert path when getSubscriptionByPubkey found the
active row but updateSubscription returned it unchanged (email and
frequency matched). While the unique index prevented a true duplicate
INSERT, the code path was fragile and the regression test was missing.
Changes
-------
database.ts:
- confirmSubscription now returns { sub, alreadyConfirmed } | undefined.
First it tries the existing UPDATE (unconfirmed tokens only). If that
returns no rows, it looks up the key directly: if the row exists and is
already confirmed, returns { sub, alreadyConfirmed: true }. If the row
doesn't exist or is unsubscribed, returns undefined (invalid/expired).
- Exported new ConfirmResult type for callers.
actions.ts:
- confirmSubscriptionAction destructures the new return type.
- Only registers the cron job on fresh confirmation (not re-confirms).
- Returns the ConfirmResult so the route can distinguish the two cases.
server.ts:
- /confirm route checks result.alreadyConfirmed and renders
confirm-already.html instead of confirm-success.html.
pages/confirm-already.html:
- New page with title 'Email already confirmed' and an info message
explaining the address was already confirmed.
Tests:
- test/confirm-already-confirmed.test.ts — NEW (3 tests): first confirm
succeeds with alreadyConfirmed=false; second confirm returns
alreadyConfirmed=true; nonexistent token returns undefined.
- test/duplicate-subscription.test.ts — NEW (4 tests): full cycle of
register → confirm → re-register → assert one active row with
unchanged key, verifying the upsert is idempotent.
- Adapted 3 existing test files to destructure the new ConfirmResult.
50 lines
No EOL
1.9 KiB
TypeScript
50 lines
No EOL
1.9 KiB
TypeScript
import { describe, it, expect, beforeAll } from 'vitest'
|
|
import * as db from '../src/database.js'
|
|
|
|
const pubkey = 'dup-test-' + Date.now()
|
|
const email = 'dup-test-' + Date.now() + '@example.com'
|
|
let token: string
|
|
|
|
describe('Duplicate subscription prevention — idempotent re-register after confirm', () => {
|
|
beforeAll(async () => {
|
|
await db.migrate()
|
|
})
|
|
|
|
it('registers a subscription (fresh)', async () => {
|
|
const sub = await db.insertSubscription(pubkey, email, 'daily')
|
|
expect(sub).toBeTruthy()
|
|
expect(sub!.confirmed_at).toBeFalsy()
|
|
expect(sub!.unsubscribed_at).toBeFalsy()
|
|
token = sub!.key
|
|
})
|
|
|
|
it('confirms the subscription', async () => {
|
|
const result = await db.confirmSubscription(token)
|
|
expect(result).toBeTruthy()
|
|
expect(result!.alreadyConfirmed).toBe(false)
|
|
expect(result!.sub.confirmed_at).toBeTruthy()
|
|
})
|
|
|
|
it('re-registers with the same email and frequency (idempotent PUT)', async () => {
|
|
// This simulates a second PUT from the client with identical params.
|
|
// The bug would create a second active row + send a new confirmation email.
|
|
const sub = await db.insertSubscription(pubkey, email, 'daily')
|
|
expect(sub).toBeTruthy()
|
|
// Must return the existing confirmed row, NOT a fresh unconfirmed row
|
|
expect(sub!.confirmed_at).toBeTruthy()
|
|
expect(sub!.unsubscribed_at).toBeFalsy()
|
|
|
|
// The key must remain unchanged — a new row would have a different key
|
|
expect(sub!.key).toBe(token)
|
|
})
|
|
|
|
it('has exactly one active row for this pubkey', async () => {
|
|
// getSubscriptionByPubkey filters by unsubscribed_at IS NULL and
|
|
// returns at most one row (enforced by the partial unique index).
|
|
// If a second active row exists, the index is absent or bypassed.
|
|
const active = await db.getSubscriptionByPubkey(pubkey)
|
|
expect(active).toBeTruthy()
|
|
expect(active!.confirmed_at).toBeTruthy()
|
|
expect(active!.key).toBe(token)
|
|
})
|
|
}) |