@orangecheck/auth-client 2.33.1 → 2.33.3

package/dist/index.mjs

@@ -4,31 +4,6 @@ import { startRegistration, startAuthentication } from '@simplewebauthn/browser'
 
 // src/provider.tsx
 
-// src/types.ts
-var DISPLAY_IDENTITY_KINDS = ["did", "btc", "email", "nostr"];
-var DEFAULT_CONFIG = {
-  authOrigin: "https://ochk.io",
-  signInPath: "/signin",
-  mePath: "/api/auth/me",
-  logoutPath: "/api/auth/logout",
-  multiAccount: true
-};
-function resolveConfig(cfg) {
-  return { ...DEFAULT_CONFIG, ...cfg ?? {} };
-}
-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);
-  return u.toString();
-}
-function buildAddAccountUrl(cfg, returnTo) {
-  const u = new URL(buildSignInUrl(cfg, returnTo));
-  u.searchParams.set("add", "1");
-  return u.toString();
-}
-
 // src/tab-session.ts
 var TAB_SESSION_HEADER = "x-oc-tab-session";
 var TAB_SESSION_STORAGE_KEY = "oc_tab_session";
@@ -200,6 +175,136 @@ async function consumeTabAccountHint(authOrigin) {
   }
   return null;
 }
+
+// src/return-to.ts
+var PREFIX = "oc:return-fragment:";
+var HOLD_MS = 1e4;
+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;
+    const restored = pathname + search + kept.hash;
+    window.history.replaceState(window.history.state, "", restored);
+    holdFragment(pathname + search, kept.hash, restored);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function holdFragment(pathAndQuery, hash, restored) {
+  const until = Date.now() + HOLD_MS;
+  const check = () => {
+    const l = window.location;
+    if (l.pathname + l.search !== pathAndQuery || l.hash === hash) {
+      if (l.pathname + l.search === pathAndQuery && Date.now() < until) {
+        window.setTimeout(check, 50);
+      }
+      return;
+    }
+    if (l.hash && l.hash !== TAB_ADOPT_HASH) return;
+    try {
+      window.history.replaceState(window.history.state, "", restored);
+    } catch {
+    }
+  };
+  window.setTimeout(check, 0);
+}
+
+// src/types.ts
+var DISPLAY_IDENTITY_KINDS = ["did", "btc", "email", "nostr"];
+var DEFAULT_CONFIG = {
+  authOrigin: "https://ochk.io",
+  signInPath: "/signin",
+  mePath: "/api/auth/me",
+  logoutPath: "/api/auth/logout",
+  multiAccount: true
+};
+function resolveConfig(cfg) {
+  return { ...DEFAULT_CONFIG, ...cfg ?? {} };
+}
+function buildSignInUrl(cfg, returnTo) {
+  const base = `${cfg.authOrigin}${cfg.signInPath}`;
+  if (!returnTo) return base;
+  const u = new URL(base);
+  u.searchParams.set("return_to", stripFragment(returnTo));
+  return u.toString();
+}
+function buildAddAccountUrl(cfg, returnTo) {
+  const u = new URL(buildSignInUrl(cfg, returnTo));
+  u.searchParams.set("add", "1");
+  return u.toString();
+}
 var SessionContext = React4.createContext(null);
 function normalizeDisplayIdentity(raw, didOc) {
   const di = raw.display_identity ?? raw.displayIdentity;
@@ -259,6 +364,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 +465,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]
@@ -1153,7 +1266,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());
@@ -2517,7 +2630,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;
@@ -3882,6 +3997,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