@insforge/react 0.6.3 → 0.6.5

package/dist/index.js

@@ -67,8 +67,9 @@ var InsforgeManager = class _InsforgeManager {
   // Static private instance
   static instance = null;
   // State storage
-  user = null;
+  user = void 0;
   isLoaded = false;
+  isInitializing = false;
   sdk;
   listeners = /* @__PURE__ */ new Set();
   // Config
@@ -79,6 +80,8 @@ var InsforgeManager = class _InsforgeManager {
   constructor(config) {
     this.config = config;
     this.sdk = createClient({ baseUrl: config.baseUrl });
+    this.user = void 0;
+    this.isLoaded = false;
   }
   // Public access method (Singleton core)
   static getInstance(config) {
@@ -102,16 +105,28 @@ var InsforgeManager = class _InsforgeManager {
   }
   // Public initialization method
   async initialize() {
-    if (!this.isLoaded) {
+    if (this.isLoaded) {
+      return;
+    }
+    if (this.isInitializing) {
+      return;
+    }
+    this.isInitializing = true;
+    try {
       await this.loadAuthState();
+    } finally {
+      this.isInitializing = false;
     }
   }
   // Get current state
   getState() {
+    const userId = this.user === void 0 ? void 0 : this.user === null ? null : this.user.id;
+    const isSignedIn = this.user === void 0 ? void 0 : this.user !== null;
     return {
       user: this.user,
+      userId,
       isLoaded: this.isLoaded,
-      isSignedIn: !!this.user
+      isSignedIn
     };
   }
   // Subscription mechanism
@@ -412,22 +427,22 @@ var InsforgeManager = class _InsforgeManager {
   getSDK() {
     return this.sdk;
   }
-  // Handle OAuth callback
-  handleOAuthCallback(isLoaded, user) {
+  // Handle auth redirect after successful authentication
+  // Works for all auth sources: OAuth providers, cloud hosting sign-in, email verification
+  handleAuthRedirect(isLoaded, user) {
     if (!isLoaded || this.hasProcessedCallbackRef) {
       return false;
     }
-    const searchParams = new URLSearchParams(window.location.search);
-    const accessToken = searchParams.get("access_token");
-    if (accessToken && !!user) {
-      this.hasProcessedCallbackRef = true;
-      const url = new URL(window.location.href);
-      url.search = "";
-      window.history.replaceState({}, "", url.toString());
-      setTimeout(() => {
-        window.location.href = this.config.afterSignInUrl || "/";
-      }, 100);
-      return true;
+    if (user && this.config.afterSignInUrl) {
+      const currentPath = window.location.pathname + window.location.search;
+      const targetPath = this.config.afterSignInUrl;
+      if (currentPath !== targetPath && !this.hasProcessedCallbackRef) {
+        this.hasProcessedCallbackRef = true;
+        setTimeout(() => {
+          window.location.href = targetPath;
+        }, 100);
+        return true;
+      }
     }
     return false;
   }
@@ -464,17 +479,20 @@ function InsforgeProviderCore({
       setState(newState);
     });
     void manager.initialize();
-    return unsubscribe;
+    return () => {
+      unsubscribe();
+    };
   }, [manager]);
   useEffect(() => {
     if (typeof window !== "undefined") {
-      manager.handleOAuthCallback(state.isLoaded, state.user);
+      manager.handleAuthRedirect(state.isLoaded, state.user);
     }
   }, [manager, state.isLoaded, state.user]);
   const contextValue = useMemo(
     () => ({
       // State from Manager
       user: state.user,
+      userId: state.userId,
       isLoaded: state.isLoaded,
       isSignedIn: state.isSignedIn,
       // Methods delegated to Manager
@@ -506,9 +524,10 @@ function useInsforge() {
   const context = useContext(InsforgeContext);
   if (!context) {
     return {
-      user: null,
+      user: void 0,
+      userId: void 0,
       isLoaded: false,
-      isSignedIn: false,
+      isSignedIn: void 0,
       setUser: () => {
       },
       signIn: () => Promise.resolve({ error: "SSR mode" }),
@@ -2488,16 +2507,16 @@ function Protect({
   condition,
   onRedirect
 }) {
-  const { isSignedIn, isLoaded, user } = useInsforge();
+  const { userId, user } = useInsforge();
   const resolvedRedirectTo = useMemo(() => resolveAuthPath(redirectTo), [redirectTo]);
   useEffect(() => {
-    if (isLoaded && !isSignedIn) {
+    if (userId === null) {
       if (onRedirect) {
         onRedirect(resolvedRedirectTo);
       } else {
         window.location.href = resolvedRedirectTo;
       }
-    } else if (isLoaded && isSignedIn && condition && user) {
+    } else if (userId && condition && user) {
       if (!condition(user)) {
         if (onRedirect) {
           onRedirect(resolvedRedirectTo);
@@ -2506,11 +2525,11 @@ function Protect({
         }
       }
     }
-  }, [isLoaded, isSignedIn, resolvedRedirectTo, condition, user, onRedirect]);
-  if (!isLoaded) {
+  }, [userId, resolvedRedirectTo, condition, user, onRedirect]);
+  if (userId === void 0) {
     return fallback || /* @__PURE__ */ jsx("div", { className: "insforge-loading", children: "Loading..." });
   }
-  if (!isSignedIn) {
+  if (userId === null) {
     return fallback || null;
   }
   if (condition && user && !condition(user)) {
@@ -2519,24 +2538,18 @@ function Protect({
   return /* @__PURE__ */ jsx(Fragment, { children });
 }
 function SignedIn({ children }) {
-  const { isSignedIn, isLoaded } = useInsforge();
-  if (!isLoaded) {
-    return null;
+  const { userId } = useInsforge();
+  if (userId) {
+    return /* @__PURE__ */ jsx(Fragment, { children });
   }
-  if (!isSignedIn) {
-    return null;
-  }
-  return /* @__PURE__ */ jsx(Fragment, { children });
+  return null;
 }
 function SignedOut({ children }) {
-  const { isSignedIn, isLoaded } = useInsforge();
-  if (!isLoaded) {
-    return null;
-  }
-  if (isSignedIn) {
-    return null;
+  const { userId } = useInsforge();
+  if (userId === null) {
+    return /* @__PURE__ */ jsx(Fragment, { children });
   }
-  return /* @__PURE__ */ jsx(Fragment, { children });
+  return null;
 }
 function SignInButton({ children, className }) {
   const { afterSignInUrl, baseUrl } = useInsforge();