@orangecheck/auth-client 2.33.0 → 2.33.2

package/dist/index.mjs

@@ -4,6 +4,90 @@ import { startRegistration, startAuthentication } from '@simplewebauthn/browser'
 
 // src/provider.tsx
 
+// src/return-to.ts
+var PREFIX = "oc:return-fragment:";
+var FRAGMENT_TTL_MS = 15 * 60 * 1e3;
+function store() {
+  try {
+    return window.sessionStorage;
+  } catch {
+    return null;
+  }
+}
+function stripFragment(target) {
+  const cut = target.indexOf("#");
+  return cut < 0 ? target : target.slice(0, cut);
+}
+function keep(pathAndQuery, hash) {
+  if (hash.length < 2) return;
+  try {
+    store()?.setItem(PREFIX + pathAndQuery, JSON.stringify({ hash, at: Date.now() }));
+  } catch {
+  }
+}
+function withoutFragment(target) {
+  if (typeof window !== "undefined" && target.includes("#")) {
+    try {
+      const u = new URL(target, window.location.href);
+      if (u.origin === window.location.origin) keep(u.pathname + u.search, u.hash);
+    } catch {
+    }
+  }
+  return stripFragment(target);
+}
+function returnToHere() {
+  if (typeof window === "undefined") return "/";
+  const { pathname, search, hash } = window.location;
+  return withoutFragment(pathname + search + hash);
+}
+function keepFragmentOnReturnLinks() {
+  if (typeof document === "undefined") return () => {
+  };
+  const onClick = (e) => {
+    const { pathname, search, hash, href } = window.location;
+    if (hash.length < 2 || e.defaultPrevented) return;
+    const link = e.target?.closest?.("a[href]");
+    if (!link) return;
+    try {
+      const to = new URL(link.getAttribute("href") ?? "", href);
+      const back = to.searchParams.get("return_to");
+      if (!back) return;
+      const here = new URL(back, href);
+      if (here.origin === window.location.origin && here.pathname === pathname && here.search === search) {
+        keep(pathname + search, hash);
+      }
+    } catch {
+    }
+  };
+  document.addEventListener("click", onClick, true);
+  return () => document.removeEventListener("click", onClick, true);
+}
+function restoreReturnFragment() {
+  if (typeof window === "undefined") return false;
+  const s = store();
+  if (!s) return false;
+  const { pathname, search, hash } = window.location;
+  const key = PREFIX + pathname + search;
+  let raw;
+  try {
+    raw = s.getItem(key);
+    if (raw === null) return false;
+    s.removeItem(key);
+  } catch {
+    return false;
+  }
+  if (hash) return false;
+  try {
+    const kept = JSON.parse(raw);
+    if (typeof kept.hash !== "string" || !kept.hash.startsWith("#")) return false;
+    if (typeof kept.at !== "number" || Date.now() - kept.at > FRAGMENT_TTL_MS) return false;
+    window.history.replaceState(window.history.state, "", pathname + search + kept.hash);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // src/types.ts
 var DISPLAY_IDENTITY_KINDS = ["did", "btc", "email", "nostr"];
 var DEFAULT_CONFIG = {
@@ -20,7 +104,7 @@ function buildSignInUrl(cfg, returnTo) {
   const base = `${cfg.authOrigin}${cfg.signInPath}`;
   if (!returnTo) return base;
   const u = new URL(base);
-  u.searchParams.set("return_to", returnTo);
+  u.searchParams.set("return_to", stripFragment(returnTo));
   return u.toString();
 }
 function buildAddAccountUrl(cfg, returnTo) {
@@ -259,6 +343,13 @@ function OcSessionProvider({
   defaultReturnTo
 }) {
   const cfg = React4.useMemo(() => resolveConfig(config), [config]);
+  React4.useState(() => {
+    if (typeof window !== "undefined") {
+      consumeTabAdoptMarker();
+      restoreReturnFragment();
+    }
+    return null;
+  });
   const [account, setAccount] = React4.useState(null);
   const [roster, setRoster] = React4.useState([]);
   const [status, setStatus] = React4.useState("loading");
@@ -353,6 +444,7 @@ function OcSessionProvider({
       cancelled = true;
     };
   }, [refresh, cfg.authOrigin, cfg.multiAccount]);
+  React4.useEffect(() => keepFragmentOnReturnLinks(), []);
   React4.useEffect(
     () => cfg.multiAccount ? installTabFetchInterceptor(cfg.authOrigin) : void 0,
     [cfg.authOrigin, cfg.multiAccount]
@@ -849,6 +941,10 @@ function OcAccountPill({
     }
   );
 }
+function accountAddress(account) {
+  if (account?.primaryBtc) return account.primaryBtc;
+  return account?.displayIdentity?.kind === "btc" ? account.displayIdentity.value : null;
+}
 function useOcAddressSuggestion(options) {
   const {
     value,
@@ -858,7 +954,7 @@ function useOcAddressSuggestion(options) {
     suggestionClassName
   } = options;
   const { status, account } = useOcSession();
-  const sessionAddress = status === "authenticated" ? account?.primaryBtc ?? null : null;
+  const sessionAddress = status === "authenticated" ? accountAddress(account) : null;
   const [open, setOpen] = React4.useState(false);
   const [highlighted, setHighlighted] = React4.useState(false);
   const blurTimer = React4.useRef(null);
@@ -990,7 +1086,7 @@ var OcAddressInput = React4.forwardRef(
     ...rest
   }, forwardedRef) {
     const { status, account } = useOcSession();
-    const sessionAddress = status === "authenticated" ? account?.primaryBtc ?? null : null;
+    const sessionAddress = status === "authenticated" ? accountAddress(account) : null;
     const [open, setOpen] = React4.useState(false);
     const [highlighted, setHighlighted] = React4.useState(false);
     const innerRef = React4.useRef(null);
@@ -1149,7 +1245,7 @@ function redirectToSudo(args = {}) {
   }
   const cfg = resolveConfig(args.config);
   const url = new URL("/sudo", cfg.authOrigin);
-  const returnTo = args.returnTo ?? window.location.href;
+  const returnTo = withoutFragment(args.returnTo ?? window.location.href);
   if (returnTo) url.searchParams.set("return_to", returnTo);
   if (args.purpose) url.searchParams.set("purpose", args.purpose);
   window.location.assign(url.toString());
@@ -2513,7 +2609,9 @@ function ProviderSignIn({
   }, [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 providerReturnTo = stripFragment(
+    returnTo.startsWith("/") ? origin ? `${origin}${returnTo}` : returnTo : returnTo
+  );
   const line = { flex: 1, height: 1, background: "var(--border, #27272a)" };
   const BLOCK_GAP = 16;
   const BUTTON_GAP = 8;
@@ -3878,6 +3976,6 @@ function useStepUpAuth(opts) {
   return { status, error, stepUp, reset };
 }
 
-export { DEFAULT_CONFIG, DISPLAY_IDENTITY_KINDS, OcAccountChip, OcAccountPill, OcAddressInput, OcBond, OcLinkedIdentities, OcSessionProvider, OcSignIn, OcSignInButton, SUDO_ACCOUNT_MISMATCH_MESSAGE, TAB_ACCOUNT_HINT_KEY, TAB_ADOPT_HASH, TAB_SESSION_HEADER, TAB_SESSION_STORAGE_KEY, bondFloorsText, buildAddAccountUrl, buildSignInUrl, clearTabSession, consumeTabAccountHint, consumeTabAdoptMarker, familyReturnTarget, fetchOcBond, fetchOcLinkedIdentities, handleSudoRequired, installTabFetchInterceptor, installTabLinkDecorator, isSudoAccountMismatch, readTabSession, redirectToSudo, safeReturnTo, tabSessionHeader, useOcAddressSuggestion, useOcSession, useOptionalOcSession, useStepUpAuth, useWebAuthnList, useWebAuthnRegister, writeTabSession };
+export { DEFAULT_CONFIG, DISPLAY_IDENTITY_KINDS, FRAGMENT_TTL_MS, OcAccountChip, OcAccountPill, OcAddressInput, OcBond, OcLinkedIdentities, OcSessionProvider, OcSignIn, OcSignInButton, SUDO_ACCOUNT_MISMATCH_MESSAGE, TAB_ACCOUNT_HINT_KEY, TAB_ADOPT_HASH, TAB_SESSION_HEADER, TAB_SESSION_STORAGE_KEY, bondFloorsText, buildAddAccountUrl, buildSignInUrl, clearTabSession, consumeTabAccountHint, consumeTabAdoptMarker, familyReturnTarget, fetchOcBond, fetchOcLinkedIdentities, handleSudoRequired, installTabFetchInterceptor, installTabLinkDecorator, isSudoAccountMismatch, keepFragmentOnReturnLinks, readTabSession, redirectToSudo, restoreReturnFragment, returnToHere, safeReturnTo, stripFragment, tabSessionHeader, useOcAddressSuggestion, useOcSession, useOptionalOcSession, useStepUpAuth, useWebAuthnList, useWebAuthnRegister, withoutFragment, writeTabSession };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map