@payez/next-mvp 4.5.4 → 4.5.5

package/src/auth/better-auth.ts

@@ -16,6 +16,7 @@ import { decodeJwt } from 'jose';   // better-auth's own JWT dependency
 import { betterAuth } from 'better-auth';
 import { nextCookies } from 'better-auth/next-js';
 import { toNextJsHandler } from 'better-auth/next-js';
+import { wrapBetterAuthHandler } from './session-response-sanitizer';
 import { magicLink, type MagicLinkOptions } from 'better-auth/plugins/magic-link';
 import { resolveClientKey } from '../lib/client-key';
 import { genericOAuth } from 'better-auth/plugins/generic-oauth';
@@ -996,7 +997,10 @@ export async function getBetterAuthHandler(): Promise<{ GET: (req: Request) => P
   if (!isBetterAuthEnabled()) return null;
 
   const auth = await getBetterAuthInstance();
-  return toNextJsHandler(auth);
+  // PAY-2217: Better Auth's native endpoints (get-session, list-sessions, sign-in/*, sign-up/*) put the session
+  // token in the body. Strip it at the HTTP boundary here, so every consumer that mounts this handler gets it;
+  // auth.api (server-side) is untouched and still sees the token. See session-response-sanitizer.ts.
+  return wrapBetterAuthHandler(auth as any, toNextJsHandler(auth));
 }
 
 /**

package/src/auth/session-response-sanitizer.ts

@@ -0,0 +1,151 @@
+/**
+ * PAY-2217: no session token reaches browser JS from Better Auth's own HTTP endpoints.
+ *
+ * WHAT WAS WRONG. PAY-1481 removed token material from the package's own GET /api/auth/session. Better Auth's native
+ * endpoints are a separate surface served by the catch-all mount, and their default bodies carry the session
+ * credential identifier:
+ *   GET  /get-session    -> { session: { id, token, userId, ... }, user }
+ *   GET  /list-sessions  -> [ { id, token, ... } ]        (EVERY session of the user, not just this one)
+ *   POST /sign-in/*      -> { token, user, ... }
+ *   POST /sign-up/*      -> { token, user }
+ *   GET  /magic-link/verify (no callbackURL) -> { token, user }   (NightHawk G4 on PR 1190, measured on a real instance)
+ * and any plugin endpoint (passkey verify, two-factor verify, genericOAuth) answers a session object the same way.
+ * `token` is the Redis key of the session. The cookie is token.HMAC and Path B verifies the signature, so a bare
+ * token is not a replayable cookie (gate rows B1-B4 measure that), but it is a credential identifier readable by any
+ * script on the page, for this session and for every other session the user has. It breaks the PAY-1481 rule.
+ *
+ * EVERY 2xx JSON BODY IS STRIPPED, not a named list of paths. A list protects the endpoints someone remembered and
+ * silently misses the next plugin; the strip is a function of the response, so a new endpoint is covered the day it is
+ * mounted. A 2xx JSON body that legitimately needs one of these names to reach the browser would have to be
+ * allowlisted here on purpose (none is known: no client in this package reads one).
+ *
+ * WHERE THE FIX LIVES, AND WHY NOT customSession. Server-side code in this package reads session.session.token from
+ * auth.api.getSession() (viability, refresh, status, the OAuth exchange). A customSession plugin or an after-hook
+ * runs for those calls too and would strip the token from them. So the strip is applied at the HTTP BOUNDARY only:
+ * getBetterAuthHandler() returns handlers wrapped by wrapBetterAuthHandler(), and auth.api stays untouched.
+ *
+ * WHAT THE BROWSER GETS INSTEAD.
+ *   - list-sessions rows carry `isCurrent` (computed here against the caller's cookie-resolved session) and `id`.
+ *   - POST /revoke-session-by-id { id }: revokes ONE of the CALLER's sessions by its id. An id that is not one of the
+ *     caller's own sessions answers 404 (never 403: do not confirm that another user's session id exists).
+ *   - Better Auth's native POST /revoke-session { token } still exists and still requires a cookie-resolved session
+ *     that owns the token, but no browser ever holds a token to send it.
+ */
+
+/** Credential-bearing key names, compared case- and separator-insensitively. */
+const STRIP_KEYS = new Set(['token', 'sessiontoken', 'accesstoken', 'refreshtoken', 'idtoken']);
+
+const norm = (k: string): string => k.toLowerCase().replace(/[_\-\s]/g, '');
+
+/** Deep copy of `value` with every credential-named key removed, at any depth, in objects and arrays. */
+export function stripSessionCredentials(value: unknown): unknown {
+  if (Array.isArray(value)) return value.map(stripSessionCredentials);
+  if (value !== null && typeof value === 'object') {
+    const out: Record<string, unknown> = {};
+    for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+      if (STRIP_KEYS.has(norm(k))) continue;
+      out[k] = stripSessionCredentials(v);
+    }
+    return out;
+  }
+  return value;
+}
+
+/** "/api/auth/get-session" -> "/get-session". Anything not under an /auth/ segment is returned as-is. */
+export function authSubPath(pathname: string): string {
+  const i = pathname.indexOf('/api/auth/');
+  if (i >= 0) return pathname.slice(i + '/api/auth'.length).replace(/\/+$/, '') || '/';
+  return pathname.replace(/\/+$/, '') || '/';
+}
+
+function isJson(res: Response): boolean {
+  return (res.headers.get('content-type') || '').toLowerCase().includes('application/json');
+}
+
+/** A Response with a new JSON body and the original status and headers (content-length recomputed by the runtime). */
+function withJsonBody(res: Response, body: unknown): Response {
+  const headers = new Headers(res.headers);
+  headers.delete('content-length');
+  return new Response(JSON.stringify(body), { status: res.status, statusText: res.statusText, headers });
+}
+
+interface AuthApi {
+  getSession: (opts: { headers: Headers }) => Promise<any>;
+  listSessions: (opts: { headers: Headers }) => Promise<any>;
+  revokeSession: (opts: { headers: Headers; body: { token: string }; asResponse?: boolean }) => Promise<any>;
+}
+
+/** Sanitise one already-produced Better Auth response. Pure function of (request, response, current token). */
+export async function sanitizeBetterAuthResponse(
+  req: Request,
+  res: Response,
+  currentToken: () => Promise<string | undefined>,
+): Promise<Response> {
+  const sub = authSubPath(new URL(req.url).pathname);
+  if (!res.ok || !isJson(res)) return res;
+
+  let body: unknown;
+  try {
+    body = await res.clone().json();
+  } catch {
+    return res; // unreadable body: nothing to strip, and do not turn it into a different failure
+  }
+
+  if (sub === '/list-sessions' && Array.isArray(body)) {
+    const cur = await currentToken().catch(() => undefined);
+    body = body.map((row: any) =>
+      row && typeof row === 'object' ? { ...row, isCurrent: !!cur && row.token === cur } : row,
+    );
+  }
+  return withJsonBody(res, stripSessionCredentials(body));
+}
+
+const json = (status: number, body: unknown): Response =>
+  new Response(JSON.stringify(body), { status, headers: { 'content-type': 'application/json' } });
+
+/** POST /revoke-session-by-id { id }: revoke one of the caller's own sessions by id. */
+async function revokeById(req: Request, api: AuthApi): Promise<Response> {
+  let id: unknown;
+  try {
+    id = (await req.json())?.id;
+  } catch {
+    return json(400, { code: 'INVALID_REQUEST', message: 'Body must be JSON { id }' });
+  }
+  if (typeof id !== 'string' || id.length === 0) {
+    return json(400, { code: 'INVALID_REQUEST', message: 'id is required' });
+  }
+  const headers = new Headers(req.headers);
+  const rows = await api.listSessions({ headers }).catch(() => null);
+  if (rows === null) return json(401, { code: 'UNAUTHORIZED', message: 'No session' });
+  // listSessions returns ONLY the caller's own sessions, so a foreign id cannot match: 404, not 403.
+  const row = Array.isArray(rows) ? rows.find((r: any) => r && r.id === id && typeof r.token === 'string') : undefined;
+  if (!row) return json(404, { code: 'SESSION_NOT_FOUND', message: 'No such session' });
+  const res = await api.revokeSession({ headers, body: { token: row.token }, asResponse: true });
+  // Pass Better Auth's own answer (and its Set-Cookie when the current session was the one revoked) through.
+  return res instanceof Response ? res : json(200, { status: true });
+}
+
+type Handler = (req: Request) => Promise<Response>;
+
+/**
+ * Wrap Better Auth's Next.js handlers so no response carries a session credential to the browser.
+ * `auth` is the Better Auth instance; its `api` is used server-side only (to find the caller's current session and to
+ * revoke by id) and is not modified.
+ */
+export function wrapBetterAuthHandler(
+  auth: { api: AuthApi },
+  handlers: { GET: Handler; POST: Handler },
+): { GET: Handler; POST: Handler } {
+  const currentTokenFor = (req: Request) => async (): Promise<string | undefined> => {
+    const s = await auth.api.getSession({ headers: new Headers(req.headers) });
+    return s?.session?.token;
+  };
+  return {
+    GET: async (req) => sanitizeBetterAuthResponse(req, await handlers.GET(req), currentTokenFor(req)),
+    POST: async (req) => {
+      const sub = authSubPath(new URL(req.url).pathname);
+      if (sub === '/revoke-session-by-id') return revokeById(req, auth.api);
+      return sanitizeBetterAuthResponse(req, await handlers.POST(req), currentTokenFor(req));
+    },
+  };
+}

