@volr/react-ui 0.1.124 → 0.1.126

package/dist/index.cjs

@@ -2162,7 +2162,12 @@ function PasskeyEnrollView({
   }
   if (migrationInfo.needsMigration && migrationInfo.sourcePasskey) {
     const handleMigration = async () => {
-      await handleEnroll();
+      const targetOrigin = typeof window !== "undefined" ? window.location.origin : "";
+      const sourceRpId = migrationInfo.sourcePasskey.rpId;
+      const sourceOrigin = sourceRpId === "localhost" ? "http://localhost" : `https://${sourceRpId}`;
+      const url = new URL(sourceOrigin);
+      url.searchParams.set("volr_migrate_to", targetOrigin);
+      window.open(url.toString(), "_blank", "noopener,noreferrer");
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       PasskeyMigrationView,
@@ -5130,6 +5135,8 @@ function AccountModal({ isOpen, onClose, onError }) {
   const [currentView, setCurrentView] = React13.useState("main");
   const [selectedPayment, setSelectedPayment] = React13.useState(null);
   const [isLoggingOut, setIsLoggingOut] = React13.useState(false);
+  const prevUserRef = React13.useRef(user ?? null);
+  const [closingAfterLogin, setClosingAfterLogin] = React13.useState(false);
   const [depositAssets, setDepositAssets] = React13.useState([]);
   const [depositLoading, setDepositLoading] = React13.useState(false);
   const [depositError, setDepositError] = React13.useState(null);
@@ -5160,6 +5167,29 @@ function AccountModal({ isOpen, onClose, onError }) {
       }, 200);
     }
   }, [onClose]);
+  React13.useEffect(() => {
+    if (!isOpen) {
+      setClosingAfterLogin(false);
+      prevUserRef.current = user ?? null;
+      return;
+    }
+    const wasLoggedOut = prevUserRef.current == null;
+    const isNowLoggedIn = user != null;
+    if (wasLoggedOut && isNowLoggedIn) {
+      setClosingAfterLogin(true);
+      setTimeout(() => {
+        onClose();
+      }, 0);
+    }
+    prevUserRef.current = user ?? null;
+  }, [isOpen, user, onClose]);
+  if (closingAfterLogin && isOpen) {
+    return /* @__PURE__ */ jsxRuntime.jsxs(Modal, { open: isOpen, onOpenChange: handleOpenChange, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ModalHeader, { onClose: () => {
+      } }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "volr:text-center volr:py-8", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "volr:text-sm volr-text-secondary", children: "Completing login..." }) })
+    ] });
+  }
   if (!user) {
     return /* @__PURE__ */ jsxRuntime.jsx(SigninModal, { isOpen, onClose, onError });
   }
@@ -6637,6 +6667,17 @@ function SignRequestModal({ open, onOpenChange }) {
   );
 }
 var VolrUIContext = React13__default.default.createContext(null);
