@orangecheck/auth-client 2.27.0 → 2.29.0

package/dist/index.d.mts

@@ -47,6 +47,7 @@ interface OcAuthConfig {
     signInPath?: string;
     mePath?: string;
     logoutPath?: string;
+    multiAccount?: boolean;
 }
 declare const DEFAULT_CONFIG: Required<OcAuthConfig>;
 declare function buildSignInUrl(cfg: Required<OcAuthConfig>, returnTo?: string): string;
@@ -118,7 +119,7 @@ interface UseOcAddressSuggestionReturn {
 declare function useOcAddressSuggestion(options: UseOcAddressSuggestionOptions): UseOcAddressSuggestionReturn;
 declare const OcAddressInput: React.ForwardRefExoticComponent<OcAddressInputProps & React.RefAttributes<HTMLInputElement>>;
 
-interface OcSignInProps {
+interface OcSignInBaseProps {
     audience: string;
     returnTo?: string;
     onSuccess?: (account: OcAccount, token?: string) => void;
@@ -134,9 +135,17 @@ interface OcSignInProps {
     add?: boolean;
     className?: string;
 }
+type OcSignInProps = OcSignInBaseProps & ({
+    mode?: 'family';
+    providerHref?: undefined;
+} | {
+    mode: 'first-party';
+    onSuccess: (account: OcAccount, token?: string) => void;
+    providerHref?: (providerId: string) => string;
+});
 declare function safeReturnTo(input: string | undefined): string;
 declare function familyReturnTarget(input: string | undefined | null): string | undefined;
-declare function OcSignIn({ audience, returnTo, onSuccess, resolveReturnTo, linkPrompt, add: addProp, authOrigin, initialPath, providersFirst, paths, className, }: OcSignInProps): React.ReactElement;
+declare function OcSignIn({ audience, returnTo, onSuccess, resolveReturnTo, linkPrompt: linkPromptProp, add: addProp, authOrigin, initialPath, providersFirst, paths, className, mode, providerHref, }: OcSignInProps): React.ReactElement;
 
 interface OcLinkedIdentity {
     id: string;

package/dist/index.d.ts

@@ -47,6 +47,7 @@ interface OcAuthConfig {
     signInPath?: string;
     mePath?: string;
     logoutPath?: string;
+    multiAccount?: boolean;
 }
 declare const DEFAULT_CONFIG: Required<OcAuthConfig>;
 declare function buildSignInUrl(cfg: Required<OcAuthConfig>, returnTo?: string): string;
@@ -118,7 +119,7 @@ interface UseOcAddressSuggestionReturn {
 declare function useOcAddressSuggestion(options: UseOcAddressSuggestionOptions): UseOcAddressSuggestionReturn;
 declare const OcAddressInput: React.ForwardRefExoticComponent<OcAddressInputProps & React.RefAttributes<HTMLInputElement>>;
 
-interface OcSignInProps {
+interface OcSignInBaseProps {
     audience: string;
     returnTo?: string;
     onSuccess?: (account: OcAccount, token?: string) => void;
@@ -134,9 +135,17 @@ interface OcSignInProps {
     add?: boolean;
     className?: string;
 }
+type OcSignInProps = OcSignInBaseProps & ({
+    mode?: 'family';
+    providerHref?: undefined;
+} | {
+    mode: 'first-party';
+    onSuccess: (account: OcAccount, token?: string) => void;
+    providerHref?: (providerId: string) => string;
+});
 declare function safeReturnTo(input: string | undefined): string;
 declare function familyReturnTarget(input: string | undefined | null): string | undefined;
-declare function OcSignIn({ audience, returnTo, onSuccess, resolveReturnTo, linkPrompt, add: addProp, authOrigin, initialPath, providersFirst, paths, className, }: OcSignInProps): React.ReactElement;
+declare function OcSignIn({ audience, returnTo, onSuccess, resolveReturnTo, linkPrompt: linkPromptProp, add: addProp, authOrigin, initialPath, providersFirst, paths, className, mode, providerHref, }: OcSignInProps): React.ReactElement;
 
 interface OcLinkedIdentity {
     id: string;

package/dist/index.js

@@ -32,7 +32,8 @@ var DEFAULT_CONFIG = {
   authOrigin: "https://ochk.io",
   signInPath: "/signin",
   mePath: "/api/auth/me",
-  logoutPath: "/api/auth/logout"
+  logoutPath: "/api/auth/logout",
+  multiAccount: true
 };
 function resolveConfig(cfg) {
   return { ...DEFAULT_CONFIG, ...cfg ?? {} };
@@ -288,7 +289,7 @@ function OcSessionProvider({
   const pinInFlightRef = React4__namespace.useRef(false);
   const pinThisTab = React4__namespace.useCallback(
     async (didOc) => {
-      if (pinInFlightRef.current || readTabSession()) return;
+      if (!cfg.multiAccount || pinInFlightRef.current || readTabSession()) return;
       pinInFlightRef.current = true;
       try {
         const res = await fetch(`${cfg.authOrigin}/api/auth/tab`, {
@@ -307,7 +308,7 @@ function OcSessionProvider({
         pinInFlightRef.current = false;
       }
     },
-    [cfg.authOrigin]
+    [cfg.authOrigin, cfg.multiAccount]
   );
   const refresh = React4__namespace.useCallback(async () => {
     if (typeof window === "undefined") return;
@@ -354,7 +355,7 @@ function OcSessionProvider({
       setError(null);
       if (acct && !pin) void pinThisTab(acct.didOc);
       const currentOrigin = typeof window !== "undefined" ? window.location.origin : null;
-      if (acct && rosterEntries.length === 0 && currentOrigin !== null && !cfg.authOrigin.startsWith(currentOrigin)) {
+      if (cfg.multiAccount && acct && rosterEntries.length === 0 && currentOrigin !== null && !cfg.authOrigin.startsWith(currentOrigin)) {
         const peers = await fetchHostRoster(cfg);
         if (peers.length > 0) setRoster(peers);
       }
@@ -367,15 +368,21 @@ function OcSessionProvider({
     let cancelled = false;
     consumeTabAdoptMarker();
     void (async () => {
-      await consumeTabAccountHint(cfg.authOrigin);
+      if (cfg.multiAccount) await consumeTabAccountHint(cfg.authOrigin);
       if (!cancelled) void refresh();
     })();
     return () => {
       cancelled = true;
     };
-  }, [refresh, cfg.authOrigin]);
-  React4__namespace.useEffect(() => installTabFetchInterceptor(cfg.authOrigin), [cfg.authOrigin]);
-  React4__namespace.useEffect(() => installTabLinkDecorator(cfg.authOrigin), [cfg.authOrigin]);
+  }, [refresh, cfg.authOrigin, cfg.multiAccount]);
+  React4__namespace.useEffect(
+    () => cfg.multiAccount ? installTabFetchInterceptor(cfg.authOrigin) : void 0,
+    [cfg.authOrigin, cfg.multiAccount]
+  );
+  React4__namespace.useEffect(
+    () => cfg.multiAccount ? installTabLinkDecorator(cfg.authOrigin) : void 0,
+    [cfg.authOrigin, cfg.multiAccount]
+  );
   const signOut = React4__namespace.useCallback(
     async (opts) => {
       const scope = opts?.scope ?? "all";
@@ -1189,6 +1196,7 @@ var signinSize = (px) => `calc(${px}px * var(--oc-signin-scale, 1))`;
 var signinRadius = (px) => `var(--oc-signin-radius, ${px}px)`;
 var SIGNIN_BUTTON_RADIUS = "var(--oc-signin-button-radius, 6px)";
 var SIGNIN_STRONG = "var(--oc-signin-strong, 600)";
+var SIGNIN_ARROW = "var(--oc-signin-arrow, inline)";
 var DEFAULT_AUTH_ORIGIN = "https://ochk.io";
 async function fetchOcLinkedIdentities(opts) {
   const authOrigin = opts?.authOrigin ?? DEFAULT_AUTH_ORIGIN;
@@ -2142,16 +2150,21 @@ function OcSignIn({
   returnTo,
   onSuccess,
   resolveReturnTo,
-  linkPrompt = true,
+  linkPrompt: linkPromptProp = true,
   add: addProp,
   authOrigin = "https://ochk.io",
   initialPath,
   providersFirst = true,
   paths,
-  className
+  className,
+  mode,
+  providerHref
 }) {
   const walletEnabled = paths?.wallet ?? true;
   const emailEnabled = paths?.email ?? true;
+  const firstParty = mode === "first-party";
+  const credentials = firstParty ? "omit" : "include";
+  const linkPrompt = linkPromptProp && !firstParty;
   const [resolvedReturn, setResolvedReturn] = React4__namespace.useState(
     () => familyReturnTarget(returnTo) ?? safeReturnTo(returnTo)
   );
@@ -2166,15 +2179,19 @@ function OcSignIn({
     const fromQuery = familyReturnTarget(q.get("return_to")) ?? familyReturnTarget(q.get("next"));
     setResolvedReturn(fromQuery ?? "/");
   }, [returnTo]);
-  const [addMode, setAddMode] = React4__namespace.useState(Boolean(addProp));
+  const [addMode, setAddMode] = React4__namespace.useState(Boolean(addProp) && !firstParty);
   React4__namespace.useEffect(() => {
     if (typeof window === "undefined") return;
+    if (firstParty) {
+      setAddMode(false);
+      return;
+    }
     if (addProp !== void 0) {
       setAddMode(Boolean(addProp));
       return;
     }
     setAddMode(new URLSearchParams(window.location.search).get("add") === "1");
-  }, [addProp]);
+  }, [addProp, firstParty]);
   const [path, setPath] = React4__namespace.useState(
     initialPath ?? (providersFirst ? "email" : "wallet")
   );
@@ -2331,6 +2348,9 @@ function OcSignIn({
         authOrigin,
         returnTo: resolvedReturn,
         add: addMode,
+        credentials,
+        firstParty,
+        providerHref,
         first: true
       }
     ),
@@ -2352,7 +2372,7 @@ function OcSignIn({
             {
               active: path === "email",
               onClick: () => setPath("email"),
-              children: "email"
+              children: "Email"
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -2360,7 +2380,7 @@ function OcSignIn({
             {
               active: path === "wallet",
               onClick: () => setPath("wallet"),
-              children: "bitcoin wallet"
+              children: "Bitcoin wallet"
             }
           )
         ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -2369,7 +2389,7 @@ function OcSignIn({
             {
               active: path === "wallet",
               onClick: () => setPath("wallet"),
-              children: "bitcoin wallet"
+              children: "Bitcoin wallet"
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -2377,7 +2397,7 @@ function OcSignIn({
             {
               active: path === "email",
               onClick: () => setPath("email"),
-              children: "email"
+              children: "Email"
             }
           )
         ] })
@@ -2390,6 +2410,7 @@ function OcSignIn({
           authOrigin,
           audience,
           add: addMode,
+          credentials,
           onSuccess: (a, t) => void handleSuccess(a, t, "wallet")
         }
       ),
@@ -2398,11 +2419,22 @@ function OcSignIn({
         {
           authOrigin,
           add: addMode,
+          credentials,
           onSuccess: (a, t) => void handleSuccess(a, t, "email")
         }
       )
     ] }),
-    !providersFirst && /* @__PURE__ */ jsxRuntime.jsx(ProviderSignIn, { authOrigin, returnTo: resolvedReturn, add: addMode }),
+    !providersFirst && /* @__PURE__ */ jsxRuntime.jsx(
+      ProviderSignIn,
+      {
+        authOrigin,
+        returnTo: resolvedReturn,
+        add: addMode,
+        credentials,
+        firstParty,
+        providerHref
+      }
+    ),
     linkPrompt && /* @__PURE__ */ jsxRuntime.jsxs("label", { "data-oc-signin-linkalso": "", style: linkAlsoStyle, children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         "input",
@@ -2475,14 +2507,19 @@ function ProviderSignIn({
   authOrigin,
   returnTo,
   add,
+  credentials,
+  firstParty,
+  providerHref,
   first = false
 }) {
   const [providers, setProviders] = React4__namespace.useState(null);
   const [origin, setOrigin] = React4__namespace.useState("");
+  const hidden = firstParty && !providerHref;
   React4__namespace.useEffect(() => {
     setOrigin(window.location.origin);
+    if (hidden) return;
     let cancelled = false;
-    fetch(`${authOrigin}/api/auth/providers`, { credentials: "include" }).then((r) => r.ok ? r.json() : null).then((body) => {
+    fetch(`${authOrigin}/api/auth/providers`, { credentials }).then((r) => r.ok ? r.json() : null).then((body) => {
       if (!cancelled) setProviders(body?.providers ?? []);
     }).catch(() => {
       if (!cancelled) setProviders([]);
@@ -2490,7 +2527,8 @@ function ProviderSignIn({
     return () => {
       cancelled = true;
     };
-  }, [authOrigin]);
+  }, [authOrigin, credentials, hidden]);
+  if (hidden) return null;
   if (providers !== null && providers.length === 0) return null;
   const providerReturnTo = returnTo.startsWith("/") ? origin ? `${origin}${returnTo}` : returnTo : returnTo;
   const line = { flex: 1, height: 1, background: "var(--border, #27272a)" };
@@ -2548,7 +2586,7 @@ function ProviderSignIn({
   const buttons = providers.map((p, i) => /* @__PURE__ */ jsxRuntime.jsxs(
     "a",
     {
-      href: `${authOrigin}/api/auth/${p.id}/start?return_to=${encodeURIComponent(
+      href: providerHref ? providerHref(p.id) : `${authOrigin}/api/auth/${p.id}/start?return_to=${encodeURIComponent(
         providerReturnTo
       )}${add ? "&add=1" : ""}`,
       "data-oc-signin-provider": p.id,
@@ -2581,7 +2619,13 @@ async function loadAdapter() {
 async function detectBrowserWallets() {
   return (await loadAdapter()).detectWallets().filter((w) => w.detected && w.id !== "manual").map((w) => ({ id: w.id, name: w.name }));
 }
-function WalletFlow({ authOrigin, audience, add, onSuccess }) {
+function WalletFlow({
+  authOrigin,
+  audience,
+  add,
+  credentials,
+  onSuccess
+}) {
   const uid = React4__namespace.useId();
   const ids = {
     address: `${uid}-address`,
@@ -2623,7 +2667,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
   async function submitSignature(message, nonce, signature, scheme) {
     const res = await fetch(`${authOrigin}/api/auth/signin`, {
       method: "POST",
-      credentials: "include",
+      credentials,
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         message,
@@ -2715,7 +2759,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
         address.trim(),
         ", sign the text below, and paste the signature back here. Nothing is spent."
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.message, children: "message to sign" }),
+      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.message, children: "Message to sign" }),
       /* @__PURE__ */ jsxRuntime.jsx(
         "textarea",
         {
@@ -2727,10 +2771,10 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
           style: { ...inputStyle2, resize: "vertical" }
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", onClick: () => void copyMessage(), style: linkButtonStyle, children: copied === "copied" ? "copied" : "copy message" }),
+      /* @__PURE__ */ jsxRuntime.jsx("button", { type: "button", onClick: () => void copyMessage(), style: linkButtonStyle, children: copied === "copied" ? "Copied" : "Copy message" }),
       copied === "failed" && /* @__PURE__ */ jsxRuntime.jsx(Hint, { children: "Couldn't copy here. Select the text above and copy it." }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { marginTop: 14 }, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.signature, children: "signature" }),
+        /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.signature, children: "Signature" }),
         /* @__PURE__ */ jsxRuntime.jsx(
           "textarea",
           {
@@ -2756,7 +2800,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
           type: "submit",
           disabled: submitting || !pasted.trim(),
           style: submitStyle(submitting || !pasted.trim()),
-          children: submitting ? "checking\u2026" : "sign me in \u2192"
+          children: submitting ? "Checking\u2026" : /* @__PURE__ */ jsxRuntime.jsx(Submit, { children: "Sign me in" })
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
@@ -2770,7 +2814,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
             setCopied("idle");
           },
           style: linkButtonStyle,
-          children: "use a different address"
+          children: "Use a different address"
         }
       )
     ] });
@@ -2778,7 +2822,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
   const noBrowserWallet = wallets !== null && wallets.length === 0;
   return /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: signIn, "data-oc-signin-wallet": "", children: [
     /* @__PURE__ */ jsxRuntime.jsx(FlowHeader, { children: "Your wallet signs a short message to prove you hold the address. Nothing is spent and your key never leaves the wallet. Works with browser wallets, or any wallet that can sign a message, like Sparrow." }),
-    /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.address, children: "bitcoin address" }),
+    /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.address, children: "Bitcoin address" }),
     /* @__PURE__ */ jsxRuntime.jsx(
       "input",
       {
@@ -2799,7 +2843,7 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
       }
     ),
     wallets && wallets.length > 1 && /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { marginTop: 12 }, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.wallet, children: "sign with" }),
+      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: ids.wallet, children: "Sign with" }),
       /* @__PURE__ */ jsxRuntime.jsx(
         "select",
         {
@@ -2818,13 +2862,13 @@ function WalletFlow({ authOrigin, audience, add, onSuccess }) {
         type: "submit",
         disabled: submitting || !address.trim(),
         style: submitStyle(submitting || !address.trim()),
-        children: submitting ? "waiting for wallet\u2026" : noBrowserWallet ? "get the message to sign \u2192" : "sign in with wallet \u2192"
+        children: submitting ? "Waiting for wallet\u2026" : noBrowserWallet ? /* @__PURE__ */ jsxRuntime.jsx(Submit, { children: "Get the message to sign" }) : /* @__PURE__ */ jsxRuntime.jsx(Submit, { children: "Sign in with wallet" })
       }
     ),
     noBrowserWallet && /* @__PURE__ */ jsxRuntime.jsx(Hint, { children: "No browser wallet found here. You can sign with any wallet and paste." })
   ] });
 }
-function EmailFlow({ authOrigin, add, onSuccess }) {
+function EmailFlow({ authOrigin, add, credentials, onSuccess }) {
   const uid = React4__namespace.useId();
   const [stage, setStage] = React4__namespace.useState("enter");
   const [email, setEmail] = React4__namespace.useState("");
@@ -2838,7 +2882,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
     try {
       const res = await fetch(`${authOrigin}/api/auth/email-otp/start`, {
         method: "POST",
-        credentials: "include",
+        credentials,
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ email: address })
       });
@@ -2890,7 +2934,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
     try {
       const res = await fetch(`${authOrigin}/api/auth/email-otp/verify`, {
         method: "POST",
-        credentials: "include",
+        credentials,
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           email,
@@ -2916,7 +2960,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
   if (stage === "enter") {
     return /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: start, "data-oc-signin-email": "", children: [
       /* @__PURE__ */ jsxRuntime.jsx(FlowHeader, { children: "We email you a 6-digit code. No password, and no wallet needed to start. Link a Bitcoin address any time \u2014 that is the identity you hold yourself." }),
-      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: `${uid}-email`, children: "email" }),
+      /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: `${uid}-email`, children: "Email" }),
       /* @__PURE__ */ jsxRuntime.jsx(
         "input",
         {
@@ -2935,7 +2979,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
         }
       ),
       emailError && /* @__PURE__ */ jsxRuntime.jsx(ErrorLine2, { children: emailError }),
-      /* @__PURE__ */ jsxRuntime.jsx("button", { type: "submit", disabled: submitting, style: submitStyle(submitting), children: submitting ? "sending\u2026" : "send one-time code \u2192" })
+      /* @__PURE__ */ jsxRuntime.jsx("button", { type: "submit", disabled: submitting, style: submitStyle(submitting), children: submitting ? "Sending\u2026" : /* @__PURE__ */ jsxRuntime.jsx(Submit, { children: "Send one-time code" }) })
     ] });
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: verify, "data-oc-signin-email-verify": "", children: [
@@ -2944,7 +2988,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
       /* @__PURE__ */ jsxRuntime.jsx("span", { style: { color: "var(--foreground, #fafafa)" }, children: email }),
       ". It expires in 10 minutes."
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: `${uid}-code`, children: "one-time code" }),
+    /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: `${uid}-code`, children: "One-time code" }),
     /* @__PURE__ */ jsxRuntime.jsx(
       "input",
       {
@@ -2973,7 +3017,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
         type: "submit",
         disabled: submitting || code.length !== 6,
         style: submitStyle(submitting || code.length !== 6),
-        children: submitting ? "verifying\u2026" : "verify \xB7 sign me in \u2192"
+        children: submitting ? "Verifying\u2026" : /* @__PURE__ */ jsxRuntime.jsx(Submit, { children: "Verify \xB7 sign me in" })
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
@@ -2984,7 +3028,7 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
           onClick: () => void resend(),
           disabled: submitting,
           style: linkButtonStyle,
-          children: "send a new code"
+          children: "Send a new code"
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
@@ -2998,12 +3042,18 @@ function EmailFlow({ authOrigin, add, onSuccess }) {
             setResent(false);
           },
           style: linkButtonStyle,
-          children: "use a different email"
+          children: "Use a different email"
         }
       )
     ] })
   ] });
 }
+function Submit({ children }) {
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    children,
+    /* @__PURE__ */ jsxRuntime.jsx("span", { "aria-hidden": "true", style: { display: SIGNIN_ARROW }, children: " \u2192" })
+  ] });
+}
 function FlowHeader({
   label,
   children