@payez/next-mvp 4.5.7 → 4.7.10

package/src/lib/authorize-resume.ts

@@ -0,0 +1,187 @@
+/**
+ * PAY-2302 cut 2: moved VERBATIM (logic unchanged) from VibeID-Customer-Portal src/lib/auth/authorize-resume.ts.
+ * PAY-1500 (portal half of PAY-1479): resume the IdP OAuth authorize request after 2FA.
+ *
+ * The IdP sends an OAuth principal who still owes 2FA to the portal's /account-auth/verify-code with
+ *   ?next_step=enroll_mfa|mfa_verify&callbackUrl=<absolute IdP authorize URL>&return_url=<same>
+ * (OAuthController.Authorize; hotfix-2 66ca7a8eb routes BOTH cases to verify-code, /account/security is gone). safeCallbackPath rightly refuses that absolute URL,
+ * so after 2FA the user used to land on the default page and sign-in never finished.
+ *
+ * This is NOT a relaxation of safeCallbackPath. The browser is sent to the portal's own
+ * /api/oauth/resume, which checks return_url SERVER-SIDE against IDP_URL (origin + the authorize path)
+ * and only then redirects. Anything else is refused. IDP_URL never reaches the client.
+ */
+export const AUTHORIZE_RESUME_ROUTE = '/api/oauth/resume';
+const AUTHORIZE_PATH = '/api/oauth/authorize';
+
+/** True only for `<IDP_URL origin>/api/oauth/authorize` (path case-insensitive, as ASP.NET routes). */
+export function isIdpAuthorizeUrl(candidate: string | null | undefined, idpBaseUrl: string): boolean {
+  if (typeof candidate !== 'string' || candidate === '') return false;
+  try {
+    const u = new URL(candidate);
+    const idp = new URL(idpBaseUrl);
+    return (u.protocol === 'https:' || u.protocol === 'http:') && u.origin === idp.origin && u.pathname.toLowerCase() === AUTHORIZE_PATH;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Server side: the redirect target, REBUILT from trusted parts - IDP_URL's origin and the authorize path
+ * are ours; only the query string comes from the request. Null unless isIdpAuthorizeUrl holds.
+ */
+export function idpAuthorizeRedirect(candidate: string | null | undefined, idpBaseUrl: string): string | null {
+  if (!isIdpAuthorizeUrl(candidate, idpBaseUrl)) return null;
+  const query = new URL(candidate as string).search;
+  return `${new URL(idpBaseUrl).origin}/api/OAuth/authorize${query}`;
+}
+
+/**
+ * Client side: the SAME-ORIGIN portal path that resumes authorize, or null when the IdP did not ask for one.
+ * Callers still pass the result through safeCallbackPath before navigating.
+ *
+ * WHY THE ASTERISK IS RE-ENCODED (PAY-1547, measured by NextPert 59939, completeness measured here).
+ * One consumer of this value is `authClient.signIn.social({ callbackURL })`, which POSTs to better-auth
+ * and is validated by its own originCheckMiddleware BEFORE anything redirects. For a relative path that
+ * check is decided entirely by one regex (better-auth 1.5.6, auth/trusted-origins.mjs:16 - the
+ * `allowRelativePaths` branch, and api/middlewares/origin-check.mjs:51 passes
+ * `allowRelativePaths: label !== 'origin'`, so it IS that branch for a callbackURL):
+ *
+ *     /^\/(?!\/|\\|%2f|%5c)[\w\-.\+\/@]*(?:\?[\w\-.\+\/=&%@]*)?$/
+ *
+ * A character this helper emits RAW and that charset rejects is a hard 403 INVALID_CALLBACK_URL on the
+ * Google button - not a silent fallback. Measured exhaustively over printable ASCII by diffing what
+ * `URLSearchParams` leaves raw against that charset: the raw set is alphanumerics plus `* - . _`, and
+ * *** `*` IS THE ONLY REJECTED MEMBER *** (`%` is permitted, which is why every other special character
+ * survives - URLSearchParams already percent-encoded it).
+ *
+ * `*` is reachable because `state` and `scope` are chosen by the OAuth CLIENT, not by us, so we cannot
+ * decline to emit it. `%2A` is the same character to every parser: re-reading this query string returns
+ * the byte-identical `return_url` (asserted in test/authorize-resume.test.cjs), so this is an encoding
+ * change and NOT a value change. It is applied here, at the ONE computation, rather than at the sinks -
+ * the two `window.location.href` sinks are browser navigations that touch no library and for which this
+ * is a behavioural no-op, so there is no reason to make them each carry it.
+ */
+export function authorizeResumeHref(returnUrl: string | null | undefined): string | null {
+  if (typeof returnUrl !== 'string' || returnUrl === '') return null;
+  const query = new URLSearchParams({ return_url: returnUrl }).toString().replace(/\*/g, '%2A');
+  return `${AUTHORIZE_RESUME_ROUTE}?${query}`;
+}
+
+// ───────────────────────── 4.7.5 (PAY-2305): the authorize call is made SERVER-SIDE ─────────────────────────
+//
+// WHY: Core's /api/oauth/authorize identifies a user ONLY from an `Authorization: Bearer` header (JwtMiddleware reads no cookie,
+// and a browser navigation cannot send a header), so the 4.7.0-4.7.4 behaviour - 302 the BROWSER to authorize - could never
+// produce a code for anyone. The resume route now calls authorize itself with the signed-in user's IdP access token and relays
+// only the verified outcome. These helpers are the pure, testable parts.
+
+export interface ServerAuthorizeParams {
+  idpBaseUrl: string;
+  /** This app's IdP client slug (CLIENT_ID). The request's client_id must equal it. */
+  clientId: string;
+  /** The app's REGISTERED redirect_uri, e.g. http://localhost:3000/api/auth/callback. The request's redirect_uri must equal it exactly. */
+  redirectUri: string;
+}
+
+export interface ServerAuthorizeRequest {
+  /** Built from constants + validated pieces only. This is what gets fetched. */
+  url: string;
+  state: string;
+}
+
+const CHALLENGE_RE = /^[A-Za-z0-9_-]{43,128}$/;
+const STATE_RE = /^[A-Za-z0-9._~-]{1,256}$/;
+const SCOPE_RE = /^[A-Za-z0-9:._ -]{1,200}$/;
+
+/**
+ * Build the authorize URL to call, or null (refuse). Origin, path, response_type, client_id and redirect_uri are OURS; from
+ * return_url only code_challenge (+ method, S256 only), state and scope are taken, each charset/length validated. A return_url for
+ * another client or another redirect_uri is refused (no "someone else's client"). Unknown extra parameters are NOT forwarded.
+ */
+export function buildServerAuthorizeRequest(returnUrl: string | null | undefined, p: ServerAuthorizeParams): ServerAuthorizeRequest | null {
+  if (!isIdpAuthorizeUrl(returnUrl, p.idpBaseUrl) || !p.clientId || !p.redirectUri) return null;
+  const q = new URL(returnUrl as string).searchParams;
+  const once = (name: string): string | null => {
+    const all = q.getAll(name);
+    return all.length === 1 ? all[0] : all.length === 0 ? null : '\u0000'; // a repeated parameter is ambiguous: refused below
+  };
+  const responseType = once('response_type');
+  if (responseType !== null && responseType !== 'code') return null;
+  if (once('client_id') !== p.clientId) return null;
+  if (once('redirect_uri') !== p.redirectUri) return null;
+  const challenge = once('code_challenge');
+  const method = once('code_challenge_method');
+  const state = once('state');
+  const scope = once('scope');
+  if (challenge === null || !CHALLENGE_RE.test(challenge)) return null;
+  if (method !== 'S256') return null;
+  if (state === null || !STATE_RE.test(state)) return null;
+  if (scope !== null && !SCOPE_RE.test(scope)) return null;
+
+  const out = new URLSearchParams();
+  out.set('response_type', 'code');
+  out.set('client_id', p.clientId);
+  out.set('redirect_uri', p.redirectUri);
+  if (scope !== null) out.set('scope', scope);
+  out.set('state', state);
+  out.set('code_challenge', challenge);
+  out.set('code_challenge_method', 'S256');
+  return { url: `${new URL(p.idpBaseUrl).origin}${AUTHORIZE_PATH}?${out.toString()}`, state };
+}
+
+/**
+ * The IdP's answer to the server-side authorize call. Returns the RELATIVE path+query to send the browser to, or null (refuse).
+ * Only a redirect whose Location is EXACTLY the registered redirect_uri (origin + path), with a code and the state we sent and no
+ * error, qualifies. The relayed value is REBUILT from the validated code and state, never copied from the Location.
+ */
+export function relayRegisteredCallback(status: number, location: string | null | undefined, redirectUri: string, sentState: string): string | null {
+  if (status < 300 || status > 399 || typeof location !== 'string' || location === '') return null;
+  let loc: URL;
+  let reg: URL;
+  try {
+    reg = new URL(redirectUri);
+    loc = new URL(location, reg.origin);
+  } catch {
+    return null;
+  }
+  if (loc.origin !== reg.origin || loc.pathname !== reg.pathname) return null;
+  if (loc.searchParams.has('error')) return null;
+  const codes = loc.searchParams.getAll('code');
+  const states = loc.searchParams.getAll('state');
+  if (codes.length !== 1 || !/^[A-Za-z0-9._~+/=-]{8,512}$/.test(codes[0])) return null;
+  if (states.length !== 1 || states[0] !== sentState) return null;
+  return `${reg.pathname}?${new URLSearchParams({ code: codes[0], state: sentState }).toString()}`;
+}
+
+/**
+ * The resume must be a same-site navigation. Sec-Fetch-Site decides when the browser sends it; otherwise Referer must be this
+ * app's own origin; with neither it is refused (a crafted cross-site link must not make the victim's browser trigger authorize
+ * with the victim's token).
+ */
+export function isSameSiteResume(headers: { get(name: string): string | null }, appOrigin: string): boolean {
+  const sfs = headers.get('sec-fetch-site');
+  // same-origin or none only: a sibling subdomain ('same-site') is not this app.
+  if (sfs !== null) return sfs === 'same-origin' || sfs === 'none';
+  const referer = headers.get('referer');
+  if (!referer) return false;
+  try {
+    return new URL(referer).origin === appOrigin;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Binds the resume to a browser that STARTED this app's OAuth flow: better-auth (storeStateStrategy 'cookie') sets an
+ * `oauth_state` cookie (Max-Age 600; name may carry a `__Secure-` and an app prefix) when sign-in begins. Its value is sealed, so only
+ * its presence is checked; the state MATCH is enforced by better-auth's callback, which fails closed. A crafted link opened in a
+ * browser that never began the flow has no such cookie and is refused here, before the user's token is used.
+ */
+export function hasOAuthStateCookie(cookieHeader: string | null | undefined): boolean {
+  if (typeof cookieHeader !== 'string') return false;
+  return cookieHeader.split(';').some((part) => {
+    const i = part.indexOf('=');
+    const name = (i < 0 ? part : part.slice(0, i)).trim();
+    return /(^|[._-])oauth_state$/.test(name) && i >= 0 && part.slice(i + 1).trim() !== '';
+  });
+}

package/src/lib/bearer-fetch.ts

@@ -0,0 +1,31 @@
+/**
+ * PAY-1777 item 5 (QAPert-NightHawk, PR 663 G4 thread 4395; coverage widened per BAPert 64034): THE way a server-side call
+ * that carries a user's (or a provisional) bearer token talks to the identity service.
+ *
+ * A bearer must never follow a redirect. Modern fetch drops Authorization on a CROSS-origin hop, but a same-origin hop - or
+ * an older runtime - does not, and we do not rely on that. So:
+ *   - the request is always sent with redirect: 'manual' (set AFTER the caller's init, so no caller can switch it back);
+ *   - any 3xx, or an opaque redirect, is never followed and never relayed: the caller receives a synthetic
+ *     502 { success:false, error:{ code:'IDP_UNREACHABLE' } } Response instead, which every existing non-2xx branch at the
+ *     call sites already handles. Every other response is returned untouched.
+ *
+ * Moved from VibeID-Customer-Portal (src/lib/idp/bearer-fetch.ts) into the package by PAY-2302; the portal's gate
+ * (testing/qa/idp-bearer-no-redirect-gate.js) keeps inventorying its own Authorization-bearing fetches.
+ */
+export const REDIRECT_REFUSED_CODE = 'IDP_UNREACHABLE';
+
+export function isRedirectResponse(res: Response): boolean {
+  return res.type === 'opaqueredirect' || (res.status >= 300 && res.status < 400);
+}
+
+export async function bearerFetch(input: string | URL, init: RequestInit = {}): Promise<Response> {
+  const res = await fetch(input, { ...init, redirect: 'manual' });
+  if (!isRedirectResponse(res)) return res;
+  return new Response(
+    JSON.stringify({
+      success: false,
+      error: { code: REDIRECT_REFUSED_CODE, message: 'The identity service answered with a redirect; the call was not followed' },
+    }),
+    { status: 502, headers: { 'Content-Type': 'application/json' } },
+  );
+}

package/src/lib/code-step-copy.ts

@@ -0,0 +1,83 @@
+/**
+ * PAY-1576 - the 2FA "enter your code" step, described ONCE.
+ *
+ * WHY THIS FILE EXISTS. Two cards render the same step for the same door
+ * (POST /api/auth/admin-login, the package's routes/auth/credential-login, answers `requiresTwoFactor` with `sentVia` /
+ * `codeRequested` / `emailSent`):
+ *   - SignInCard.tsx      (fixed in 267479 to name every lane the box accepts)
+ *   - AdminLoginCard.tsx  (NOT fixed: it said "from your authenticator app" for every user and
+ *                          discarded the door's answer, so an email-code user was sent to a
+ *                          factor they do not have; live allowed2FAMethods=[emailcode,totp])
+ * 267479 reached only one of the twins. A comment cannot stop that recurring; a shared helper can,
+ * because there is then only one place the sentence is built and a static gate
+ * (testing/qa/code-step-copy-gate.js) fails if either card builds its own.
+ *
+ * THE COPY RULES (carried over verbatim from 267479 / 267561, not re-decided here):
+ *   - Name BOTH lanes and RANK NEITHER: the screen does not know which factor the user holds.
+ *   - The non-authenticator clause is gated on the door's answer, so we never mention a code nobody
+ *     asked for.
+ *   - `codeRequested` means "a code was requested", NOT "a code arrived" (twofa/email/send returns
+ *     200 even when the SMTP send threw), so the copy says "the code we emailed you" and never
+ *     "check your inbox" / "it has arrived".
+ */
+
+export type CodeSentVia = 'sms' | 'email' | null;
+
+export interface CodeRequest {
+  /** The door asked for a code to be sent (`codeRequested`, or the older alias `emailSent`). */
+  codeRequested: boolean;
+  /** Which lane the door actually fired, or null when nothing was sent (a TOTP holder). */
+  sentVia: CodeSentVia;
+  /**
+   * PAY-2314 (4.7.1): present and false ONLY when the door said which factors it accepts (acceptedFactors) and TOTP is not
+   * among them. Absent means "the door did not say" (an older door) and keeps the historic authenticator sentence.
+   */
+  acceptsAuthenticator?: false;
+}
+
+/** Nothing sent, nothing to say beyond the authenticator. What a card starts with. */
+export const NO_CODE_REQUEST: CodeRequest = { codeRequested: false, sentVia: null };
+
+/**
+ * Read the door's answer. Total: any shape (null, a string, an array, junk fields) yields a
+ * CodeRequest and never throws, so a malformed body degrades to the authenticator-only sentence
+ * rather than to a crash or to a claim the door never made.
+ */
+export function readCodeRequest(body: unknown): CodeRequest {
+  const b = body && typeof body === 'object' ? (body as Record<string, unknown>) : {};
+  const sentVia: CodeSentVia = b.sentVia === 'sms' || b.sentVia === 'email' ? b.sentVia : null;
+  const accepted = Array.isArray(b.acceptedFactors) ? (b.acceptedFactors as unknown[]) : null;
+  const base: CodeRequest = { codeRequested: b.codeRequested === true || b.emailSent === true, sentVia };
+  return accepted !== null && !accepted.includes('totp') ? { ...base, acceptsAuthenticator: false } : base;
+}
+
+/** The lane clause that follows the authenticator, or '' when the door sent nothing. */
+function laneClause(r: CodeRequest): string {
+  if (!r.codeRequested) return '';
+  if (r.sentVia === 'sms') return ', or the code we texted you';
+  if (r.sentVia === 'email') return ', or the code we emailed you';
+  return ', or the code we sent you';
+}
+
+/**
+ * The sentence, split around the email so a card can render the address however it likes
+ * (SignInCard wraps it in <strong>; AdminLoginCard passes a plain-string subtitle).
+ * `before + email + after` is the whole sentence.
+ */
+export function codeStepParts(r: CodeRequest): { before: string; after: string } {
+  if (r.acceptsAuthenticator === false) {
+    // PAY-2314: the door told us TOTP is not an accepted factor for this user - never send them to an authenticator they do not have.
+    const how = r.sentVia === 'sms' ? 'texted' : r.sentVia === 'email' ? 'emailed' : 'sent';
+    return { before: 'Enter your 6-digit code to finish signing in as ', after: ` — the code we ${how} you.` };
+  }
+  return {
+    before: 'Enter your 6-digit code to finish signing in as ',
+    after: ` — from your authenticator app${laneClause(r)}.`,
+  };
+}
+
+/** The sentence as one plain string, for a card whose subtitle prop is a string. */
+export function codeStepInstruction(email: string, r: CodeRequest): string {
+  const { before, after } = codeStepParts(r);
+  return `${before}${email}${after}`;
+}

package/src/lib/credential-sign-in-client.ts

@@ -0,0 +1,101 @@
+/**
+ * PAY-2302 cut 1b: the BROWSER side of the package's credential sign-in, as plain functions so it is testable without a DOM.
+ *
+ * It talks to the routes the app mounts from this package:
+ *   POST /api/auth/admin-login             routes/auth/credential-login             { email, password, code? }
+ *   POST /api/auth/admin-login/email-code  routes/auth/credential-login-email-code  (no body: the browser names no address and no client)
+ *
+ * The result is a closed union so the form cannot invent a state the door never answered. The logic mirrors the portal's
+ * AdminLoginCard.submitLogin (VibeID-Customer-Portal 3d654917) and keeps its rules:
+ *   - 429 is relayed as the door's own sentence; the form never states a window the door did not send.
+ *   - `requiresTwoFactor` moves to the code step and keeps the door's answer (sentVia / codeRequested) so the step names the
+ *     lane that was actually fired (PAY-1576).
+ *   - anything else not `success: true` is an error carrying the door's message, and `offerEmailCode` only when the door set it
+ *     literally true (PAY-2284).
+ */
+import { NO_CODE_REQUEST, readCodeRequest, type CodeRequest } from './code-step-copy';
+
+export const CREDENTIAL_LOGIN_URL = '/api/auth/admin-login';
+export const CREDENTIAL_EMAIL_CODE_URL = '/api/auth/admin-login/email-code';
+
+export type FetchLike = (input: string, init?: RequestInit) => Promise<Response>;
+
+export type CredentialSignInResult =
+  | { kind: 'success' }
+  | { kind: 'two_factor'; codeRequest: CodeRequest }
+  | { kind: 'rate_limited'; message: string }
+  | { kind: 'error'; message: string; offerEmailCode: boolean };
+
+export const MSG_RATE_LIMITED = 'Too many attempts. Please try again later.';
+export const MSG_CANNOT_SIGN_IN = 'Could not sign in. Check your details and try again.';
+export const MSG_UNEXPECTED = 'Something went wrong signing you in. Please try again.';
+
+const EMAIL_SHAPE = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+
+export function isEmailShaped(v: string): boolean {
+  return EMAIL_SHAPE.test(v);
+}
+
+/** Field-level checks before anything is sent. Returns the errors, or null when the input may be submitted. */
+export function validateCredentials(email: string, password: string): { email?: string; password?: string } | null {
+  const errors: { email?: string; password?: string } = {};
+  const trimmed = email.trim();
+  if (!trimmed) errors.email = 'Enter your email address.';
+  else if (!isEmailShaped(trimmed)) errors.email = 'Enter a valid email address.';
+  if (!password) errors.password = 'Enter your password.';
+  return errors.email || errors.password ? errors : null;
+}
+
+function asString(v: unknown): string | undefined {
+  return typeof v === 'string' && v ? v : undefined;
+}
+
+/** One call to the credential door. `code` is the 2FA code on the second turn; email and password are resubmitted with it. */
+export async function credentialSignIn(
+  args: { email: string; password: string; code?: string },
+  fetchImpl: FetchLike = (input, init) => fetch(input, init),
+): Promise<CredentialSignInResult> {
+  try {
+    const res = await fetchImpl(CREDENTIAL_LOGIN_URL, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ email: args.email, password: args.password, code: args.code }),
+    });
+    const body: any = await res.json().catch(() => null);
+
+    if (res.status === 429) return { kind: 'rate_limited', message: asString(body?.error) ?? MSG_RATE_LIMITED };
+    if (body?.requiresTwoFactor) return { kind: 'two_factor', codeRequest: readCodeRequest(body) };
+    if (!res.ok || body?.success !== true) {
+      return { kind: 'error', message: asString(body?.error) ?? MSG_CANNOT_SIGN_IN, offerEmailCode: body?.offerEmailCode === true };
+    }
+    return { kind: 'success' };
+  } catch {
+    return { kind: 'error', message: MSG_UNEXPECTED, offerEmailCode: false };
+  }
+}
+
+export type EmailCodeResult =
+  | { kind: 'requested'; codeRequest: CodeRequest; devCode: string | null }
+  | { kind: 'error'; message: string };
+
+export const MSG_EMAIL_CODE_FAILED = 'We could not ask for an email code just now. Try again shortly.';
+
+/** "Email me a code instead": asks the door to email a code. `requested` means asked, never arrived. */
+export async function requestEmailCode(fetchImpl: FetchLike = (input, init) => fetch(input, init)): Promise<EmailCodeResult> {
+  try {
+    const res = await fetchImpl(CREDENTIAL_EMAIL_CODE_URL, { method: 'POST', credentials: 'include' });
+    const body: any = await res.json().catch(() => null);
+    if (res.ok && body?.success === true) {
+      return {
+        kind: 'requested',
+        codeRequest: readCodeRequest(body),
+        devCode: typeof body?.devVerificationCode === 'string' && body.devVerificationCode ? body.devVerificationCode : null,
+      };
+    }
+    return { kind: 'error', message: asString(body?.error) ?? MSG_EMAIL_CODE_FAILED };
+  } catch {
+    return { kind: 'error', message: MSG_EMAIL_CODE_FAILED };
+  }
+}
+
+export { NO_CODE_REQUEST };

package/src/lib/device-id.ts

@@ -0,0 +1,67 @@
+/**
+ * Per-browser device identity — card 240566 (QAPert flag 2 on the 9c7a815 review).
+ *
+ * BEFORE: /api/auth/admin-login forwarded ONE hardcoded device-id cookie —
+ * `payez-PayEz-6c8201c35c1b44c9b2e823b36b95a718` — for every caller on the
+ * PUBLIC /sign-in password path. To the IDP's rate limiter and device
+ * fingerprinting, every portal user was literally the same device. Two
+ * consequences, both measured-by-inspection rather than hypothetical:
+ *   1. SHARED-FATE LOCKOUT — one attacker's failed attempts consume the
+ *      throttle budget for every legitimate user at once.
+ *   2. Per-device risk signals are meaningless: "new device" and "trusted
+ *      device" cannot distinguish anybody from anybody.
+ *
+ * The id is a routing/telemetry key, NOT a credential — the IDP must never
+ * grant anything on the strength of it, and nothing here assumes otherwise.
+ * It is client-supplied and therefore client-forgeable; that is inherent to
+ * device-id throttling and is why it supplements, never replaces, the
+ * identifier- and IP-scoped limits on the IDP side.
+ *
+ * Shape is fixed by what the IDP already accepts from
+ * createLoginHandler: `payez-PayEz-<32 lowercase hex>`.
+ */
+
+export const DEVICE_ID_HEADER = 'X-Device-Id';
+export const DEVICE_ID_PATTERN = /^payez-PayEz-[0-9a-f]{32}$/;
+const STORAGE_KEY = 'payez.device-id';
+
+/** True for a well-formed device id. Used on BOTH sides of the wire. */
+export function isValidDeviceId(value: string | null | undefined): value is string {
+  return typeof value === 'string' && DEVICE_ID_PATTERN.test(value);
+}
+
+function mint(): string {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  const hex = Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('');
+  return `payez-PayEz-${hex}`;
+}
+
+/**
+ * The stable per-browser device id, minted once and persisted.
+ *
+ * Browser-only. Persistence is best-effort: private windows, disabled site
+ * data and storage-quota failures all throw on access, so every read and
+ * write is guarded. A browser that cannot persist still gets a VALID id for
+ * this call — it simply looks like a new device each time, which is the
+ * honest answer for a client that refuses to be remembered, and is still
+ * strictly better than every user sharing one identity.
+ */
+export function getDeviceId(): string {
+  if (typeof window === 'undefined') return mint();
+
+  try {
+    const existing = window.localStorage.getItem(STORAGE_KEY);
+    if (isValidDeviceId(existing)) return existing;
+  } catch {
+    return mint();
+  }
+
+  const minted = mint();
+  try {
+    window.localStorage.setItem(STORAGE_KEY, minted);
+  } catch {
+    /* not persistable — the minted id is still returned and used for this call */
+  }
+  return minted;
+}

package/src/lib/lock-window.ts

@@ -0,0 +1,49 @@
+/**
+ * PAY-1608: a 2FA lock's window, stated as the IdP enforces it. Never a hard-coded "15 minutes".
+ *
+ * Core answers every 2FA lock with 429 code "locked" plus Retry-After: MfaController.SecondFactorLocked sends the
+ * full lockout (900), and VerifyTotp sends what is LEFT of the lock. The portal used to hard-code "locked for 15
+ * minutes" in three places (verify-code-copy.ts, twofa-rejection.ts, and the next-mvp BFF), which was true only
+ * while every lock was exactly 15 minutes and the user had just tripped it.
+ *
+ * The window arrives in one of two ways:
+ *   - Door A (verify-code): next-mvp >= 4.5.2 relays it in the BFF body as `retryAfterSeconds` (a number).
+ *   - Door B (admin-login): this route reads the IdP's Retry-After header itself.
+ * With no window, the sentence states NO number rather than a guessed one.
+ *
+ * Dependency-free on purpose: the verify-code page (client) and the admin-login route (server) both use it, and
+ * the chain gate executes it directly.
+ */
+
+/** A positive whole number of seconds from the BFF body, or undefined. Anything else - a string, 0, NaN - is dropped. */
+export function lockSecondsFromBody(value: unknown): number | undefined {
+  return typeof value === 'number' && Number.isFinite(value) && value > 0 ? Math.ceil(value) : undefined;
+}
+
+/** A Retry-After header as whole seconds. ONE implementation: the package's lib/retry-after (the portal copy was the same rule). */
+export { parseRetryAfterSeconds } from './retry-after';
+
+/**
+ * The window in words, rounded UP so the user is never told a shorter wait than the IdP enforces:
+ * 900 -> "15 minutes", 61 -> "2 minutes", 60 -> "1 minute", 45 -> "45 seconds", 7200 -> "2 hours".
+ */
+export function formatLockWindow(seconds: number | undefined): string | undefined {
+  if (typeof seconds !== 'number' || !Number.isFinite(seconds) || seconds <= 0) return undefined;
+  const plural = (n: number, unit: string) => `${n} ${unit}${n === 1 ? '' : 's'}`;
+  if (seconds < 60) return plural(Math.ceil(seconds), 'second');
+  const minutes = Math.ceil(seconds / 60);
+  if (minutes < 120) return plural(minutes, 'minute');
+  return plural(Math.ceil(minutes / 60), 'hour');
+}
+
+/** The sentence for a lock whose window was NOT sent. It says even a correct code is refused, and states no number. */
+export const LOCKED_NO_WINDOW =
+  'Too many incorrect codes. Verification is locked for now - even a correct code is refused until the lock ends. Wait before entering another code.';
+
+/** The locked sentence: the IdP's real window when it sent one, otherwise LOCKED_NO_WINDOW. */
+export function lockedSentence(seconds?: number): string {
+  const window = formatLockWindow(seconds);
+  return window
+    ? `Too many incorrect codes. Verification is locked for ${window} - wait before entering another code.`
+    : LOCKED_NO_WINDOW;
+}

package/src/lib/login-error-message.ts

@@ -0,0 +1,41 @@
+/**
+ * PAY-2319 (4.7.2): what the login page SAYS for an `?error=` / `?oauth_error=` code, as pure functions so a test can
+ * execute them (the page is a client component and effects do not run in a static render).
+ *
+ * 4.7.1 mapped these codes in an effect that called setLoginError, but the page never RENDERED loginError (it only fed the
+ * loading gate), so no sentence was ever shown (NightHawk's walk, 73801, W1). Now that the text is displayed, a raw code from
+ * the URL must NOT be echoed: `/account-auth/login?error=<anything an attacker types>` would otherwise print attacker-chosen
+ * text on the login page (content spoofing / phishing). Known codes get their sentence; anything else gets one generic
+ * sentence; nothing from the URL is ever shown verbatim.
+ */
+
+export const GENERIC_LOGIN_ERROR = 'We could not sign you in. Please try again.';
+
+const KNOWN: Record<string, string> = {
+  TwoFactorTimeout: 'Your verification step timed out before the code was confirmed. Please sign in again.',
+  AUTHORIZE_RESUME_REFUSED: 'That sign-in request could not be continued. Please sign in again.',
+  ServiceUnavailable: 'Authentication service is temporarily unavailable. Please try again in a few minutes.',
+  CredentialsSignin: 'Invalid email or password. Please try again.',
+};
+
+/**
+ * The sentence for `?error=<code>`, or null when nothing should be shown.
+ * SessionExpired is a normal event (not an error) and shows nothing; an absent/empty code shows nothing.
+ */
+export function friendlyLoginError(code: string | null | undefined): string | null {
+  if (typeof code !== 'string' || code === '') return null;
+  if (code === 'SessionExpired') return null;
+  if (Object.prototype.hasOwnProperty.call(KNOWN, code)) return KNOWN[code];
+  // The old raw-JSON parse failures the middleware/proxy could bounce here:
+  if (code.startsWith('Unexpected token') || code.includes('not valid JSON')) {
+    return 'An authentication error occurred. Please try signing in again.';
+  }
+  return GENERIC_LOGIN_ERROR;
+}
+
+/** `?oauth_error=<provider>`: only a plain provider-like slug is echoed (capitalised); anything else is the generic sentence. */
+export function oauthFailureMessage(provider: string | null | undefined): string | null {
+  if (typeof provider !== 'string' || provider === '') return null;
+  if (!/^[a-z][a-z0-9_-]{0,31}$/i.test(provider)) return GENERIC_LOGIN_ERROR;
+  return `${provider.charAt(0).toUpperCase()}${provider.slice(1)} sign-in did not complete. Please try again.`;
+}

package/src/lib/twofa-rejection.ts

@@ -0,0 +1,91 @@
+/**
+ * Door B (/api/auth/admin-login) twofa verify: what to tell the user when every lane refused.
+ *
+ * Classification is by the MOST BLOCKING outcome across lanes (268121 ruling), in this order:
+ *   429 from the IdP, or any lane answering code `locked`  -> 429 lockout (PAY-903)
+ *   any 5xx, or a lane answering code server_error / service_unavailable (PAY-1589) -> 502 "our side, not your code"
+ *   otherwise                                              -> 400 wrong / expired code
+ *
+ * PAY-903: MfaController.VerifyTotp returns 400 {message, code:"locked"} for a 15-minute lockout
+ * (MfaTotpService ErrorCode "locked"). Status-only classification read that as "wrong code, try again" -
+ * coaching a locked-out user to spend attempts. The body is inspected for EVERY lane, because with lane
+ * order [totp, email] the last response is the email lane's and never carries the TOTP lockout.
+ * Disclosing the lockout here is safe: this step is post-password (the caller already proved the account).
+ *
+ * PAY-1608: the lockout states the LOCKED LANE's own Retry-After (Core sends one on every 2FA lock; VerifyTotp sends
+ * what is LEFT of it). It used to hard-code 15 minutes / 900 s. With no usable header, no number is stated and
+ * `retryAfter` is omitted rather than invented.
+ */
+import { lockedSentence, parseRetryAfterSeconds } from './lock-window';
+
+export interface TwofaLaneResult {
+  status: number;
+  body: string;
+  /** PAY-2284: which lane this answer came from, so a fault in the TOTP/SMS lane can offer the email lane (never offered when the EMAIL lane is the one that faulted). */
+  lane?: 'totp' | 'sms' | 'email';
+  /** PAY-1608: this lane's Retry-After header, as received. */
+  retryAfter?: string | null;
+}
+
+export interface TwofaRejection {
+  status: 400 | 429 | 502;
+  error: string;
+  retryAfter?: number;
+  /**
+   * PAY-2284: true when the authenticator (or text) lane failed on OUR side and the emailed-code lane has not faulted. The sign-in
+   * card then shows a real "Email me a code instead" action. Before this, the copy said "use another sign-in method" and the screen
+   * offered none, and a TOTP holder - for whom the door sends NOTHING at sign-in - was stuck (Jon, 12 Oct, dev-93 key version 57).
+   */
+  offerEmailCode?: true;
+}
+
+/** Every code the IdP body carries: flat {code}, envelope {error:{code}}, or {error:{details:{code}}}. */
+function laneCodes(body: string): string[] {
+  try {
+    const j = JSON.parse(body) as Record<string, unknown> | null;
+    if (!j || typeof j !== 'object') return [];
+    const err = (j.error && typeof j.error === 'object' ? j.error : null) as Record<string, unknown> | null;
+    const details = (err?.details && typeof err.details === 'object' ? err.details : null) as Record<string, unknown> | null;
+    return [j.code, err?.code, details?.code].filter((c): c is string => typeof c === 'string').map((c) => c.toLowerCase());
+  } catch {
+    return [];
+  }
+}
+
+export function classifyTwofaRejection(lanes: TwofaLaneResult[], retryAfterHeader?: string | null): TwofaRejection {
+  const lockedLane = lanes.find((l) => laneCodes(l.body).includes('locked'));
+  if (lockedLane) {
+    const secs = parseRetryAfterSeconds(lockedLane.retryAfter);
+    return { status: 429, error: lockedSentence(secs), ...(secs ? { retryAfter: secs } : {}) };
+  }
+  if (lanes.some((l) => l.status === 429)) {
+    const parsed = retryAfterHeader ? parseInt(retryAfterHeader, 10) : NaN;
+    return {
+      status: 429,
+      error: 'Too many attempts. Your code is still valid - wait before trying again.',
+      retryAfter: Number.isFinite(parsed) && parsed > 0 ? parsed : 60,
+    };
+  }
+  // PAY-1589: an IdP-side fault that arrives as 400 + code (TOTP secret cannot be decrypted -> server_error;
+  // replay store down -> service_unavailable). It is not the user's code and does not count toward the lockout,
+  // so calling it "not right" sends them round a loop that cannot succeed. Email may still work, so say so.
+  const faulted = (l: TwofaLaneResult) => laneCodes(l.body).some((c) => c === 'server_error' || c === 'service_unavailable');
+  if (lanes.some(faulted)) {
+    const emailLaneFaulted = lanes.some((l) => l.lane === 'email' && (faulted(l) || l.status >= 500));
+    const offer = !emailLaneFaulted && lanes.some((l) => faulted(l) && (l.lane === 'totp' || l.lane === 'sms'));
+    return {
+      status: 502,
+      error: offer
+        ? 'We could not check your code just now - this is a problem on our side, not with your code. You can have us email you a code instead.'
+        : 'We could not check your code just now - this is a problem on our side, not with your code. Try again shortly.',
+      ...(offer ? { offerEmailCode: true as const } : {}),
+    };
+  }
+  if (lanes.some((l) => l.status >= 500)) {
+    return {
+      status: 502,
+      error: 'We could not check your code just now - this is a problem on our side, not with your code. Try again shortly.',
+    };
+  }
+  return { status: 400, error: 'That code is not right or has expired. Try again.' };
+}