@forge-connect/react 1.0.12 → 1.0.13

package/dist/index.d.cts

@@ -119,7 +119,7 @@ interface AuthState {
     user: User | null;
     accessToken: string | null;
 }
-type ModalStep = 'method-select' | 'email-login' | 'email-register' | 'email-otp' | 'wallet-connect' | 'oauth' | 'forgot-password' | 'verify-2fa' | 'success' | 'error';
+type ModalStep = 'method-select' | 'email-login' | 'email-register' | 'email-otp' | 'wallet-connect' | 'oauth' | 'forgot-password' | 'verify-2fa' | 'matrica-migration' | 'success' | 'error';
 interface ModalState {
     isOpen: boolean;
     step: ModalStep;
@@ -278,6 +278,28 @@ declare function createApiClient(apiUrl: string): {
         challengeToken?: string;
         userId?: string;
     }>;
+    getMatricaMigration(token: string): Promise<{
+        matricaUsername: string | null;
+        matricaDisplayName: string | null;
+        conflicts: {
+            wallets: {
+                address: string;
+            }[];
+            socials: {
+                provider: "twitter" | "discord" | "telegram";
+                externalName: string;
+            }[];
+            email: {
+                email: string;
+            } | null;
+        };
+    }>;
+    resolveMatricaMigration(token: string, migrate: boolean): Promise<{
+        code?: string;
+        accessToken?: string;
+        requires2FA?: boolean;
+        challengeToken?: string;
+    }>;
     createLinkIntent(token: string): Promise<{
         intentToken: string;
     }>;
@@ -506,6 +528,24 @@ interface ForgeConnectContextValue {
     challengeToken: string | null;
     verify2FA: (code: string) => Promise<void>;
     verifyRecoveryCode: (code: string) => Promise<void>;
+    matricaMigration: {
+        token: string;
+        matricaUsername: string | null;
+        matricaDisplayName: string | null;
+        conflicts: {
+            wallets: {
+                address: string;
+            }[];
+            socials: {
+                provider: 'twitter' | 'discord' | 'telegram';
+                externalName: string;
+            }[];
+            email: {
+                email: string;
+            } | null;
+        };
+    } | null;
+    resolveMatricaMigration: (migrate: boolean) => Promise<void>;
     openModal: () => void;
     closeModal: () => void;
     setModalStep: (step: ModalState['step']) => void;

package/dist/index.d.ts

@@ -119,7 +119,7 @@ interface AuthState {
     user: User | null;
     accessToken: string | null;
 }
-type ModalStep = 'method-select' | 'email-login' | 'email-register' | 'email-otp' | 'wallet-connect' | 'oauth' | 'forgot-password' | 'verify-2fa' | 'success' | 'error';
+type ModalStep = 'method-select' | 'email-login' | 'email-register' | 'email-otp' | 'wallet-connect' | 'oauth' | 'forgot-password' | 'verify-2fa' | 'matrica-migration' | 'success' | 'error';
 interface ModalState {
     isOpen: boolean;
     step: ModalStep;
@@ -278,6 +278,28 @@ declare function createApiClient(apiUrl: string): {
         challengeToken?: string;
         userId?: string;
     }>;
+    getMatricaMigration(token: string): Promise<{
+        matricaUsername: string | null;
+        matricaDisplayName: string | null;
+        conflicts: {
+            wallets: {
+                address: string;
+            }[];
+            socials: {
+                provider: "twitter" | "discord" | "telegram";
+                externalName: string;
+            }[];
+            email: {
+                email: string;
+            } | null;
+        };
+    }>;
+    resolveMatricaMigration(token: string, migrate: boolean): Promise<{
+        code?: string;
+        accessToken?: string;
+        requires2FA?: boolean;
+        challengeToken?: string;
+    }>;
     createLinkIntent(token: string): Promise<{
         intentToken: string;
     }>;
@@ -506,6 +528,24 @@ interface ForgeConnectContextValue {
     challengeToken: string | null;
     verify2FA: (code: string) => Promise<void>;
     verifyRecoveryCode: (code: string) => Promise<void>;
+    matricaMigration: {
+        token: string;
+        matricaUsername: string | null;
+        matricaDisplayName: string | null;
+        conflicts: {
+            wallets: {
+                address: string;
+            }[];
+            socials: {
+                provider: 'twitter' | 'discord' | 'telegram';
+                externalName: string;
+            }[];
+            email: {
+                email: string;
+            } | null;
+        };
+    } | null;
+    resolveMatricaMigration: (migrate: boolean) => Promise<void>;
     openModal: () => void;
     closeModal: () => void;
     setModalStep: (step: ModalState['step']) => void;

package/dist/index.js

@@ -154,6 +154,15 @@ function buildApiClient(base) {
         body: { code }
       });
     },
+    getMatricaMigration(token) {
+      return request(`/auth/oauth/matrica/migration/${encodeURIComponent(token)}`);
+    },
+    resolveMatricaMigration(token, migrate) {
+      return request(`/auth/oauth/matrica/migration/${encodeURIComponent(token)}/resolve`, {
+        method: "POST",
+        body: { migrate }
+      });
+    },
     createLinkIntent(token) {
       return request("/auth/oauth/link-intent", {
         method: "POST",
@@ -1434,6 +1443,8 @@ function LoginModal() {
         return /* @__PURE__ */ jsx9(ForgotPasswordForm, {});
       case "verify-2fa":
         return /* @__PURE__ */ jsx9(Verify2FAForm, {});
+      case "matrica-migration":
+        return /* @__PURE__ */ jsx9(MatricaMigrationView, {});
       case "oauth":
         return /* @__PURE__ */ jsx9(OAuthLoadingView, {});
       case "success":
@@ -1460,7 +1471,7 @@ function LoginModal() {
         "--fc-accent": config.appearance?.accentColor ?? "#8b5cf6"
       },
       "data-theme": config.appearance?.theme ?? "light",
-      children: modal.step === "success" || modal.step === "oauth" ? renderStep() : /* @__PURE__ */ jsxs8(Fragment2, { children: [
+      children: modal.step === "success" || modal.step === "oauth" || modal.step === "matrica-migration" ? renderStep() : /* @__PURE__ */ jsxs8(Fragment2, { children: [
         renderLogo(),
         /* @__PURE__ */ jsx9("h2", { className: "fc-modal-title", children: config.appearance?.title ?? "Log in or sign up" }),
         renderStep(),
@@ -1604,6 +1615,91 @@ function NomuPill() {
     }
   ) });
 }
+var MigrationIcons = {
+  wallet: /* @__PURE__ */ jsxs8("svg", { width: "16", height: "16", viewBox: "0 0 20 20", fill: "none", children: [
+    /* @__PURE__ */ jsx9("rect", { x: "2", y: "5", width: "16", height: "11", rx: "2", stroke: "currentColor", strokeWidth: "1.6" }),
+    /* @__PURE__ */ jsx9("rect", { x: "13", y: "9", width: "5", height: "3", rx: "1", stroke: "currentColor", strokeWidth: "1.6" })
+  ] }),
+  email: /* @__PURE__ */ jsxs8("svg", { width: "16", height: "16", viewBox: "0 0 20 20", fill: "none", children: [
+    /* @__PURE__ */ jsx9("rect", { x: "2", y: "4", width: "16", height: "12", rx: "2", stroke: "currentColor", strokeWidth: "1.6" }),
+    /* @__PURE__ */ jsx9("path", { d: "M2 6l8 5 8-5", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round" })
+  ] }),
+  twitter: /* @__PURE__ */ jsx9("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "currentColor", children: /* @__PURE__ */ jsx9("path", { d: "M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z" }) }),
+  discord: /* @__PURE__ */ jsx9("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "currentColor", children: /* @__PURE__ */ jsx9("path", { d: "M20.317 4.37a19.79 19.79 0 0 0-4.885-1.515.07.07 0 0 0-.073.035c-.21.375-.444.864-.608 1.249a18.27 18.27 0 0 0-5.487 0a12.6 12.6 0 0 0-.617-1.25.07.07 0 0 0-.073-.034A19.74 19.74 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.08.08 0 0 0 .031.057a19.9 19.9 0 0 0 5.993 3.03.08.08 0 0 0 .084-.028a14.1 14.1 0 0 0 1.226-1.994.076.076 0 0 0-.041-.106a13.1 13.1 0 0 1-1.872-.892.077.077 0 0 1-.008-.128a10 10 0 0 0 .372-.292.07.07 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.07.07 0 0 1 .078.01q.181.149.373.292a.077.077 0 0 1-.006.127a12.3 12.3 0 0 1-1.873.893.077.077 0 0 0-.041.107a16 16 0 0 0 1.226 1.993.08.08 0 0 0 .084.028a19.84 19.84 0 0 0 6.002-3.03.08.08 0 0 0 .031-.056c.5-5.177-.838-9.673-3.549-13.66a.06.06 0 0 0-.031-.028M8.02 15.331c-1.182 0-2.157-1.086-2.157-2.419c0-1.332.956-2.418 2.157-2.418c1.21 0 2.176 1.096 2.157 2.418c0 1.333-.956 2.42-2.157 2.42m7.974 0c-1.183 0-2.157-1.086-2.157-2.419c0-1.332.955-2.418 2.157-2.418c1.21 0 2.176 1.096 2.157 2.418c0 1.333-.946 2.42-2.157 2.42" }) }),
+  telegram: /* @__PURE__ */ jsx9("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "currentColor", children: /* @__PURE__ */ jsx9("path", { d: "M11.944 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12a12 12 0 0 0 12-12A12 12 0 0 0 12 0zm4.962 7.224c.1-.002.321.023.465.14a.5.5 0 0 1 .171.325c.016.093.036.306.02.472c-.18 1.898-.962 6.502-1.36 8.627c-.168.9-.499 1.201-.82 1.23c-.696.065-1.225-.46-1.9-.902c-1.056-.693-1.653-1.124-2.678-1.8c-1.185-.78-.417-1.21.258-1.91c.177-.184 3.247-2.977 3.307-3.23c.007-.032.014-.15-.056-.212s-.174-.041-.249-.024q-.16.036-5.061 3.345q-.72.495-1.302.48c-.428-.008-1.252-.241-1.865-.44c-.752-.245-1.349-.374-1.297-.789q.04-.324.893-.663q5.247-2.286 6.998-3.014q3.333-1.386 4.025-1.627q.227-.078.378-.08" }) })
+};
+function MatricaMigrationView() {
+  const { matricaMigration, resolveMatricaMigration } = useForgeConnect();
+  const [loading, setLoading] = useState6(null);
+  const [error, setError] = useState6("");
+  if (!matricaMigration) return null;
+  const { conflicts } = matricaMigration;
+  const total = conflicts.wallets.length + conflicts.socials.length + (conflicts.email ? 1 : 0);
+  const handle = async (migrate) => {
+    setLoading(migrate ? "migrate" : "skip");
+    setError("");
+    try {
+      await resolveMatricaMigration(migrate);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Something went wrong.");
+      setLoading(null);
+    }
+  };
+  const truncate2 = (s, n = 6) => s.length > n * 2 + 1 ? `${s.slice(0, n)}\u2026${s.slice(-n)}` : s;
+  return /* @__PURE__ */ jsxs8("div", { className: "fc-mig", children: [
+    /* @__PURE__ */ jsxs8("div", { className: "fc-mig-hero", children: [
+      /* @__PURE__ */ jsx9("h2", { className: "fc-modal-title", style: { margin: 0 }, children: "Account already linked" }),
+      /* @__PURE__ */ jsxs8("p", { className: "fc-mig-sub", children: [
+        "Move ",
+        total,
+        " ",
+        total > 1 ? "accounts" : "account",
+        " to Matrica?"
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs8("ul", { className: "fc-mig-list", children: [
+      conflicts.wallets.map((w) => /* @__PURE__ */ jsxs8("li", { className: "fc-mig-item", children: [
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-ic", children: MigrationIcons.wallet }),
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-label", children: "Wallet" }),
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-value", children: /* @__PURE__ */ jsx9("code", { children: truncate2(w.address) }) })
+      ] }, `w-${w.address}`)),
+      conflicts.socials.map((s) => /* @__PURE__ */ jsxs8("li", { className: "fc-mig-item", children: [
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-ic", children: MigrationIcons[s.provider] }),
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-label", style: { textTransform: "capitalize" }, children: s.provider === "twitter" ? "X" : s.provider }),
+        /* @__PURE__ */ jsxs8("span", { className: "fc-mig-value", children: [
+          "@",
+          s.externalName
+        ] })
+      ] }, `s-${s.provider}-${s.externalName}`)),
+      conflicts.email && /* @__PURE__ */ jsxs8("li", { className: "fc-mig-item", children: [
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-ic", children: MigrationIcons.email }),
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-label", children: "Email" }),
+        /* @__PURE__ */ jsx9("span", { className: "fc-mig-value", children: conflicts.email.email })
+      ] })
+    ] }),
+    error && /* @__PURE__ */ jsx9("p", { className: "fc-error", children: error }),
+    /* @__PURE__ */ jsx9(
+      "button",
+      {
+        type: "button",
+        className: "fc-btn fc-btn-primary",
+        onClick: () => handle(true),
+        disabled: loading !== null,
+        children: loading === "migrate" ? "Moving\u2026" : `Move ${total > 1 ? "them all" : "it"}`
+      }
+    ),
+    /* @__PURE__ */ jsx9(
+      "button",
+      {
+        type: "button",
+        className: "fc-mig-skip",
+        onClick: () => handle(false),
+        disabled: loading !== null,
+        children: loading === "skip" ? "Skipping\u2026" : "Not now"
+      }
+    )
+  ] });
+}
 function SuccessView() {
   return /* @__PURE__ */ jsxs8("div", { className: "fc-success", children: [
     /* @__PURE__ */ jsx9("div", { className: "fc-success-icon", children: /* @__PURE__ */ jsxs8("svg", { viewBox: "0 0 52 52", className: "fc-success-check", children: [
@@ -3118,7 +3214,7 @@ function LoginsTab({ onLink, refreshKey }) {
     /* @__PURE__ */ jsx15("p", { className: "fc-account-section-desc", children: "Ways you can sign in to your account." }),
     authMethods?.map((m) => {
       const display = getMethodDisplay(m.provider);
-      const detail = m.provider === "email" ? m.providerId : m.provider.endsWith("_wallet") ? truncate(m.providerId) : m.providerId;
+      const detail = m.provider === "email" ? m.providerId : m.provider.endsWith("_wallet") ? truncate(m.providerId) : m.providerUsername ? m.provider === "twitter" || m.provider === "telegram" ? `@${m.providerUsername}` : m.providerUsername : truncate(m.providerId);
       return /* @__PURE__ */ jsxs14("div", { className: "fc-account-item", children: [
         display.iconHtml && /* @__PURE__ */ jsx15(SvgIcon, { svg: display.iconHtml, className: "fc-account-item-icon" }),
         /* @__PURE__ */ jsxs14("div", { className: "fc-account-item-info", children: [
@@ -3836,6 +3932,7 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
   const [accountModal, setAccountModal] = useState16({ isOpen: false });
   const [linkModal, setLinkModal] = useState16({ isOpen: false });
   const [challengeToken, setChallengeToken] = useState16(null);
+  const [matricaMigration, setMatricaMigration] = useState16(null);
   const apiRef = useRef9(createApiClient(config.apiUrl));
   const refreshTimerRef = useRef9(null);
   const api = apiRef.current;
@@ -3880,6 +3977,21 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
         window.close();
         return;
       }
+      const migrationToken = params.get("fc_migration");
+      if (migrationToken) {
+        try {
+          localStorage.setItem("fc_matrica_migration_pending", migrationToken);
+        } catch {
+        }
+        if (window.opener) {
+          window.opener.postMessage(
+            { type: "fc_matrica_migration", token: migrationToken },
+            window.location.origin
+          );
+        }
+        window.close();
+        return;
+      }
       const authCode = params.get("fc_code");
       if (authCode) {
         try {
@@ -3934,20 +4046,45 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
         setModal({ isOpen: false, step: "method-select" });
       }, 1500);
     };
+    const handleMigrationToken = async (token) => {
+      try {
+        localStorage.removeItem("fc_matrica_migration_pending");
+      } catch {
+      }
+      try {
+        const preview = await api.getMatricaMigration(token);
+        setMatricaMigration({ token, ...preview });
+        setModal({ isOpen: true, step: "matrica-migration" });
+      } catch {
+        setModal({ isOpen: true, step: "error" });
+      }
+    };
     const handleMessage = (event) => {
       if (event.origin !== window.location.origin) return;
-      if (event.data?.type !== "fc_oauth_code") return;
-      const code = event.data.code;
-      if (!code) return;
-      void handleCode(code);
+      if (event.data?.type === "fc_oauth_code") {
+        const code = event.data.code;
+        if (code) void handleCode(code);
+        return;
+      }
+      if (event.data?.type === "fc_matrica_migration") {
+        const token = event.data.token;
+        if (token) void handleMigrationToken(token);
+      }
     };
     const handleStorage = (event) => {
-      if (event.key !== "fc_oauth_code_pending" || !event.newValue) return;
-      void handleCode(event.newValue);
+      if (event.key === "fc_oauth_code_pending" && event.newValue) {
+        void handleCode(event.newValue);
+        return;
+      }
+      if (event.key === "fc_matrica_migration_pending" && event.newValue) {
+        void handleMigrationToken(event.newValue);
+      }
     };
     try {
       const pending = localStorage.getItem("fc_oauth_code_pending");
       if (pending) void handleCode(pending);
+      const pendingMigration = localStorage.getItem("fc_matrica_migration_pending");
+      if (pendingMigration) void handleMigrationToken(pendingMigration);
     } catch {
     }
     window.addEventListener("message", handleMessage);
@@ -4167,6 +4304,28 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     setLinkModal({ isOpen: false });
   }, []);
   const getAccessToken = useCallback9(() => auth.accessToken, [auth.accessToken]);
+  const resolveMatricaMigration = useCallback9(async (migrate) => {
+    if (!matricaMigration) return;
+    const res = await api.resolveMatricaMigration(matricaMigration.token, migrate);
+    setMatricaMigration(null);
+    let accessToken = res.accessToken ?? null;
+    let requires2FA = res.requires2FA;
+    let challenge = res.challengeToken;
+    if (res.code) {
+      const exchange = await api.exchangeOAuthCode(res.code);
+      accessToken = exchange.accessToken ?? null;
+      requires2FA = exchange.requires2FA;
+      challenge = exchange.challengeToken;
+    }
+    if (requires2FA && challenge) {
+      setChallengeToken(challenge);
+      setModal({ isOpen: true, step: "verify-2fa" });
+      return;
+    }
+    if (accessToken) {
+      await handleAuthSuccess(accessToken);
+    }
+  }, [api, matricaMigration, handleAuthSuccess]);
   const value = useMemo3(() => ({
     auth,
     modal,
@@ -4187,6 +4346,8 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     challengeToken,
     verify2FA,
     verifyRecoveryCode,
+    matricaMigration,
+    resolveMatricaMigration,
     openModal,
     closeModal,
     setModalStep,
@@ -4220,6 +4381,8 @@ function ForgeConnectProvider({ config, children, onLogin, onLogout, walletAdapt
     verifyEmailToken,
     verify2FA,
     verifyRecoveryCode,
+    matricaMigration,
+    resolveMatricaMigration,
     openModal,
     closeModal,
     setModalStep,