@tollbooth-dpyc/web 2.0.1 → 2.1.0

package/dist/holder.d.ts

@@ -5,26 +5,18 @@
  * the connection's OAuth tokens and names the npub on each call.
  *
  * Becoming a holder is the OAuth Authorization Code flow every MCP client
- * runs: register, send the browser to the operator's `/authorize` (it approves
- * at once, since a holder holds nothing until a DM proves an npub into it),
- * and exchange the code it hands back. Tokens refresh on their own; a refresh
- * token is single-use, so each refresh stores the pair it returns.
+ * runs, done by fetch: register, ask the operator's `/authorize` for a code
+ * (it approves at once, since a holder holds nothing until a DM proves an npub
+ * into it, and answers a page in JSON), and exchange the code. The page never
+ * leaves itself. Tokens refresh on their own; a refresh token is single-use,
+ * so each refresh stores the pair it returns.
  */
 /** True when this site connects as a holder (its operator supports it). */
 export declare function holderEnabled(): boolean;
 /** True when this tab already is a holder. */
 export declare function isHolder(): boolean;
-/**
- * Become a holder: register and send the browser to the operator, which
- * sends it straight back. `resume` comes back from `completeHolderConnect`.
- */
-export declare function connectAsHolder(resume: string): Promise<void>;
-/**
- * On return from the operator: exchange the code, store the tokens, tidy the
- * address bar, and hand back what the sign-in was doing. Null when this page
- * load is not a return.
- */
-export declare function completeHolderConnect(): Promise<string | null>;
+/** Become a holder: register, take a code from the operator by fetch, and exchange it. */
+export declare function connectAsHolder(): Promise<void>;
 /** The bearer for the next request, refreshed when it is about to lapse; null when not a holder. */
 export declare function holderBearer(): Promise<string | null>;
 /** Disconnect: the operator forgets this holder and every npub it held. */

package/dist/holder.js

@@ -5,15 +5,15 @@
  * the connection's OAuth tokens and names the npub on each call.
  *
  * Becoming a holder is the OAuth Authorization Code flow every MCP client
- * runs: register, send the browser to the operator's `/authorize` (it approves
- * at once, since a holder holds nothing until a DM proves an npub into it),
- * and exchange the code it hands back. Tokens refresh on their own; a refresh
- * token is single-use, so each refresh stores the pair it returns.
+ * runs, done by fetch: register, ask the operator's `/authorize` for a code
+ * (it approves at once, since a holder holds nothing until a DM proves an npub
+ * into it, and answers a page in JSON), and exchange the code. The page never
+ * leaves itself. Tokens refresh on their own; a refresh token is single-use,
+ * so each refresh stores the pair it returns.
  */
 import { tollboothConfig } from "./config.js";
 import { readStored, removeStored, writeStored } from "./storage.js";
 const TOKENS = "holder:v1";
