@orangecheck/auth-client 2.36.1 → 2.37.1

package/dist/index.js

@@ -329,6 +329,12 @@ function buildAddAccountUrl(cfg, returnTo) {
   return u.toString();
 }
 var SessionContext = React4__namespace.createContext(null);
+function onHistory(change) {
+  window.addEventListener("popstate", change);
+  return () => window.removeEventListener("popstate", change);
+}
+var pageAddress = () => window.location.href.split("#")[0];
+var noPageYet = () => void 0;
 function normalizeDisplayIdentity(raw, didOc) {
   const di = raw.display_identity ?? raw.displayIdentity;
   if (di && typeof di === "object" && typeof di.value === "string" && di.value.length > 0 && typeof di.kind === "string" && DISPLAY_IDENTITY_KINDS.includes(di.kind)) {
@@ -616,8 +622,9 @@ function OcSessionProvider({
     },
     [cfg.authOrigin, refresh]
   );
+  const here = React4__namespace.useSyncExternalStore(onHistory, pageAddress, noPageYet);
   const value = React4__namespace.useMemo(() => {
-    const returnTo = defaultReturnTo ?? (typeof window !== "undefined" ? window.location.href : void 0);
+    const returnTo = defaultReturnTo ?? here;
     return {
       status,
       account,
@@ -643,7 +650,8 @@ function OcSessionProvider({
     addAccountUrl,
     setDisplayIdentity,
     cfg,
-    defaultReturnTo
+    defaultReturnTo,
+    here
   ]);
   return /* @__PURE__ */ jsxRuntime.jsx(SessionContext.Provider, { value, children });
 }
@@ -2298,6 +2306,16 @@ function looksLikeBitcoinAddress(input) {
   if (BECH32_ADDRESS.test(s)) return s === s.toLowerCase() || s === s.toUpperCase();
   return BASE58_ADDRESS.test(s);
 }
+var OAUTH_EMAIL_CODE_REASONS = /* @__PURE__ */ new Set(["email_code_required", "account_mismatch"]);
+function oauthErrorText(reason) {
+  if (reason === "email_code_required") {
+    return "This email already has an orangecheck account. Sign in to it with an email code below.";
+  }
+  if (reason === "account_mismatch") {
+    return "A different Google or GitHub account is already linked to this email. Use that one, or sign in with an email code below.";
+  }
+  return "That sign-in didn't finish. Try again, or use another way below.";
+}
 function OcSignIn({
   audience,
   returnTo,
@@ -2363,13 +2381,14 @@ function OcSignIn({
   };
   const [signedIn, setSignedIn] = React4__namespace.useState(null);
   const [linkAlso, setLinkAlso] = React4__namespace.useState(false);
-  const [oauthError, setOauthError] = React4__namespace.useState(false);
+  const [oauthError, setOauthError] = React4__namespace.useState(null);
   React4__namespace.useEffect(() => {
     if (typeof window === "undefined") return;
-    if (new URLSearchParams(window.location.search).has("oauth_error")) {
-      setOauthError(true);
-    }
-  }, []);
+    const reason = new URLSearchParams(window.location.search).get("oauth_error");
+    if (reason === null) return;
+    setOauthError(reason);
+    if (OAUTH_EMAIL_CODE_REASONS.has(reason) && emailEnabled) setPath("email");
+  }, [emailEnabled]);
   const navigate = React4__namespace.useCallback(
     async (account) => {
       if (resolveReturnTo) {
@@ -2470,7 +2489,7 @@ function OcSignIn({
           fontFamily: SIGNIN_FONT,
           fontSize: signinRoleSize("text", signinSize(11))
         },
-        children: "That sign-in didn't finish. Try again, or use another way below."
+        children: oauthErrorText(oauthError)
       }
     ),
     addMode && /* @__PURE__ */ jsxRuntime.jsxs(