@insforge/react 1.1.4 → 1.1.6-test.0

package/dist/components.js

@@ -1757,6 +1757,7 @@ function useInsforge() {
       exchangeResetPasswordToken: () => Promise.resolve({ error: { message: "SSR mode" } }),
       loginWithOAuth: () => Promise.resolve(),
       getPublicAuthConfig: () => Promise.resolve(null),
+      getSession: () => Promise.resolve(null),
       baseUrl: "",
       afterSignInUrl: "/"
     };
@@ -3625,8 +3626,36 @@ function SignInForm({
     ] })
   ] });
 }
+
+// src/lib/hosted-auth.ts
+function isHostedAuthEnvironment() {
+  if (typeof window === "undefined") {
+    return false;
+  }
+  const { hostname, port, protocol } = window.location;
+  if (hostname === "localhost" && port === "7130") {
+    return true;
+  }
+  if (protocol === "https:" && hostname.endsWith(".insforge.app")) {
+    return true;
+  }
+  return false;
+}
+function buildLegacyAuthUrl(redirectUrl, session) {
+  const url = new URL(redirectUrl);
+  url.searchParams.set("access_token", session.accessToken);
+  url.searchParams.set("user_id", session.userId);
+  url.searchParams.set("email", session.email);
+  if (session.name) {
+    url.searchParams.set("name", session.name);
+  }
+  if (session.csrfToken) {
+    url.searchParams.set("csrf_token", session.csrfToken);
+  }
+  return url.toString();
+}
 function SignIn({ onError, ...uiProps }) {
-  const { signIn, verifyEmail, loginWithOAuth } = useInsforge();
+  const { signIn, verifyEmail, loginWithOAuth, isSignedIn, getSession, afterSignInUrl } = useInsforge();
   const { authConfig } = usePublicAuthConfig();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
@@ -3636,6 +3665,37 @@ function SignIn({ onError, ...uiProps }) {
   const [oauthLoading] = useState(null);
   const searchParams = useSearchParams();
   const redirectUrl = searchParams.get("redirect");
+  const isHandlingOAuthRedirectRef = useRef(false);
+  useEffect(() => {
+    async function handleOAuthComplete() {
+      if (!isSignedIn || isHandlingOAuthRedirectRef.current) return;
+      const isHosted = isHostedAuthEnvironment();
+      if (isHosted && redirectUrl) {
+        isHandlingOAuthRedirectRef.current = true;
+        try {
+          const session = await getSession();
+          if (!session) {
+            isHandlingOAuthRedirectRef.current = false;
+            return;
+          }
+          const legacyUrl = buildLegacyAuthUrl(redirectUrl, {
+            accessToken: session.accessToken,
+            userId: session.user.id,
+            email: session.user.email,
+            name: session.user.profile?.name || ""
+          });
+          window.location.href = legacyUrl;
+        } catch (err) {
+          console.error("Failed to redirect after OAuth:", err);
+          isHandlingOAuthRedirectRef.current = false;
+        }
+      } else if (!isHosted) {
+        const finalUrl = redirectUrl || afterSignInUrl || "/";
+        window.location.href = new URL(finalUrl, window.location.origin).toString();
+      }
+    }
+    void handleOAuthComplete();
+  }, [isSignedIn, redirectUrl, getSession, afterSignInUrl]);
   async function handleSubmit(e) {
     e.preventDefault();
     setLoading(true);
@@ -3650,9 +3710,16 @@ function SignIn({ onError, ...uiProps }) {
         }
         throw new Error(result.error);
       }
-      const { user, redirectTo } = result;
+      const { user, accessToken, redirectTo, csrfToken } = result;
       if (user) {
         const finalUrl = new URL(redirectTo || redirectUrl || "", window.location.origin);
+        finalUrl.searchParams.set("access_token", accessToken);
+        finalUrl.searchParams.set("user_id", user.id);
+        finalUrl.searchParams.set("email", user.email);
+        finalUrl.searchParams.set("name", user.profile?.name || "");
+        if (csrfToken) {
+          finalUrl.searchParams.set("csrf_token", csrfToken);
+        }
         window.location.href = finalUrl.toString();
       }
     } catch (err) {
@@ -3673,6 +3740,13 @@ function SignIn({ onError, ...uiProps }) {
         throw new Error("Verification failed");
       }
       const finalUrl = new URL(result.redirectTo || redirectUrl || "", window.location.origin);
+      finalUrl.searchParams.set("access_token", result.accessToken);
+      finalUrl.searchParams.set("user_id", result.user.id);
+      finalUrl.searchParams.set("email", result.user.email);
+      finalUrl.searchParams.set("name", result.user.profile?.name || "");
+      if (result.csrfToken) {
+        finalUrl.searchParams.set("csrf_token", result.csrfToken);
+      }
       window.location.href = finalUrl.toString();
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "Invalid verification code";
@@ -3681,7 +3755,7 @@ function SignIn({ onError, ...uiProps }) {
   }
   function handleOAuth(provider) {
     try {
-      void loginWithOAuth(provider, redirectUrl || "");
+      void loginWithOAuth(provider, window.location.href);
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "OAuth login failed";
       setError(errorMessage);
@@ -3833,7 +3907,7 @@ function createPasswordSchema(options) {
 }
 createPasswordSchema();
 function SignUp({ onError, emailRedirectTo, ...uiProps }) {
-  const { signUp, verifyEmail, loginWithOAuth } = useInsforge();
+  const { signUp, verifyEmail, loginWithOAuth, isSignedIn, getSession, afterSignInUrl } = useInsforge();
   const { authConfig } = usePublicAuthConfig();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
@@ -3843,6 +3917,37 @@ function SignUp({ onError, emailRedirectTo, ...uiProps }) {
   const [oauthLoading] = useState(null);
   const searchParams = useSearchParams();
   const redirectUrl = searchParams.get("redirect");
+  const isHandlingOAuthRedirectRef = useRef(false);
+  useEffect(() => {
+    async function handleOAuthComplete() {
+      if (!isSignedIn || isHandlingOAuthRedirectRef.current) return;
+      const isHosted = isHostedAuthEnvironment();
+      if (isHosted && redirectUrl) {
+        isHandlingOAuthRedirectRef.current = true;
+        try {
+          const session = await getSession();
+          if (!session) {
+            isHandlingOAuthRedirectRef.current = false;
+            return;
+          }
+          const legacyUrl = buildLegacyAuthUrl(redirectUrl, {
+            accessToken: session.accessToken,
+            userId: session.user.id,
+            email: session.user.email,
+            name: session.user.profile?.name || ""
+          });
+          window.location.href = legacyUrl;
+        } catch (err) {
+          console.error("Failed to redirect after OAuth:", err);
+          isHandlingOAuthRedirectRef.current = false;
+        }
+      } else if (!isHosted) {
+        const finalUrl = redirectUrl || afterSignInUrl || "/";
+        window.location.href = new URL(finalUrl, window.location.origin).toString();
+      }
+    }
+    void handleOAuthComplete();
+  }, [isSignedIn, redirectUrl, getSession, afterSignInUrl]);
   async function handleSubmit(e) {
     e.preventDefault();
     setLoading(true);
@@ -3884,7 +3989,15 @@ function SignUp({ onError, emailRedirectTo, ...uiProps }) {
         return;
       }
       if (result.accessToken && result.user) {
+        const csrfToken = result.csrfToken;
         const finalUrl = new URL(result.redirectTo || redirectUrl || "", window.location.origin);
+        finalUrl.searchParams.set("access_token", result.accessToken);
+        finalUrl.searchParams.set("user_id", result.user.id);
+        finalUrl.searchParams.set("email", result.user.email);
+        finalUrl.searchParams.set("name", result.user.profile?.name || "");
+        if (csrfToken) {
+          finalUrl.searchParams.set("csrf_token", csrfToken);
+        }
         window.location.href = finalUrl.toString();
       }
     } catch (err) {
@@ -3905,6 +4018,13 @@ function SignUp({ onError, emailRedirectTo, ...uiProps }) {
         throw new Error("Verification failed");
       }
       const finalUrl = new URL(result.redirectTo || redirectUrl || "", window.location.origin);
+      finalUrl.searchParams.set("access_token", result.accessToken);
+      finalUrl.searchParams.set("user_id", result.user.id);
+      finalUrl.searchParams.set("email", result.user.email);
+      finalUrl.searchParams.set("name", result.user.profile?.name || "");
+      if (result.csrfToken) {
+        finalUrl.searchParams.set("csrf_token", result.csrfToken);
+      }
       window.location.href = finalUrl.toString();
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "Invalid verification code";
@@ -3913,7 +4033,7 @@ function SignUp({ onError, emailRedirectTo, ...uiProps }) {
   }
   function handleOAuth(provider) {
     try {
-      void loginWithOAuth(provider, redirectUrl || "");
+      void loginWithOAuth(provider, window.location.href);
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "OAuth login failed";
       setError(errorMessage);