-const PENDING = "holder_pending:v1";
 /** Refresh this long before the access token lapses. */
 const REFRESH_EARLY_MS = 60_000;
 function operator() {
@@ -26,12 +26,9 @@ function operator() {
 export function holderEnabled() {
     return Boolean(tollboothConfig().operatorUrl);
 }
-/**
- * Back to the page the sign-in started on, since that page finishes it: a site
- * whose `/` is not the sign-in page would otherwise drop the code on the floor.
- */
+/** The address the code is issued to. Registered and named, never visited. */
 function redirectUri() {
-    return `${globalThis.location.origin}${globalThis.location.pathname}`;
+    return `${globalThis.location.origin}/`;
 }
 function readTokens() {
     try {
@@ -53,13 +50,13 @@ async function challengeFor(verifier) {
     const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", new TextEncoder().encode(verifier)));
     return btoa(String.fromCharCode(...digest)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-async function register(redirect) {
+async function register() {
     const r = await fetch(`${operator()}/register`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
             client_name: tollboothConfig().appName,
-            redirect_uris: [redirect],
+            redirect_uris: [redirectUri()],
             grant_types: ["authorization_code", "refresh_token"],
             response_types: ["code"],
             token_endpoint_auth_method: "none",
@@ -89,47 +86,33 @@ async function token(form, clientId) {
 export function isHolder() {
     return readTokens() !== null;
 }
-/**
- * Become a holder: register and send the browser to the operator, which
- * sends it straight back. `resume` comes back from `completeHolderConnect`.
- */
-export async function connectAsHolder(resume) {
-    const redirect = redirectUri();
-    const clientId = readTokens()?.clientId || (await register(redirect));
+/** Become a holder: register, take a code from the operator by fetch, and exchange it. */
+export async function connectAsHolder() {
+    const clientId = readTokens()?.clientId || (await register());
     const verifier = randomUrlSafe(48);
     const state = randomUrlSafe(16);
-    const pending = { clientId, verifier, state, resume, redirectUri: redirect };
-    globalThis.sessionStorage.setItem(PENDING, JSON.stringify(pending));
     const url = new URL(`${operator()}/authorize`);
     url.search = new URLSearchParams({
         response_type: "code",
         client_id: clientId,
-        redirect_uri: redirect,
+        redirect_uri: redirectUri(),
         state,
         code_challenge: await challengeFor(verifier),
         code_challenge_method: "S256",
         resource: `${operator()}/mcp`,
     }).toString();
-    globalThis.location.assign(url.toString());
-}
-/**
- * On return from the operator: exchange the code, store the tokens, tidy the
- * address bar, and hand back what the sign-in was doing. Null when this page
- * load is not a return.
- */
-export async function completeHolderConnect() {
-    const params = new URLSearchParams(globalThis.location.search);
-    const code = params.get("code");
-    const raw = globalThis.sessionStorage.getItem(PENDING);
-    if (!code || !raw)
-        return null;
-    globalThis.sessionStorage.removeItem(PENDING);
-    const pending = JSON.parse(raw);
-    globalThis.history.replaceState(null, "", globalThis.location.pathname);
-    if (params.get("state") !== pending.state)
+    const r = await fetch(url, { headers: { Accept: "application/json" } });
+    const answer = await r.json().catch(() => ({}));
+    if (!r.ok || typeof answer.redirect_uri !== "string") {
+        throw new Error(answer.error_description || `The service would not connect this page (${r.status}).`);
+    }
+    const issued = new URL(answer.redirect_uri).searchParams;
+    if (issued.get("state") !== state)
         throw new Error("The service's reply did not match this sign-in.");
-    writeTokens(await token({ grant_type: "authorization_code", code, redirect_uri: pending.redirectUri, code_verifier: pending.verifier }, pending.clientId));
-    return pending.resume;
+    const code = issued.get("code");
+    if (!code)
+        throw new Error(issued.get("error_description") || "The service did not connect this page.");
+    writeTokens(await token({ grant_type: "authorization_code", code, redirect_uri: redirectUri(), code_verifier: verifier }, clientId));
 }
 /** The bearer for the next request, refreshed when it is about to lapse; null when not a holder. */
 export async function holderBearer() {

package/dist/react/NpubGate.js

@@ -19,7 +19,7 @@ import { useEffect, useRef, useState } from "react";
 import { generateSecretKey, getPublicKey, nip19 } from "nostr-tools";
 import { tollboothConfig } from "../config.js";
 import { forgetRecentLogin, getLastTypedNpub, getValidRecentLogins, recordRecentLogin, setLastTypedNpub, setStoredNpub, } from "../identity.js";
-import { completeHolderConnect, connectAsHolder, holderEnabled, isHolder } from "../holder.js";
+import { connectAsHolder, holderEnabled, isHolder } from "../holder.js";
 import { setSessionNsec } from "../sessionNsec.js";
 import { readSignInFailure } from "../signInSituation.js";
 import { receiveNpubProof, requestNpubProof } from "../standardTools.js";
@@ -109,24 +109,8 @@ export default function NpubGate({ onLogin, startFresh = false, operatorHash, no
             setError(`Couldn't read that nsec: ${e.message}`);
         }
     }
-    // Back from connecting to the operator: carry on with the DM it was for.
-    const resumed = useRef(false);
-    useEffect(() => {
-        if (resumed.current)
-            return;
-        resumed.current = true;
-        completeHolderConnect()
-            .then((npub) => {
-            if (npub) {
-                setValue(npub);
-                void begin(npub);
-            }
-        })
-            .catch((e) => setError(e.message));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-    async function begin(npubArg) {
-        const npubToProve = npubArg ?? trimmed;
+    async function begin() {
+        const npubToProve = trimmed;
         if (!(npubToProve.startsWith("npub1") && npubToProve.length >= 60)) {
             setError("Enter a valid npub1… key.");
             return;
@@ -135,15 +119,13 @@ export default function NpubGate({ onLogin, startFresh = false, operatorHash, no
         setError("");
         try {
             // The proof will stay with the operator, so this tab connects to it
-            // first; the browser comes straight back here and the DM goes out.
+            // first, by fetch, and the DM goes out.
             if (!holderEnabled()) {
                 setError("This site signs in with a key only — paste an nsec, or make one.");
                 return;
             }
-            if (!isHolder()) {
-                await connectAsHolder(npubToProve);
-                return;
-            }
+            if (!isHolder())
+                await connectAsHolder();
             const r = await requestNpubProof(npubToProve, globalThis.location.origin, `You requested to sign in to ${appName} (${globalThis.location.host}).`);
             if (r.error)
                 return setError(r.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tollbooth-dpyc/web",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Shared browser SDK for Tollbooth DPYC operator front ends: npub sign-in, proofs, MCP client, profile and wallet",
   "license": "Apache-2.0",
   "author": "Lonnie VanZandt",