@insforge/react 0.2.4 → 0.2.6

package/dist/index.mjs

@@ -158,6 +158,70 @@ function InsforgeProvider({
     },
     [insforge, onAuthChange, syncTokenToCookie]
   );
+  const handleAuthCallback = useCallback(
+    async (params) => {
+      try {
+        await insforge.auth.setSession({
+          accessToken: params.accessToken,
+          user: {
+            id: params.userId || "",
+            email: params.email || "",
+            name: params.name || "",
+            emailVerified: false,
+            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          }
+        });
+        const userResult = await insforge.auth.getCurrentUser();
+        if (!userResult.data) {
+          await insforge.auth.signOut();
+          if (clearCookie) {
+            try {
+              await clearCookie();
+            } catch (error) {
+            }
+          }
+          return { success: false, error: "invalid_token" };
+        }
+        const profile = userResult.data.profile;
+        const userData = {
+          id: userResult.data.user.id,
+          email: userResult.data.user.email,
+          name: profile?.nickname || params.name || "",
+          avatarUrl: profile?.avatarUrl || ""
+        };
+        setUser(userData);
+        if (onAuthChange) {
+          onAuthChange(userData);
+        }
+        if (syncTokenToCookie) {
+          try {
+            await syncTokenToCookie(params.accessToken);
+          } catch (error) {
+          }
+        }
+        return { success: true };
+      } catch (error) {
+        console.error("[InsforgeProvider] Auth callback failed:", error);
+        await insforge.auth.signOut();
+        if (clearCookie) {
+          try {
+            await clearCookie();
+          } catch (error2) {
+          }
+        }
+        setUser(null);
+        if (onAuthChange) {
+          onAuthChange(null);
+        }
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : "authentication_failed"
+        };
+      }
+    },
+    [insforge, onAuthChange, syncTokenToCookie, clearCookie]
+  );
   const signIn = useCallback(
     async (email, password) => {
       const sdkResult = await insforge.auth.signInWithPassword({
@@ -281,6 +345,7 @@ function InsforgeProvider({
         signOut,
         updateUser,
         reloadAuth: loadAuthState,
+        handleAuthCallback,
         baseUrl,
         sendPasswordResetCode,
         resetPassword,
@@ -1195,10 +1260,8 @@ function SignInForm({
   );
 }
 function SignIn({
-  afterSignInUrl = "/",
   onSuccess,
   onError,
-  onRedirect,
   ...uiProps
 }) {
   const { signIn, baseUrl } = useInsforge();
@@ -1224,11 +1287,6 @@ function SignIn({
       if (onSuccess) {
         if (user) onSuccess(user, accessToken || "");
       }
-      if (onRedirect) {
-        onRedirect(afterSignInUrl);
-      } else {
-        window.location.href = afterSignInUrl;
-      }
     } catch (err) {
       const errorMessage = err.message || "Sign in failed";
       setError(errorMessage);
@@ -1242,7 +1300,6 @@ function SignIn({
       setOauthLoading(provider);
       setError("");
       const redirectTo = `${window.location.origin}/auth/callback`;
-      sessionStorage.setItem("oauth_final_destination", afterSignInUrl || "/");
       await insforge.auth.signInWithOAuth({
         provider,
         redirectTo
@@ -1424,10 +1481,8 @@ function SignUpForm({
   );
 }
 function SignUp({
-  afterSignUpUrl = "/",
   onSuccess,
   onError,
-  onRedirect,
   ...uiProps
 }) {
   const { signUp, baseUrl } = useInsforge();
@@ -1458,11 +1513,6 @@ function SignUp({
       if (onSuccess) {
         if (user) onSuccess(user, accessToken || "");
       }
-      if (onRedirect) {
-        onRedirect(afterSignUpUrl);
-      } else {
-        window.location.href = afterSignUpUrl;
-      }
     } catch (err) {
       const errorMessage = err.message || "Sign up failed";
       setError(errorMessage);
@@ -1476,7 +1526,6 @@ function SignUp({
       setOauthLoading(provider);
       setError("");
       const redirectTo = `${window.location.origin}/auth/callback`;
-      sessionStorage.setItem("oauth_final_destination", afterSignUpUrl || "/");
       await insforge.auth.signInWithOAuth({
         provider,
         redirectTo
@@ -1693,7 +1742,7 @@ function InsforgeCallback({
   onRedirect
 }) {
   const isProcessingRef = useRef(false);
-  const { reloadAuth } = useInsforge();
+  const { handleAuthCallback } = useInsforge();
   useEffect(() => {
     const processCallback = async () => {
       if (isProcessingRef.current) return;
@@ -1713,7 +1762,30 @@ function InsforgeCallback({
         }
         return;
       }
-      const result = await reloadAuth();
+      const accessToken = searchParams.get("access_token");
+      const userId = searchParams.get("user_id");
+      const email = searchParams.get("email");
+      const name = searchParams.get("name");
+      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,
+        userId: userId || void 0,
+        email: email || void 0,
+        name: name || void 0
+      });
       if (!result.success) {
         const errorMsg = result.error || "authentication_failed";
         if (onError) {
@@ -1742,7 +1814,7 @@ function InsforgeCallback({
       }
     };
     processCallback();
-  }, []);
+  }, [handleAuthCallback, redirectTo, onSuccess, onError, onRedirect]);
   const defaultLoading = /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
     /* @__PURE__ */ jsx("h2", { className: "text-2xl font-semibold mb-4", children: "Completing authentication..." }),
     /* @__PURE__ */ jsx("div", { className: "animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto" })
@@ -2113,16 +2185,9 @@ function getInsforgeRoutes(config) {
     signUp = "/sign-up",
     verifyEmail = "/verify-email",
     forgotPassword = "/forgot-password",
-    resetPassword = "/reset-password",
-    callback = "/auth/callback"
+    resetPassword = "/reset-password"
   } = paths;
-  const routes = [
-    // Always include callback route
-    {
-      path: callback,
-      element: /* @__PURE__ */ jsx(InsforgeCallback, {})
-    }
-  ];
+  const routes = [];
   if (builtInAuth) {
     routes.push(
       {