package/src/stores/authStore.ts

@@ -637,23 +637,13 @@ export const useAuthStore = create<AuthStore>()(
           // COORDINATED REFRESH: The server now handles distributed locking
           // We just need to make the refresh call and let the server coordinate
 
-          // Resolve session token for header
-          const resolveSessionTokenForHeader = async (): Promise<string | undefined> => {
-            let token = get().session?.sessionToken as string | undefined;
-            if (token) return token;
-            try {
-              for (let attempt = 1; attempt <= 3 && !token; attempt++) {
-                const { data: s } = await authClient.getSession();
-                token = (s as any)?.sessionToken;
-                if (!token) {
-                  await new Promise(r => setTimeout(r, 150));
-                }
-              }
-            } catch {
-              authLogger.warn('[AuthStore] Failed to resolve session token from Better Auth during refresh');
-            }
-            return token;
-          };
+          // PAY-2217: the session token is NOT read from Better Auth's getSession() any more. The HTTP body no
+          // longer carries it (wrapBetterAuthHandler), and this read was already dead: getSession() returns
+          // { session: { token } }, never a top-level `sessionToken`, so the 3 x 150 ms retry loop that used to sit
+          // here always ran to exhaustion. The server resolves the session from the cookie and REJECTS an
+          // x-session-token header when it cannot (refresh.ts, 246007), so the header is advisory at best.
+          const resolveSessionTokenForHeader = async (): Promise<string | undefined> =>
+            get().session?.sessionToken as string | undefined;
 
           const sessionTokenHeader = await resolveSessionTokenForHeader();