@insforge/react 0.2.8 → 0.2.10

package/dist/index.js

@@ -1262,6 +1262,7 @@ function SignInForm({
   );
 }
 function SignIn({
+  afterSignInUrl,
   onSuccess,
   onError,
   ...uiProps
@@ -1301,10 +1302,9 @@ function SignIn({
     try {
       setOauthLoading(provider);
       setError("");
-      const redirectTo = `${window.location.origin}/auth/callback`;
       await insforge.auth.signInWithOAuth({
         provider,
-        redirectTo
+        redirectTo: afterSignInUrl
       });
     } catch (err) {
       const errorMessage = err.message || `${provider} sign in failed`;
@@ -1483,6 +1483,7 @@ function SignUpForm({
   );
 }
 function SignUp({
+  afterSignUpUrl,
   onSuccess,
   onError,
   ...uiProps
@@ -1527,10 +1528,9 @@ function SignUp({
     try {
       setOauthLoading(provider);
       setError("");
-      const redirectTo = `${window.location.origin}/auth/callback`;
       await insforge.auth.signInWithOAuth({
         provider,
-        redirectTo
+        redirectTo: afterSignUpUrl
       });
     } catch (err) {
       const errorMessage = err.message || `${provider} sign up failed`;
@@ -1737,18 +1737,19 @@ function SignedOut({ children }) {
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
 }
 function InsforgeCallback({
-  redirectTo,
+  redirectTo = "/",
   onSuccess,
   onError,
   loadingComponent,
   onRedirect
 }) {
   const isProcessingRef = react.useRef(false);
-  const { handleAuthCallback } = useInsforge();
+  const { isLoaded, isSignedIn } = useInsforge();
   react.useEffect(() => {
+    if (!isLoaded) return;
+    if (isProcessingRef.current) return;
+    isProcessingRef.current = true;
     const processCallback = async () => {
-      if (isProcessingRef.current) return;
-      isProcessingRef.current = true;
       const searchParams = new URLSearchParams(window.location.search);
       const error = searchParams.get("error");
       if (error) {
@@ -1764,26 +1765,8 @@ function InsforgeCallback({
         }
         return;
       }
-      const accessToken = searchParams.get("access_token");
-      if (!accessToken) {
-        const errorMsg = "no_token";
-        if (onError) {
-          onError(errorMsg);
-        } else {
-          const errorUrl = "/?error=" + encodeURIComponent(errorMsg);
-          if (onRedirect) {
-            onRedirect(errorUrl);
-          } else {
-            window.location.href = errorUrl;
-          }
-        }
-        return;
-      }
-      const result = await handleAuthCallback({
-        accessToken
-      });
-      if (!result.success) {
-        const errorMsg = result.error || "authentication_failed";
+      if (!isSignedIn) {
+        const errorMsg = "authentication_failed";
         if (onError) {
           onError(errorMsg);
         } else {
@@ -1800,17 +1783,14 @@ function InsforgeCallback({
       if (onSuccess) {
         onSuccess();
       }
-      const destination = redirectTo || sessionStorage.getItem("auth_destination") || sessionStorage.getItem("oauth_final_destination") || "/";
-      sessionStorage.removeItem("auth_destination");
-      sessionStorage.removeItem("oauth_final_destination");
       if (onRedirect) {
-        onRedirect(destination);
+        onRedirect(redirectTo);
       } else {
-        window.location.href = destination;
+        window.location.href = redirectTo;
       }
     };
     processCallback();
-  }, [handleAuthCallback, redirectTo, onSuccess, onError, onRedirect]);
+  }, [isLoaded, isSignedIn, redirectTo, onSuccess, onError, onRedirect]);
   const defaultLoading = /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-center", children: [
     /* @__PURE__ */ jsxRuntime.jsx("h2", { className: "text-2xl font-semibold mb-4", children: "Completing authentication..." }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto" })