+function getCurrentRpId() {
+  if (typeof window === "undefined") return "localhost";
+  return window.location.hostname;
+}
+function isPasskeyDomainMismatch(user) {
+  const currentRpId = getCurrentRpId();
+  const registered = user?.registeredPasskeys;
+  if (user?.keyStorageType !== "passkey") return false;
+  if (!Array.isArray(registered) || registered.length === 0) return false;
+  return !registered.some((p) => p?.rpId === currentRpId);
+}
 var useVolrUI = () => {
   const context = React13.useContext(VolrUIContext);
   if (!context) {
@@ -6767,6 +6808,13 @@ function VolrUIProviderInner({
         keyStorageType
       },
       children: /* @__PURE__ */ jsxRuntime.jsxs(VolrModalProvider, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          MigrationCoordinator,
+          {
+            onShowOnboarding: () => setShowOnboarding(true),
+            onHideOnboarding: () => setShowOnboarding(false)
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsx(
           OAuthCallbackHandler,
           {
@@ -6809,6 +6857,130 @@ function VolrUIProviderInner({
     }
   ) }) });
 }
+function normalizeOrigin(input) {
+  try {
+    const u = new URL(input);
+    return `${u.protocol}//${u.host}`;
+  } catch {
+    return input;
+  }
+}
+function MigrationCoordinator({
+  onShowOnboarding,
+  onHideOnboarding
+}) {
+  const { user, setUser } = react.useVolrContext();
+  const { client } = react.useInternalAuth();
+  const [running, setRunning] = React13.useState(false);
+  React13.useEffect(() => {
+    if (typeof window === "undefined") return;
+    const handler = (event) => {
+      const data = event.data;
+      if (data?.type === "VOLR_MIGRATION_DONE") {
+        client.refreshSession().then((u) => u && setUser(u)).catch(() => void 0);
+        onHideOnboarding();
+      }
+    };
+    window.addEventListener("message", handler);
+    return () => window.removeEventListener("message", handler);
+  }, [client, setUser, onHideOnboarding]);
+  React13.useEffect(() => {
+    if (typeof window === "undefined") return;
+    if (running) return;
+    const params = new URLSearchParams(window.location.search);
+    const migrationToken = params.get("migration_token");
+    const sourceOriginParam = params.get("source_origin");
+    const isTargetPopup = Boolean(migrationToken && sourceOriginParam);
+    const migrateTo = params.get("volr_migrate_to");
+    const isSourceFlow = Boolean(migrateTo);
+    if (!isTargetPopup && !isSourceFlow) {
+      return;
+    }
+    const run = async () => {
+      setRunning(true);
+      try {
+        if (isTargetPopup) {
+          const sourceOrigin2 = normalizeOrigin(sourceOriginParam);
+          const token2 = migrationToken;
+          const refreshedUser2 = await client.refreshSession();
+          const effectiveUser2 = refreshedUser2 ?? user;
+          if (refreshedUser2) setUser(refreshedUser2);
+          if (!effectiveUser2?.id || !effectiveUser2?.projectId) {
+            throw new Error(
+              "Migration requires an active session on the target site. Please log in first."
+            );
+          }
+          const { requestSeedFromOpener } = await import('@volr/react');
+          const seed = await requestSeedFromOpener(sourceOrigin2, token2);
+          await react.completeMigration({
+            client,
+            userId: seed.userId,
+            projectId: seed.projectId,
+            migrationToken: token2,
+            masterSeed: seed.masterSeed,
+            rpName: effectiveUser2.projectName ?? "Volr",
+            userEmail: effectiveUser2.email ?? null
+          });
+          try {
+            window.opener?.postMessage({ type: "VOLR_MIGRATION_DONE" }, "*");
+          } catch {
+          }
+          window.close();
+          return;
+        }
+        const targetOrigin = normalizeOrigin(migrateTo);
+        const sourceOrigin = window.location.origin;
+        const refreshedUser = await client.refreshSession();
+        const effectiveUser = refreshedUser ?? user;
+        if (refreshedUser) setUser(refreshedUser);
+        if (!effectiveUser?.id || !effectiveUser?.projectId) {
+          throw new Error(
+            "Migration requires an active session on the source site. Please log in first."
+          );
+        }
+        const currentRpId = getCurrentRpId();
+        const sourcePasskey = effectiveUser.registeredPasskeys?.find((p) => p?.rpId === currentRpId) ?? null;
+        if (!sourcePasskey?.credentialId || !sourcePasskey?.blobUrl || !sourcePasskey?.prfInput) {
+          throw new Error(
+            `No passkey registered for source rpId=${currentRpId}. Cannot migrate from this site.`
+          );
+        }
+        const token = await react.requestMigration({ client, targetOrigin });
+        const entropy = await react.decryptEntropyForMigration({
+          client,
+          userId: effectiveUser.id,
+          blobUrl: sourcePasskey.blobUrl,
+          prfInput: sourcePasskey.prfInput,
+          credentialId: sourcePasskey.credentialId,
+          rpName: effectiveUser.projectName ?? "Volr"
+        });
+        const cleanup = react.listenForSeedRequests(
+          [targetOrigin],
+          async () => entropy,
+          () => ({ userId: effectiveUser.id, projectId: effectiveUser.projectId })
+        );
+        const url = new URL(targetOrigin);
+        url.searchParams.set("migration_token", token.migrationToken);
+        url.searchParams.set("source_origin", sourceOrigin);
+        window.open(
+          url.toString(),
+          "volr_migration",
+          "width=500,height=650,left=100,top=100,popup=1"
+        );
+        onShowOnboarding();
+        setTimeout(() => cleanup(), 2 * 60 * 1e3);
+        return;
+      } finally {
+        setRunning(false);
+      }
+    };
+    run().catch((e) => {
+      console.error("[MigrationCoordinator] failed:", e);
+      setRunning(false);
+    });
+  }, [client, user, setUser, running, onShowOnboarding, onHideOnboarding]);
+  return null;
+}
 function AccountModalPortal() {
   const { isOpen, mode, close } = useVolrModal();
   const [portalRoot, setPortalRoot] = React13.useState(null);
@@ -7038,6 +7210,7 @@ function OnboardingChecker({
   const { user, provider, isLoading } = react.useVolrContext();
   const { isOpen: isModalOpen } = useVolrModal();
   const modalWasOpened = React13__default.default.useRef(false);
+  const pendingMismatchOnboarding = React13__default.default.useRef(false);
   React13.useEffect(() => {
     if (isModalOpen) {
       modalWasOpened.current = true;
@@ -7047,15 +7220,21 @@ function OnboardingChecker({
     if (isLoading) {
       return;
     }
+    const passkeyDomainMismatch = isPasskeyDomainMismatch(user);
     if (isModalOpen) {
+      if (passkeyDomainMismatch) {
+        pendingMismatchOnboarding.current = true;
+      }
       onHideOnboarding();
       return;
     }
     if (modalWasOpened.current) {
-      onHideOnboarding();
-      return;
+      if (!passkeyDomainMismatch && !pendingMismatchOnboarding.current) {
+        onHideOnboarding();
+        return;
+      }
     }
-    if (user?.keyStorageType) {
+    if (user?.keyStorageType && !passkeyDomainMismatch && !pendingMismatchOnboarding.current) {
       onHideOnboarding();
       return;
     }
@@ -7063,6 +7242,15 @@ function OnboardingChecker({
       onHideOnboarding();
       return;
     }
+    if (pendingMismatchOnboarding.current) {
+      pendingMismatchOnboarding.current = false;
+      onShowOnboarding();
+      return;
+    }
+    if (passkeyDomainMismatch) {
+      onShowOnboarding();
+      return;
+    }
     if (user && enforceSelection) {
       if (!keyStorageType) {
         console.error(