@insforge/react 1.0.5-dev.0 → 1.0.5-dev.2

package/dist/index.d.cts

@@ -5,6 +5,7 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 import { InsforgeUser, InsforgeContextValue, OAuthProvider } from '@insforge/shared';
 export { InsforgeContextValue, InsforgeUser, OAuthProvider } from '@insforge/shared';
+import { InsForgeClient } from '@insforge/sdk';
 export { useAuth, usePublicAuthConfig, useUser } from './hooks.cjs';
 export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, resolveAuthPath, resolveAuthUrl, validateEmail, validatePassword } from './lib.cjs';
 import { OAuthProviderConfig } from './types.cjs';
@@ -19,7 +20,7 @@ interface InitialAuthState {
 }
 interface InsforgeProviderProps {
     children: ReactNode;
-    baseUrl: string;
+    client: InsForgeClient;
     /**
      * URL to redirect to after successful sign in (when token is detected in URL)
      * @default '/'
@@ -73,7 +74,7 @@ interface InsforgeProviderProps {
  * </InsforgeProvider>
  * ```
  */
-declare function InsforgeProviderCore({ children, baseUrl, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh, initialState, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
+declare function InsforgeProviderCore({ children, client, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh, initialState, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 declare function InsforgeProvider(props: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access Insforge context

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 import { InsforgeUser, InsforgeContextValue, OAuthProvider } from '@insforge/shared';
 export { InsforgeContextValue, InsforgeUser, OAuthProvider } from '@insforge/shared';
+import { InsForgeClient } from '@insforge/sdk';
 export { useAuth, usePublicAuthConfig, useUser } from './hooks.js';
 export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, resolveAuthPath, resolveAuthUrl, validateEmail, validatePassword } from './lib.js';
 import { OAuthProviderConfig } from './types.js';
@@ -19,7 +20,7 @@ interface InitialAuthState {
 }
 interface InsforgeProviderProps {
     children: ReactNode;
-    baseUrl: string;
+    client: InsForgeClient;
     /**
      * URL to redirect to after successful sign in (when token is detected in URL)
      * @default '/'
@@ -73,7 +74,7 @@ interface InsforgeProviderProps {
  * </InsforgeProvider>
  * ```
  */
-declare function InsforgeProviderCore({ children, baseUrl, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh, initialState, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
+declare function InsforgeProviderCore({ children, client, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh, initialState, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 declare function InsforgeProvider(props: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access Insforge context

package/dist/index.js

@@ -15,7 +15,6 @@ if (typeof document !== 'undefined' && typeof window !== 'undefined') {
 import * as React2 from 'react';
 import { createContext, forwardRef, useContext, useState, useMemo, useEffect, useRef, useCallback, isValidElement, cloneElement } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { createClient } from '@insforge/sdk';
 import { InsforgeContext } from '@insforge/shared/react';
 import { AlertTriangle, Check, EyeOff, Eye, Loader2, CircleCheck, X, User, LogOut } from 'lucide-react';
 import { z } from 'zod';
@@ -467,6 +466,8 @@ function useSearchParams() {
   const adapter = useNavigationAdapter();
   return adapter.useSearchParams();
 }
+
+// src/core/InsforgeManager.ts
 var InsforgeManager = class _InsforgeManager {
   // Static private instance
   static instance = null;
@@ -482,7 +483,7 @@ var InsforgeManager = class _InsforgeManager {
   // Private constructor (prevents external instantiation)
   constructor(config) {
     this.config = config;
-    this.sdk = createClient({ baseUrl: config.baseUrl });
+    this.sdk = config.client;
     this.user = void 0;
     this.isLoaded = false;
   }
@@ -490,6 +491,9 @@ var InsforgeManager = class _InsforgeManager {
   static getInstance(config) {
     if (typeof window !== "undefined" && _InsforgeManager.instance) {
       _InsforgeManager.instance.updateConfig(config);
+      if (config.client && _InsforgeManager.instance.sdk !== config.client) {
+        _InsforgeManager.instance.sdk = config.client;
+      }
       return _InsforgeManager.instance;
     }
     _InsforgeManager.instance = new _InsforgeManager(config);
@@ -567,15 +571,10 @@ var InsforgeManager = class _InsforgeManager {
       }
       const userResult = await this.sdk.auth.getCurrentUser();
       if (userResult.data) {
-        const profile = userResult.data.user.profile;
-        const { name, avatar_url, ...dynamicFields } = profile || {};
         const userData = {
           id: userResult.data.user.id,
           email: userResult.data.user.email,
-          name: name || "",
-          avatarUrl: avatar_url || "",
-          // Store additional dynamic fields
-          profile: Object.keys(dynamicFields).length > 0 ? dynamicFields : void 0
+          profile: userResult.data.user.profile
         };
         this.user = userData;
         if (this.config.onAuthChange) {
@@ -611,15 +610,10 @@ var InsforgeManager = class _InsforgeManager {
   async handleAuthSuccess(authToken, fallbackUser) {
     const userResult = await this.sdk.auth.getCurrentUser();
     if (userResult.data) {
-      const profile = userResult.data.user.profile;
-      const { name, avatar_url, ...dynamicFields } = profile || {};
       const userData = {
         id: userResult.data.user.id,
         email: userResult.data.user.email,
-        name: name || "",
-        avatarUrl: avatar_url || "",
-        // Store additional dynamic fields
-        profile: Object.keys(dynamicFields).length > 0 ? dynamicFields : void 0
+        profile: userResult.data.user.profile
       };
       this.user = userData;
       this.notifyListeners();
@@ -639,8 +633,7 @@ var InsforgeManager = class _InsforgeManager {
       const userData = {
         id: fallbackUser.id || "",
         email: fallbackUser.email || "",
-        name: fallbackUser.name || "",
-        avatarUrl: ""
+        profile: fallbackUser.profile || null
       };
       this.user = userData;
       this.notifyListeners();
@@ -661,7 +654,7 @@ var InsforgeManager = class _InsforgeManager {
         sdkResult.data.user ? {
           id: sdkResult.data.user.id,
           email: sdkResult.data.user.email,
-          name: sdkResult.data.user.profile?.name || ""
+          profile: sdkResult.data.user.profile || void 0
         } : void 0
       );
       return sdkResult.data;
@@ -682,7 +675,7 @@ var InsforgeManager = class _InsforgeManager {
           sdkResult.data.user ? {
             id: sdkResult.data.user.id,
             email: sdkResult.data.user.email,
-            name: sdkResult.data.user.profile?.name || ""
+            profile: sdkResult.data.user.profile || void 0
           } : void 0
         );
       }
@@ -720,26 +713,15 @@ var InsforgeManager = class _InsforgeManager {
     if (!this.user) {
       return { error: "No user signed in" };
     }
-    const profileUpdate = {};
-    if (data.name !== void 0) {
-      profileUpdate.name = data.name;
-    }
-    if (data.avatarUrl !== void 0) {
-      profileUpdate.avatar_url = data.avatarUrl;
+    if (!data) {
+      return { error: "No profile data provided" };
     }
-    if (data.profile) {
-      Object.assign(profileUpdate, data.profile);
-    }
-    const result = await this.sdk.auth.setProfile(profileUpdate);
+    const result = await this.sdk.auth.setProfile(data);
     if (result.data) {
       const updatedUser = {
         id: this.user.id,
         email: this.user.email,
-        // Use sent value if provided, otherwise keep existing
-        name: profileUpdate.name !== void 0 ? profileUpdate.name : this.user.name || "",
-        avatarUrl: profileUpdate.avatar_url !== void 0 ? profileUpdate.avatar_url : this.user.avatarUrl || "",
-        // Merge existing profile with new dynamic fields
-        profile: data.profile ? { ...this.user.profile, ...data.profile } : this.user.profile
+        profile: data
       };
       this.user = updatedUser;
       if (this.config.onAuthChange) {
@@ -841,12 +823,10 @@ var InsforgeManager = class _InsforgeManager {
       return;
     }
     if (initialState.userId) {
-      const normalizeValue = (val) => val && val !== "null" ? val : "";
       this.user = {
         id: initialState.userId,
-        email: normalizeValue(initialState.user?.email),
-        name: normalizeValue(initialState.user?.name),
-        avatarUrl: normalizeValue(initialState.user?.avatarUrl)
+        email: initialState.user?.email || "",
+        profile: initialState.user?.profile || null
       };
     } else {
       this.user = null;
@@ -2190,7 +2170,7 @@ function StyleProvider({ children, nonce }) {
 }
 function InsforgeProviderCore({
   children,
-  baseUrl,
+  client,
   afterSignInUrl = "/",
   onAuthChange,
   onSignIn,
@@ -2200,14 +2180,14 @@ function InsforgeProviderCore({
 }) {
   const manager = useMemo(
     () => InsforgeManager.getInstance({
-      baseUrl,
+      client,
       afterSignInUrl,
       onAuthChange,
       onSignIn,
       onSignOut,
       onRefresh
     }),
-    [baseUrl, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh]
+    [client, afterSignInUrl, onAuthChange, onSignIn, onSignOut, onRefresh]
   );
   if (initialState) {
     const currentState = manager.getState();
@@ -2259,7 +2239,7 @@ function InsforgeProviderCore({
       loginWithOAuth: (provider, redirectTo) => manager.loginWithOAuth(provider, redirectTo),
       getPublicAuthConfig: () => manager.getPublicAuthConfig(),
       // Config
-      baseUrl: manager.getConfig().baseUrl,
+      baseUrl: manager.getConfig().client.getHttpClient().baseUrl,
       afterSignInUrl: manager.getConfig().afterSignInUrl || "/"
     }),
     [state, manager]
@@ -5465,7 +5445,7 @@ var ProfileSpinner = styled.div`
   }
 `;
 var READ_ONLY_FIELDS = ["id", "email", "avatar_url", "created_at", "updated_at"];
-var HIDDEN_FIELDS = ["id"];
+var HIDDEN_FIELDS = ["id", "avatar_url"];
 function formatFieldLabel(key) {
   return key.replace(/_/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").toLowerCase();
 }
@@ -5477,9 +5457,7 @@ function UserProfileModal({ onClose, onError }) {
   const [formData, setFormData] = useState({});
   useEffect(() => {
     if (user) {
-      const initialData = {
-        name: user.name || ""
-      };
+      const initialData = {};
       if (user.profile) {
         Object.entries(user.profile).forEach(([key, value]) => {
           if (!HIDDEN_FIELDS.includes(key) && typeof value === "string") {
@@ -5492,7 +5470,7 @@ function UserProfileModal({ onClose, onError }) {
   }, [user]);
   useEffect(() => {
     setImageError(false);
-    const avatarUrl = user?.avatarUrl;
+    const avatarUrl = user?.profile?.avatar_url;
     if (!avatarUrl) {
       return;
     }
@@ -5510,7 +5488,7 @@ function UserProfileModal({ onClose, onError }) {
       }
     };
     void checkImageUrl();
-  }, [user?.avatarUrl]);
+  }, [user?.profile?.avatar_url]);
   const handleFieldChange = useCallback((key, value) => {
     setFormData((prev2) => ({
       ...prev2,
@@ -5523,7 +5501,9 @@ function UserProfileModal({ onClose, onError }) {
     try {
       const { name, ...dynamicFields } = formData;
       const updateData = {
-        name
+        profile: {
+          name
+        }
       };
       if (Object.keys(dynamicFields).length > 0) {
         updateData.profile = dynamicFields;
@@ -5543,7 +5523,7 @@ function UserProfileModal({ onClose, onError }) {
   const handleCancel = useCallback(() => {
     if (user) {
       const resetData = {
-        name: user.name || ""
+        name: user.profile?.name || ""
       };
       if (user.profile) {
         Object.entries(user.profile).forEach(([key, value]) => {
@@ -5580,12 +5560,12 @@ function UserProfileModal({ onClose, onError }) {
   if (!isLoaded || !user) {
     return null;
   }
-  const initials = user.name ? user.name.charAt(0).toUpperCase() : user.email.split("@")[0].slice(0, 2).toUpperCase();
+  const initials = user.profile?.name ? user.profile.name.charAt(0).toUpperCase() : user.email.split("@")[0].slice(0, 2).toUpperCase();
   const fields = [];
   fields.push({ key: "email", value: user.email, readOnly: true });
   fields.push({
     key: "name",
-    value: isEditing ? formData.name || "" : user.name || "",
+    value: isEditing ? formData.name || "" : user.profile?.name || "",
     readOnly: false
   });
   if (user.profile) {
@@ -5605,11 +5585,11 @@ function UserProfileModal({ onClose, onError }) {
       /* @__PURE__ */ jsx(ProfileModalCloseButton, { onClick: onClose, "aria-label": "Close", children: /* @__PURE__ */ jsx(X, {}) })
     ] }),
     /* @__PURE__ */ jsxs(ProfileModalBody, { children: [
-      /* @__PURE__ */ jsx(ProfileAvatarSection, { children: /* @__PURE__ */ jsx(ProfileAvatar, { children: user.avatarUrl && !imageError ? /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx(ProfileAvatarSection, { children: /* @__PURE__ */ jsx(ProfileAvatar, { children: user.profile?.avatar_url && !imageError ? /* @__PURE__ */ jsx(
         ProfileAvatarImage,
         {
-          src: user.avatarUrl,
-          alt: user.name || user.email,
+          src: user.profile.avatar_url,
+          alt: user.profile?.name || user.email,
           onError: () => setImageError(true)
         }
       ) : initials }) }),
@@ -5628,7 +5608,7 @@ function UserProfileModal({ onClose, onError }) {
     ] }),
     /* @__PURE__ */ jsx(ProfileModalFooter, { children: isEditing ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(ProfileButton, { onClick: handleCancel, disabled: isSaving, children: "Cancel" }),
-      /* @__PURE__ */ jsxs(ProfileButton, { $primary: true, onClick: handleSave, disabled: isSaving, children: [
+      /* @__PURE__ */ jsxs(ProfileButton, { $primary: true, onClick: () => void handleSave(), disabled: isSaving, children: [
         isSaving && /* @__PURE__ */ jsx(ProfileSpinner, {}),
         isSaving ? "Saving..." : "Save"
       ] })
@@ -5651,7 +5631,7 @@ function UserButton({
   const menuRef = useRef(null);
   useEffect(() => {
     setImageError(false);
-    const avatarUrl = user?.avatarUrl;
+    const avatarUrl = user?.profile?.avatar_url;
     if (!avatarUrl) {
       return;
     }
@@ -5672,7 +5652,7 @@ function UserButton({
       }
     };
     void checkImageUrl();
-  }, [user?.avatarUrl]);
+  }, [user?.profile?.avatar_url]);
   useEffect(() => {
     if (isOpen && dropdownRef.current) {
       const buttonRect = dropdownRef.current.getBoundingClientRect();
@@ -5716,7 +5696,7 @@ function UserButton({
   if (!user) {
     return null;
   }
-  const initials = user.name ? user.name.charAt(0).toUpperCase() : user.email.split("@")[0].slice(0, 2).toUpperCase();
+  const initials = user.profile?.name ? user.profile.name.charAt(0).toUpperCase() : user.email.split("@")[0].slice(0, 2).toUpperCase();
   return /* @__PURE__ */ jsxs(UserButtonContainer, { ref: dropdownRef, children: [
     /* @__PURE__ */ jsxs(
       UserButtonButton,
@@ -5726,16 +5706,16 @@ function UserButton({
         "aria-expanded": isOpen,
         "aria-haspopup": "true",
         children: [
-          /* @__PURE__ */ jsx(UserButtonAvatar, { children: user.avatarUrl && !imageError ? /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx(UserButtonAvatar, { children: user.profile?.avatar_url && !imageError ? /* @__PURE__ */ jsx(
             UserButtonAvatarImage,
             {
-              src: user.avatarUrl,
+              src: user.profile.avatar_url,
               alt: user.email,
               onError: () => setImageError(true)
             }
           ) : /* @__PURE__ */ jsx(UserButtonAvatarInitials, { children: initials }) }),
           mode === "detailed" && /* @__PURE__ */ jsxs(UserButtonInfo, { children: [
-            user.name && /* @__PURE__ */ jsx(UserButtonName, { children: user.name }),
+            user.profile?.name && /* @__PURE__ */ jsx(UserButtonName, { children: user.profile.name }),
             /* @__PURE__ */ jsx(UserButtonEmail, { children: user.email })
           ] })
         ]
@@ -5760,13 +5740,7 @@ function UserButton({
         "Sign out"
       ] }) })
     ] }),
-    showProfileModal && /* @__PURE__ */ jsx(
-      UserProfileModal,
-      {
-        onClose: () => setShowProfileModal(false),
-        onError: onProfileError
-      }
-    )
+    showProfileModal && /* @__PURE__ */ jsx(UserProfileModal, { onClose: () => setShowProfileModal(false), onError: onProfileError })
   ] });
 }
 function Protect({