@boopkit/cap-users 0.4.2 → 0.4.4

package/capability.json

@@ -41,7 +41,7 @@
     },
     {
       "phase": "imports",
-      "code": "import { ensureVisitor, addAuthContext, authRoutes } from './middleware/auth';",
+      "code": "import { resolveVisitor, addAuthContext, authRoutes } from './middleware/auth';",
       "description": "auth middleware and routes — session resolution, trust context, signup/login/logout"
     },
     {
@@ -58,8 +58,8 @@
     {
       "phase": "preRoutes",
       "order": 15,
-      "code": "app.use(ensureVisitor);",
-      "description": "resolve visitor identity from auth_id cookie"
+      "code": "app.use(resolveVisitor);",
+      "description": "resolve user from auth_id/visitor_id cookie if present (no user is created for anonymous traffic — write paths must call getOrCreateUser)"
     },
     {
       "phase": "preRoutes",

package/dist/auth-middleware.d.ts

@@ -1,16 +1,21 @@
 /**
  * Auth middleware factories for Express.
  *
- * Provides three middleware functions:
- * - `ensureVisitor` — resolves session from auth_id cookie, creates anonymous visitor if missing
- * - `requireAuth` — gates routes by trust tier, redirects web / 401s API
- * - `addAuthContext` — populates res.locals.auth for view templates
+ * Provides:
+ * - `resolveVisitor` — resolves req.user/sessionToken/visitorToken from auth_id/visitor_id
+ *   cookies if present. Never creates a user or sets cookies. If no cookie resolves,
+ *   req.user stays undefined so anonymous traffic does not mint user records.
+ * - `getOrCreateUser` — helper for write paths (waitlist capture, signup, onboarding).
+ *   Mints a user + visitor identity + session token and sets cookies on first call.
+ *   Idempotent: if resolveVisitor already populated req, returns the existing user.
+ * - `requireAuth` — gates routes by trust tier, redirects web / 401s API.
+ * - `addAuthContext` — populates res.locals.auth for view templates.
  */
 import type { Request, Response, NextFunction } from 'express';
 import type { AuthService } from './auth-service.js';
 import type { IdentityService } from './identity-service.js';
 import type { UserService } from './user-service.js';
-import type { BaseUserInfo, TrustTier } from './types.js';
+import type { BaseUserInfo, TrustTier, User } from './types.js';
 /** Dependencies injected into createAuthMiddleware. */
 export interface AuthMiddlewareDeps {
     authService: AuthService;
@@ -39,7 +44,8 @@ export interface AuthLocals {
 }
 /** The middleware functions returned by createAuthMiddleware. */
 export interface AuthMiddleware {
-    ensureVisitor: (req: Request, res: Response, next: NextFunction) => void;
+    resolveVisitor: (req: Request, res: Response, next: NextFunction) => void;
+    getOrCreateUser: (req: Request, res: Response) => Promise<User<BaseUserInfo>>;
     requireAuth: (requiredTrust?: TrustTier) => (req: Request, res: Response, next: NextFunction) => void;
     addAuthContext: (req: Request, res: Response, next: NextFunction) => void;
 }

package/dist/auth-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAQ,MAAM,YAAY,CAAC;AAMhE,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;CACxC;AAED,wCAAwC;AACxC,MAAM,WAAW,qBAAqB;IACpC,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,4DAA4D;AAC5D,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,iEAAiE;AACjE,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACzE,WAAW,EAAE,CAAC,aAAa,CAAC,EAAE,SAAS,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACtG,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CAC3E;AASD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,kBAAkB,EACxB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,cAAc,CAuJhB"}
+{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMhE,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;CACxC;AAED,wCAAwC;AACxC,MAAM,WAAW,qBAAqB;IACpC,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,4DAA4D;AAC5D,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,iEAAiE;AACjE,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAC1E,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC9E,WAAW,EAAE,CAAC,aAAa,CAAC,EAAE,SAAS,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACtG,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CAC3E;AASD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,kBAAkB,EACxB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,cAAc,CA0KhB"}

package/dist/auth-middleware.js

@@ -2,10 +2,15 @@
 /**
  * Auth middleware factories for Express.
  *
- * Provides three middleware functions:
- * - `ensureVisitor` — resolves session from auth_id cookie, creates anonymous visitor if missing
- * - `requireAuth` — gates routes by trust tier, redirects web / 401s API
- * - `addAuthContext` — populates res.locals.auth for view templates
+ * Provides:
+ * - `resolveVisitor` — resolves req.user/sessionToken/visitorToken from auth_id/visitor_id
+ *   cookies if present. Never creates a user or sets cookies. If no cookie resolves,
+ *   req.user stays undefined so anonymous traffic does not mint user records.
+ * - `getOrCreateUser` — helper for write paths (waitlist capture, signup, onboarding).
+ *   Mints a user + visitor identity + session token and sets cookies on first call.
+ *   Idempotent: if resolveVisitor already populated req, returns the existing user.
+ * - `requireAuth` — gates routes by trust tier, redirects web / 401s API.
+ * - `addAuthContext` — populates res.locals.auth for view templates.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAuthMiddleware = createAuthMiddleware;
@@ -27,19 +32,19 @@ function createAuthMiddleware(deps, options) {
     const visitorCookieMaxAge = options?.visitorCookieMaxAge ?? TEN_YEARS_MS;
     const loginPath = options?.loginPath ?? '/login';
     /**
-     * ensureVisitor — two-cookie pattern:
-     * 1. Resolve/create visitor_id cookie (long-lived tracking, never rotated)
-     * 2. Resolve/create auth_id cookie (session authentication, rotated on login)
-     * Sets req.user, req.sessionToken, and req.visitorToken.
+     * resolveVisitor — read-only resolver. Populates req.user, req.sessionToken, and
+     * req.visitorToken from the auth_id/visitor_id cookies when present. Never creates
+     * a user or writes cookies. Anonymous traffic (no resolvable cookie) passes through
+     * with req.user undefined. Write paths that need a persisted user should call
+     * getOrCreateUser explicitly.
      */
-    function ensureVisitor(req, res, next) {
-        resolveVisitor(req, res).then(() => next()).catch(next);
+    function resolveVisitor(req, res, next) {
+        resolveFromCookies(req).then(() => next()).catch(next);
     }
-    async function resolveVisitor(req, res) {
+    async function resolveFromCookies(req) {
         let user;
         let sessionToken;
         let visitorToken;
-        // --- Phase 1: Resolve user from existing cookies ---
         // Try auth_id first (most authoritative for current session)
         const rawAuthToken = req.cookies?.[cookieName];
         if (rawAuthToken) {
@@ -60,22 +65,36 @@ function createAuthMiddleware(deps, options) {
                 if (!user) {
                     user = await userService.findById(identity.userId) ?? undefined;
                 }
-                visitorToken = rawVisitorToken;
+                if (user) {
+                    visitorToken = rawVisitorToken;
+                }
+                // If the visitor identity resolves but to a different user than auth_id
+                // resolved, we keep the auth_id user; the visitor cookie is treated as stale
+                // and a fresh one will be minted on the next getOrCreateUser call.
             }
-            // If identity not found, visitor cookie is stale — will be replaced below
         }
-        // --- Phase 2: Create missing resources ---
-        // Create user if neither cookie resolved one
+        req.user = user;
+        req.sessionToken = sessionToken;
+        req.visitorToken = visitorToken;
+    }
+    /**
+     * getOrCreateUser — call from write paths that need a persisted user (waitlist
+     * capture, signup, onboarding). Mints a user + visitor identity + session token
+     * and sets the auth_id/visitor_id cookies. Idempotent: re-uses whatever resolveVisitor
+     * already populated on req, and only mints the pieces that are missing.
+     */
+    async function getOrCreateUser(req, res) {
+        let user = req.user;
+        let sessionToken = req.sessionToken;
+        let visitorToken = req.visitorToken;
         if (!user) {
             user = await userService.create({ type: 'user' });
         }
-        // Ensure visitor_id cookie exists
         if (!visitorToken) {
             visitorToken = (0, auth_service_js_1.generateToken)();
             await identityService.create(user.id, 'cookie', (0, auth_service_js_1.hashToken)(visitorToken));
             res.cookie(visitorCookieName, visitorToken, { maxAge: visitorCookieMaxAge, httpOnly: true });
         }
-        // Ensure auth_id session cookie exists
         if (!sessionToken) {
             sessionToken = await authService.generateSessionToken(user.id);
             res.cookie(cookieName, sessionToken, { maxAge: cookieMaxAge, httpOnly: true });
@@ -83,6 +102,7 @@ function createAuthMiddleware(deps, options) {
         req.user = user;
         req.sessionToken = sessionToken;
         req.visitorToken = visitorToken;
+        return user;
     }
     /**
      * requireAuth — middleware factory. Checks trust tier for the current session.
@@ -128,11 +148,14 @@ function createAuthMiddleware(deps, options) {
     async function populateAuthContext(req, res) {
         const user = req.user;
         const sessionToken = req.sessionToken;
-        if (!user || !sessionToken) {
+        if (!user) {
             res.locals.auth = { trustTier: null, userName: null, userEmail: null, userInitial: null };
             return;
         }
-        const trustTier = await authService.getTrustTier(user.id, sessionToken);
+        // A resolved user is at minimum 'recognized' (we identified them by cookie). The
+        // session token's grant can raise that to 'authenticated' or 'verified' when present.
+        const grantedTier = sessionToken ? await authService.getTrustTier(user.id, sessionToken) : null;
+        const trustTier = grantedTier ?? 'recognized';
         const name = user.info.name ?? null;
         const email = user.info.email ?? null;
         const userInitial = (name ?? email ?? '?')[0].toUpperCase();
@@ -144,7 +167,8 @@ function createAuthMiddleware(deps, options) {
         };
     }
     return {
-        ensureVisitor,
+        resolveVisitor,
+        getOrCreateUser,
         requireAuth,
         addAuthContext,
     };

package/dist/auth-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boopkit/cap-users",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "User accounts, authentication, and session management via Prisma",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scaffold/reference/user-auth.ref.md

@@ -49,7 +49,7 @@ Links a user to an auth mechanism via `(domain, key)` compound unique key:
 | `email` | email address | `alice@example.com` |
 | `cookie` | session token | `base64url-token` |
 | `api-key` | hashed key | `hashed-base64url` |
-| OAuth provider | external ID | `google-user-id` |
+| OAuth provider, bare — `google`, `microsoft` | provider's stable subject id | `google-sub-id-12345` |
 
 Soft-deleted via `endedAt` — revoked identities remain queryable with `includeEnded: true`.
 
@@ -143,23 +143,55 @@ The plaintext key is returned exactly once at creation. Only the hash is stored.
 
 ### OAuth (as client)
 
-When a user logs in via Google (or other provider), the app is an OAuth *client*. The provider proves identity; boop stores the result.
+When a user logs in via Google or Microsoft, the app is an OAuth *client*. The provider proves identity; the app stores the result.
+
+These rows are what the `oauth-client` capability writes. It writes them through the services below and adds no user model of its own, so everything on this page still describes the whole truth about a user after you install it — and once installed, its own [`oauth-client.ref.md`](oauth-client.ref.md) covers the sign-in routes, the provider registry, and token refresh in depth.
 
 | Layer | What happens |
 |-------|-------------|
 | **Identity** | `domain: "google", key: "google-sub-id-12345"` — maps provider ID to user |
-| **Authentication** | `{ strategy: "oauth-google", accepted: true, refresh_token: "rt_...", access_token: "at_...", ... }` — delegated credentials stored |
+| **Authentication** | `{ strategy: "oauth-google", accepted: true, access_token: "at_...", refresh_token: "rt_...", access_token_expires_at: 1756..., oauth_profile: {...} }` — delegated credentials stored |
 | **Credentials** | None — OAuth credentials are delegated, stored in the authentication entry |
 | **Authorization** | Created on login, tied to the session cookie — same as password login |
 
 OAuth tokens (`refresh_token`, `access_token`) are **delegated credentials** — tokens held from the provider to act on the user's behalf. They are NOT how the app recognizes the user on subsequent requests. Users are recognized via cookies, same as password login.
 
-**OAuth login flow:** provider callback with auth code → exchange for tokens → look up or create identity (`domain: "google"`) → store tokens in authentication entry → rotate session → create per-device grant.
+**The identity key is the provider's stable subject identifier** — Google's `sub`, Microsoft's directory object id.
+It is never the email address or the UPN, because both are reassignable and keying on one hands a recycled address the previous holder's account.
+
+**The bare identity domain and the prefixed strategy are deliberate, not an oversight.**
+The identity domain is `google` — bare, like `cookie`, `email`, and `api-key`.
+The authentication strategy is `oauth-google` — prefixed, like `local` and `api-key`, where the prefix is what marks a delegated method rather than a locally verified one.
+The two pairs that ship are `google` / `oauth-google` and `microsoft` / `oauth-microsoft`.
+The domain answers *whose account this is*; the strategy answers *how the user authenticates*.
+Those are different questions, and each vocabulary is consistent within itself.
+Do not normalize one to the other. The bare domain is also what lets an app that already stores `(domain: provider_name, key: profile.id)` adopt the `oauth-client` capability without rewriting a single identity row.
+
+**OAuth login flow:** `GET /auth/:provider` mints a random nonce and stores it, the PKCE verifier, and the validated return path in a short-lived httpOnly cookie → provider callback with auth code → the nonce is compared to the cookie in constant time, failing closed → exchange the code for tokens → reconcile the provider identity, the email identity, and the anonymous cookie user to a single user, creating one if none exists → store tokens in the authentication entry with an absolute expiry from the provider's `expires_in` → rotate session → create per-device grant.
+
+Two of those steps refuse rather than resolve. A provider account and an email address owned by two different users leaves both accounts untouched for a person to sort out, and an unverified provider email may not claim an existing account.
+
+A third withholds rather than refuses, and it is the one that shapes what is in the identity table.
+When the provider reports an address it has not verified and *nobody owns it yet*, the sign-in proceeds on the provider identity alone: no `email` identity row is written, and only the profile keeps the claim, labelled unverified.
+The identity row — not the profile — is what resolves a user on a later sign-in, so writing one from an unverified claim would let someone squat an address and be handed the victim when the victim's genuinely verified sign-in matched it.
+The address is not stranded: when the same provider account later reports it verified, the email identity is attached then.
+
+Provider tokens are stored **unencrypted**, like everything else in the `authentication` property. They are bearer credentials the app must replay verbatim to the provider, so they cannot be hashed the way cookies and API keys are. They are protected by database access control, and by never being logged, rendered, or returned in a response body.
 
 ### TOTP / Second Factor
 
 TOTP upgrades trust on the current device. It does NOT rotate the session — the user already proved identity at login (which rotated the session). TOTP is additional proof on the same session, not a new authentication source.
 
+### Telling the user why a sign-in did not happen
+
+`views/login.hbs` renders one error slot, `{{#if errorMessage}}`, and two paths fill it.
+
+A failed password POST fills it directly from `handleLogin`'s catch, with one message for both a wrong password and an unknown address — the no-enumeration rule.
+
+A **redirect** fills it by carrying a reason code in `?error=`, which `showLogin` turns into copy through `LOGIN_ERROR_MESSAGES` in `src/controllers/auth.ts`. The query value is never rendered: a code the map does not know falls back to `DEFAULT_LOGIN_ERROR_MESSAGE`, so the page cannot reflect a caller's string and a reason the map has not learned yet still says something rather than rendering a silent page. Only an absent or empty `?error=` leaves the slot closed.
+
+Shipped codes are `session_expired`, `auth_required`, and `signin_failed`. Add a row to the map to teach the page a new one — including the ones a capability's own failure redirect uses. `OAUTH_SIGNIN_FAILURE_PATH` defaults to `/login`, so every OAuth refusal lands on this slot.
+
 ---
 
 ## Logout vs. Forget

package/scaffold/src/controllers/auth.ts

@@ -2,7 +2,7 @@ import type { Response } from 'express';
 import type { AuthService } from '@boopkit/cap-users';
 import { AuthValidationError } from '@boopkit/cap-users';
 
-/** Extended Express Request with auth fields set by ensureVisitor middleware. */
+/** Extended Express Request with auth fields set by resolveVisitor middleware. */
 interface AuthRequest {
   body: Record<string, any>;
   query: Record<string, any>;
@@ -21,6 +21,73 @@ const FIELD_ERROR_MAP: Record<string, string> = {
   passwordConfirmation: 'password_mismatch',
 };
 
+/**
+ * Plain-language copy for the `?error=` reason codes a redirect can carry to
+ * `GET /login`.
+ *
+ * A redirect can only hand the login page a short machine token — a session
+ * that expired, a gate that turned the visitor away, a provider sign-in that
+ * was refused. This map is where that token becomes a sentence a person can
+ * act on, and it is the only thing `showLogin` will put in the error slot.
+ *
+ * Codes are never echoed. An unrecognised value renders
+ * `DEFAULT_LOGIN_ERROR_MESSAGE` instead, so the page cannot be turned into a
+ * reflection point for whatever a caller puts in the query string, and a
+ * redirect whose code this map has not learned yet still says *something*
+ * rather than landing the visitor on a silent page.
+ *
+ * Add a row here to teach the page a new reason; the fallback keeps working
+ * until you do.
+ */
+export const LOGIN_ERROR_MESSAGES: Record<string, string> = {
+  session_expired: 'Your session has expired. Please log in again.',
+  auth_required: 'Please log in to continue.',
+  signin_failed: 'We could not complete that sign-in. Please try again.',
+};
+
+/**
+ * Teach the login page a reason code it does not ship with.
+ *
+ * `LOGIN_ERROR_MESSAGES` above is deliberately extensible — a redirect that
+ * carries a reason is not always one cap-users itself issued. A capability that
+ * turns visitors away at its own door (a provider sign-in refused for a reason
+ * only it can name) registers its copy here at boot, rather than each such
+ * capability inventing a second error slot on the page.
+ *
+ * Additive and idempotent: registering the same code twice keeps the last
+ * writer's copy, and a blank or non-string message is ignored so a misconfigured
+ * override cannot blank out a message the page needs to show. Nothing here can
+ * *remove* a shipped code.
+ */
+export function registerLoginErrorMessages(messages: Record<string, string>): void {
+  for (const [code, message] of Object.entries(messages)) {
+    if (typeof message === 'string' && message.trim() !== '') {
+      LOGIN_ERROR_MESSAGES[code] = message.trim();
+    }
+  }
+}
+
+/** Shown for a reason code this page does not recognise. */
+export const DEFAULT_LOGIN_ERROR_MESSAGE =
+  'We could not complete that sign-in. Please try again.';
+
+/**
+ * Turn a `?error=` query value into copy, or into nothing at all.
+ *
+ * Only an absent or empty value closes the view's `{{#if errorMessage}}` slot.
+ * Anything else — an unknown code, or the array Express hands back for a
+ * repeated parameter — renders the generic message, because the presence of
+ * the parameter is itself the signal that something went wrong, and a page
+ * that stays silent about it is the defect this function exists to close.
+ *
+ * The caller's own string is never returned, whatever it contains.
+ */
+export function loginErrorMessage(code: unknown): string | undefined {
+  if (code === undefined || code === null || code === '') return undefined;
+  if (typeof code !== 'string') return DEFAULT_LOGIN_ERROR_MESSAGE;
+  return LOGIN_ERROR_MESSAGES[code] ?? DEFAULT_LOGIN_ERROR_MESSAGE;
+}
+
 export interface AuthControllerDeps {
   authService: AuthService;
 }
@@ -44,7 +111,10 @@ export function createAuthController(deps: AuthControllerDeps) {
       layout: 'main',
       action: '/login',
       next,
-      error: req.query.error as string | undefined,
+      // `errorMessage` is the name login.hbs reads. Anything else renders
+      // nothing, which is how a redirect-carrying-a-reason ends up on a silent
+      // page (boop-94l).
+      errorMessage: loginErrorMessage(req.query.error),
     });
   }
 

package/scaffold/src/middleware/auth.ts

@@ -6,7 +6,7 @@ import createAuthRouter from '../routes/auth';
 
 const { authService, identityService, userService } = UserService;
 
-const { ensureVisitor, addAuthContext, requireAuth } = createAuthMiddleware(
+const { resolveVisitor, getOrCreateUser, addAuthContext, requireAuth } = createAuthMiddleware(
   { authService, identityService, userService },
   {
     cookieName: 'auth_id',
@@ -17,4 +17,4 @@ const { ensureVisitor, addAuthContext, requireAuth } = createAuthMiddleware(
 /** Pre-built auth routes (signup, login, logout). Ready to mount with app.use(). */
 const authRoutes = createAuthRouter({ authService });
 
-export { ensureVisitor, addAuthContext, requireAuth, authRoutes };
+export { resolveVisitor, getOrCreateUser, addAuthContext, requireAuth, authRoutes };

package/scaffold/views/login.hbs

@@ -21,8 +21,12 @@
       <button class="auth-submit" type="submit">Log In</button>
     </form>
 
+    {{!-- The return path goes into a query string here, so it needs cap-web's
+         `urlencode`: Handlebars escapes for HTML, and an unencoded `&` in the
+         path would end the parameter. The hidden field above is a form value,
+         not a URL — HTML escaping is the right and only encoding there. --}}
     <div class="auth-alt">
-      Don't have an account? <a href="/signup{{#if next}}?next={{next}}{{/if}}">Sign up</a>
+      Don't have an account? <a href="/signup{{#if next}}?next={{urlencode next}}{{/if}}">Sign up</a>
     </div>
   </section>
 </div>

package/scaffold/views/signup.hbs

@@ -22,8 +22,12 @@
       <button class="auth-submit" type="submit">Sign Up</button>
     </form>
 
+    {{!-- The return path goes into a query string here, so it needs cap-web's
+         `urlencode`: Handlebars escapes for HTML, and an unencoded `&` in the
+         path would end the parameter. The hidden field above is a form value,
+         not a URL — HTML escaping is the right and only encoding there. --}}
     <div class="auth-alt">
-      Already have an account? <a href="/login{{#if next}}?next={{next}}{{/if}}">Log in</a>
+      Already have an account? <a href="/login{{#if next}}?next={{urlencode next}}{{/if}}">Log in</a>
     </div>
   </section>
 </div>