@insforge/react 1.0.2-dev.5 → 1.0.2-dev.6

package/dist/index.cjs

@@ -494,9 +494,9 @@ var InsforgeManager = class _InsforgeManager {
   // State storage
   user = void 0;
   isLoaded = false;
+  isInitializing = false;
   sdk;
   listeners = /* @__PURE__ */ new Set();
-  authSubscription = null;
   // Config
   config;
   refreshIntervalRef = null;
@@ -506,93 +506,6 @@ var InsforgeManager = class _InsforgeManager {
     this.sdk = sdk.createClient({ baseUrl: config.baseUrl });
     this.user = void 0;
     this.isLoaded = false;
-    this.setupAuthSubscription();
-  }
-  // Setup subscription to SDK auth state changes
-  setupAuthSubscription() {
-    const { data } = this.sdk.auth.onAuthStateChange(
-      async (event, session) => {
-        await this.handleAuthStateChange(event, session);
-      }
-    );
-    this.authSubscription = data.subscription;
-  }
-  // Handle auth state changes from SDK
-  async handleAuthStateChange(event, session) {
-    switch (event) {
-      case "INITIAL_SESSION":
-        if (session?.accessToken) {
-          await this.loadFullUserProfile();
-        } else {
-          this.user = null;
-          this.isLoaded = true;
-          this.notifyListeners();
-        }
-        break;
-      case "SIGNED_IN":
-        if (session?.accessToken) {
-          await this.loadFullUserProfile();
-          if (this.config.onSignIn) {
-            try {
-              await this.config.onSignIn(session.accessToken);
-            } catch (error) {
-              console.error("[InsforgeManager] Error in onSignIn callback:", error);
-            }
-          }
-        }
-        break;
-      case "SIGNED_OUT":
-        this.user = null;
-        this.isLoaded = true;
-        if (this.config.onAuthChange) {
-          this.config.onAuthChange(null);
-        }
-        if (this.config.onSignOut) {
-          try {
-            await this.config.onSignOut();
-          } catch (error) {
-            console.error("[InsforgeManager] Error in onSignOut callback:", error);
-          }
-        }
-        this.notifyListeners();
-        break;
-    }
-  }
-  // Load full user profile from API
-  async loadFullUserProfile() {
-    try {
-      const userResult = await this.sdk.auth.getCurrentUser();
-      if (userResult.data) {
-        const profile = userResult.data.profile;
-        const userData = {
-          id: userResult.data.user.id,
-          email: userResult.data.user.email,
-          name: profile?.nickname || "",
-          avatarUrl: profile?.avatarUrl || ""
-        };
-        this.user = userData;
-        this.isLoaded = true;
-        if (this.config.onAuthChange) {
-          this.config.onAuthChange(userData);
-        }
-        this.notifyListeners();
-      } else {
-        this.user = null;
-        this.isLoaded = true;
-        if (this.config.onAuthChange) {
-          this.config.onAuthChange(null);
-        }
-        this.notifyListeners();
-      }
-    } catch (error) {
-      console.error("[InsforgeManager] Failed to load user profile:", error);
-      this.user = null;
-      this.isLoaded = true;
-      if (this.config.onAuthChange) {
-        this.config.onAuthChange(null);
-      }
-      this.notifyListeners();
-    }
   }
   // Public access method (Singleton core)
   static getInstance(config) {
@@ -614,6 +527,19 @@ var InsforgeManager = class _InsforgeManager {
   updateConfig(config) {
     this.config = { ...this.config, ...config };
   }
+  // Public initialization method
+  // Even if we have initialState (isLoaded=true from cookies), we still need to load full user data from SDK/API
+  async initialize() {
+    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;
@@ -634,7 +560,83 @@ var InsforgeManager = class _InsforgeManager {
     const state = this.getState();
     this.listeners.forEach((listener) => listener(state));
   }
-  // Helper to handle auth success (for signIn/signUp methods)
+  // Load auth state
+  // This loads the FULL user data from SDK (including complete profile)
+  // Called after hydration to get complete user information beyond what's in cookies
+  async loadAuthState() {
+    try {
+      const sessionResult = this.sdk.auth.getCurrentSession();
+      const token2 = sessionResult.data?.session?.accessToken || null;
+      if (!token2) {
+        this.user = null;
+        if (this.config.onAuthChange) {
+          this.config.onAuthChange(null);
+        }
+        this.isLoaded = true;
+        this.notifyListeners();
+        return { success: false, error: "no_session" };
+      }
+      const userResult = await this.sdk.auth.getCurrentUser();
+      if (userResult.data) {
+        const profile = userResult.data.profile;
+        const userData = {
+          id: userResult.data.user.id,
+          email: userResult.data.user.email,
+          name: profile?.nickname || "",
+          avatarUrl: profile?.avatarUrl || ""
+          // You can add more profile fields here as needed
+        };
+        this.user = userData;
+        if (this.config.onAuthChange) {
+          this.config.onAuthChange(userData);
+        }
+        this.isLoaded = true;
+        this.notifyListeners();
+        return { success: true };
+      } else {
+        await this.sdk.auth.signOut();
+        if (this.config.onSignOut) {
+          try {
+            await this.config.onSignOut();
+          } catch (error) {
+            if (error instanceof Error) {
+              console.error("[InsforgeManager] Error clearing cookie:", error.message);
+            }
+          }
+        }
+        this.user = null;
+        if (this.config.onAuthChange) {
+          this.config.onAuthChange(null);
+        }
+        this.isLoaded = true;
+        this.notifyListeners();
+        return { success: false, error: "invalid_token" };
+      }
+    } catch (error) {
+      console.error("[InsforgeManager] Token validation failed:", error);
+      await this.sdk.auth.signOut();
+      if (this.config.onSignOut) {
+        try {
+          await this.config.onSignOut();
+        } catch (error2) {
+          if (error2 instanceof Error) {
+            console.error("[InsforgeManager] Error clearing cookie:", error2.message);
+          }
+        }
+      }
+      this.user = null;
+      if (this.config.onAuthChange) {
+        this.config.onAuthChange(null);
+      }
+      this.isLoaded = true;
+      this.notifyListeners();
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : "Authentication failed"
+      };
+    }
+  }
+  // Helper to handle auth success
   async handleAuthSuccess(authToken, fallbackUser) {
     const userResult = await this.sdk.auth.getCurrentUser();
     if (userResult.data) {
@@ -721,10 +723,24 @@ var InsforgeManager = class _InsforgeManager {
   }
   async signOut() {
     await this.sdk.auth.signOut();
+    if (this.config.onSignOut) {
+      try {
+        await this.config.onSignOut();
+      } catch (error) {
+        if (error instanceof Error) {
+          console.error("[InsforgeManager] Error clearing cookie:", error.message);
+        }
+      }
+    }
     if (this.refreshIntervalRef) {
       clearInterval(this.refreshIntervalRef);
       this.refreshIntervalRef = null;
     }
+    this.user = null;
+    if (this.config.onAuthChange) {
+      this.config.onAuthChange(null);
+    }
+    this.notifyListeners();
   }
   async updateUser(data) {
     if (!this.user) {
@@ -757,24 +773,7 @@ var InsforgeManager = class _InsforgeManager {
     return { error: error?.message || "Failed to update user" };
   }
   async reloadAuth() {
-    try {
-      const sessionResult = this.sdk.auth.getCurrentSession();
-      const token2 = sessionResult.data?.session?.accessToken;
-      if (token2) {
-        await this.loadFullUserProfile();
-        return { success: true };
-      } else {
-        this.user = null;
-        this.isLoaded = true;
-        this.notifyListeners();
-        return { success: false, error: "no_session" };
-      }
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : "Failed to reload auth"
-      };
-    }
+    return await this.loadAuthState();
   }
   async sendVerificationEmail(email) {
     const sdkResult = await this.sdk.auth.sendVerificationEmail({ email });
@@ -847,6 +846,9 @@ var InsforgeManager = class _InsforgeManager {
     this.notifyListeners();
   }
   // Set initial state from server (for SSR hydration)
+  // This is ONLY basic user info from cookies, not full profile
+  // Following Clerk's pattern: initialState prevents hydration mismatch
+  // but full user data is still loaded via initialize()
   setInitialState(initialState) {
     if (this.user !== void 0) {
       return;
@@ -873,10 +875,6 @@ var InsforgeManager = class _InsforgeManager {
   }
   // Cleanup
   cleanup() {
-    if (this.authSubscription) {
-      this.authSubscription.unsubscribe();
-      this.authSubscription = null;
-    }
     if (this.refreshIntervalRef) {
       clearInterval(this.refreshIntervalRef);
       this.refreshIntervalRef = null;