@thetechfossil/auth2 1.2.15 → 1.2.17

package/dist/index.next.js

@@ -3,13 +3,13 @@
 
 var axios = require('axios');
 var upfiles = require('@thetechfossil/upfiles');
-var React3 = require('react');
+var React = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var axios__default = /*#__PURE__*/_interopDefault(axios);
-var React3__default = /*#__PURE__*/_interopDefault(React3);
+var React__default = /*#__PURE__*/_interopDefault(React);
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
@@ -69,6 +69,11 @@ var HttpClient = class {
             return Promise.reject(refreshError);
           }
         }
+        if (error.response && error.response.data && error.response.data.message) {
+          const customError = new Error(error.response.data.message);
+          customError.response = error.response;
+          return Promise.reject(customError);
+        }
         return Promise.reject(error);
       }
     );
@@ -506,11 +511,11 @@ var AuthService = class {
   }
 };
 var useAuth = (config) => {
-  const [authService] = React3.useState(() => new AuthService(config));
-  const [user, setUser] = React3.useState(null);
-  const [isAuthenticated, setIsAuthenticated] = React3.useState(false);
-  const [loading, setLoading] = React3.useState(true);
-  const checkAuthStatus = React3.useCallback(() => {
+  const [authService] = React.useState(() => new AuthService(config));
+  const [user, setUser] = React.useState(null);
+  const [isAuthenticated, setIsAuthenticated] = React.useState(false);
+  const [loading, setLoading] = React.useState(true);
+  const checkAuthStatus = React.useCallback(() => {
     const authenticated = authService.isAuthenticated();
     setIsAuthenticated(authenticated);
     if (authenticated) {
@@ -521,10 +526,10 @@ var useAuth = (config) => {
     }
     setLoading(false);
   }, [authService]);
-  React3.useEffect(() => {
+  React.useEffect(() => {
     checkAuthStatus();
   }, [checkAuthStatus]);
-  const register = React3.useCallback(async (data) => {
+  const register = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.register(data);
@@ -533,7 +538,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const login = React3.useCallback(async (data) => {
+  const login = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.login(data);
@@ -546,7 +551,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const verify = React3.useCallback(async (data) => {
+  const verify = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.verify(data);
@@ -559,7 +564,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const verifyEmailToken = React3.useCallback(async (token) => {
+  const verifyEmailToken = React.useCallback(async (token) => {
     setLoading(true);
     try {
       const response = await authService.verifyEmailToken(token);
@@ -572,7 +577,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const logout = React3.useCallback(async () => {
+  const logout = React.useCallback(async () => {
     setLoading(true);
     try {
       await authService.logout();
@@ -582,7 +587,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const updateProfile = React3.useCallback(async (data) => {
+  const updateProfile = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.updateProfile(data);
@@ -594,7 +599,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getProfile = React3.useCallback(async () => {
+  const getProfile = React.useCallback(async () => {
     setLoading(true);
     try {
       const userData = await authService.getProfile();
@@ -604,7 +609,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getAllUsers = React3.useCallback(async () => {
+  const getAllUsers = React.useCallback(async () => {
     setLoading(true);
     try {
       return await authService.getAllUsers();
@@ -612,7 +617,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getUserById = React3.useCallback(async (id) => {
+  const getUserById = React.useCallback(async (id) => {
     setLoading(true);
     try {
       return await authService.getUserById(id);
@@ -620,7 +625,7 @@ var useAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const uploadAndUpdateAvatar = React3.useCallback(async (file) => {
+  const uploadAndUpdateAvatar = React.useCallback(async (file) => {
     setLoading(true);
     try {
       const response = await authService.uploadAndUpdateAvatar(file);
@@ -648,11 +653,11 @@ var useAuth = (config) => {
     uploadAndUpdateAvatar
   };
 };
-var ThemeContext = React3.createContext({ theme: "light", mounted: false });
+var ThemeContext = React__default.default.createContext({ theme: "light", mounted: false });
 function AuthThemeProvider({ children }) {
-  const [theme, setTheme] = React3.useState("light");
-  const [mounted, setMounted] = React3.useState(false);
-  React3.useEffect(() => {
+  const [theme, setTheme] = React.useState("light");
+  const [mounted, setMounted] = React.useState(false);
+  React.useEffect(() => {
     const detectTheme = () => {
       const htmlElement = document.documentElement;
       const bodyElement = document.body;
@@ -697,9 +702,9 @@ function AuthThemeProvider({ children }) {
   return /* @__PURE__ */ jsxRuntime.jsx(ThemeContext.Provider, { value: { theme, mounted }, children });
 }
 function useAuthTheme() {
-  return React3.useContext(ThemeContext);
+  return React.useContext(ThemeContext);
 }
-var AuthContext = React3.createContext(void 0);
+var AuthContext = React.createContext(void 0);
 var AuthProvider = ({ children, config }) => {
   const authConfig = {
     baseUrl: config?.baseUrl || (typeof window !== "undefined" ? process.env.NEXT_PUBLIC_AUTH_API_URL || process.env.REACT_APP_AUTH_API_URL || "http://localhost:7000" : "http://localhost:7000"),
@@ -707,29 +712,35 @@ var AuthProvider = ({ children, config }) => {
     csrfEnabled: config?.csrfEnabled !== void 0 ? config.csrfEnabled : true,
     upfilesConfig: config?.upfilesConfig
   };
-  const [authService] = React3.useState(() => new AuthService(authConfig));
-  const [user, setUser] = React3.useState(null);
-  const [isLoaded, setIsLoaded] = React3.useState(false);
-  const [loading, setLoading] = React3.useState(false);
-  const checkAuthStatus = React3.useCallback(async () => {
+  const [authService] = React.useState(() => new AuthService(authConfig));
+  const [user, setUser] = React.useState(null);
+  const [isLoaded, setIsLoaded] = React.useState(false);
+  const [loading, setLoading] = React.useState(false);
+  const checkAuthStatus = React.useCallback(async () => {
     const authenticated = authService.isAuthenticated();
     if (authenticated) {
       try {
-        const currentUser = authService.getCurrentUser();
-        setUser(currentUser);
+        const freshUser = await authService.getProfile();
+        setUser(freshUser);
       } catch (error) {
-        console.error("Failed to get current user:", error);
-        setUser(null);
+        console.error("Failed to fetch fresh user profile, falling back to token:", error);
+        try {
+          const currentUser = authService.getCurrentUser();
+          setUser(currentUser);
+        } catch (fallbackError) {
+          console.error("Failed to get current user from token:", fallbackError);
+          setUser(null);
+        }
       }
     } else {
       setUser(null);
     }
     setIsLoaded(true);
   }, [authService]);
-  React3.useEffect(() => {
+  React.useEffect(() => {
     checkAuthStatus();
   }, [checkAuthStatus]);
-  const signIn = React3.useCallback(async (data) => {
+  const signIn = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.login(data);
@@ -741,7 +752,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const signUp = React3.useCallback(async (data) => {
+  const signUp = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.register(data);
@@ -750,7 +761,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const signOut = React3.useCallback(async () => {
+  const signOut = React.useCallback(async () => {
     setLoading(true);
     try {
       await authService.logout();
@@ -759,7 +770,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const verify = React3.useCallback(async (data) => {
+  const verify = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.verify(data);
@@ -771,7 +782,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const verifyEmailToken = React3.useCallback(async (token) => {
+  const verifyEmailToken = React.useCallback(async (token) => {
     setLoading(true);
     try {
       const response = await authService.verifyEmailToken(token);
@@ -783,7 +794,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const updateProfile = React3.useCallback(async (data) => {
+  const updateProfile = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.updateProfile(data);
@@ -795,7 +806,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const getProfile = React3.useCallback(async () => {
+  const getProfile = React.useCallback(async () => {
     setLoading(true);
     try {
       const userData = await authService.getProfile();
@@ -805,13 +816,13 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const signInWithOAuth = React3.useCallback((provider) => {
+  const signInWithOAuth = React.useCallback((provider) => {
     authService.loginWithOAuth(provider);
   }, [authService]);
-  const linkOAuthProvider = React3.useCallback((provider) => {
+  const linkOAuthProvider = React.useCallback((provider) => {
     authService.linkOAuthProvider(provider);
   }, [authService]);
-  const unlinkOAuthProvider = React3.useCallback(async (provider) => {
+  const unlinkOAuthProvider = React.useCallback(async (provider) => {
     setLoading(true);
     try {
       return await authService.unlinkOAuthProvider(provider);
@@ -819,7 +830,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const forgotPassword = React3.useCallback(async (email) => {
+  const forgotPassword = React.useCallback(async (email) => {
     setLoading(true);
     try {
       return await authService.forgotPassword(email);
@@ -827,7 +838,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const resetPassword = React3.useCallback(async (token, password) => {
+  const resetPassword = React.useCallback(async (token, password) => {
     setLoading(true);
     try {
       return await authService.resetPassword(token, password);
@@ -835,7 +846,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const changePassword = React3.useCallback(async (oldPassword, newPassword) => {
+  const changePassword = React.useCallback(async (oldPassword, newPassword) => {
     setLoading(true);
     try {
       return await authService.changePassword(oldPassword, newPassword);
@@ -843,7 +854,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const updateAvatar = React3.useCallback(async (avatar) => {
+  const updateAvatar = React.useCallback(async (avatar) => {
     setLoading(true);
     try {
       const response = await authService.updateAvatar(avatar);
@@ -855,7 +866,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const uploadAndUpdateAvatar = React3.useCallback(async (file) => {
+  const uploadAndUpdateAvatar = React.useCallback(async (file) => {
     setLoading(true);
     try {
       const response = await authService.uploadAndUpdateAvatar(file);
@@ -867,7 +878,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const requestEmailChange = React3.useCallback(async (newEmail) => {
+  const requestEmailChange = React.useCallback(async (newEmail) => {
     setLoading(true);
     try {
       return await authService.requestEmailChange(newEmail);
@@ -875,7 +886,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const verifyEmailChange = React3.useCallback(async (token) => {
+  const verifyEmailChange = React.useCallback(async (token) => {
     setLoading(true);
     try {
       const response = await authService.verifyEmailChange(token);
@@ -887,7 +898,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const generate2FA = React3.useCallback(async () => {
+  const generate2FA = React.useCallback(async () => {
     setLoading(true);
     try {
       return await authService.generate2FA();
@@ -895,7 +906,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const enable2FA = React3.useCallback(async (token) => {
+  const enable2FA = React.useCallback(async (token) => {
     setLoading(true);
     try {
       return await authService.enable2FA(token);
@@ -903,7 +914,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const disable2FA = React3.useCallback(async (token) => {
+  const disable2FA = React.useCallback(async (token) => {
     setLoading(true);
     try {
       return await authService.disable2FA(token);
@@ -911,7 +922,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const validate2FA = React3.useCallback(async (token) => {
+  const validate2FA = React.useCallback(async (token) => {
     setLoading(true);
     try {
       return await authService.validate2FA(token);
@@ -919,7 +930,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const getSessions = React3.useCallback(async () => {
+  const getSessions = React.useCallback(async () => {
     setLoading(true);
     try {
       return await authService.getSessions();
@@ -927,7 +938,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const revokeSession = React3.useCallback(async (sessionId) => {
+  const revokeSession = React.useCallback(async (sessionId) => {
     setLoading(true);
     try {
       return await authService.revokeSession(sessionId);
@@ -935,7 +946,7 @@ var AuthProvider = ({ children, config }) => {
       setLoading(false);
     }
   }, [authService]);
-  const revokeAllSessions = React3.useCallback(async () => {
+  const revokeAllSessions = React.useCallback(async () => {
     setLoading(true);
     try {
       const response = await authService.revokeAllSessions();
@@ -979,7 +990,7 @@ var AuthProvider = ({ children, config }) => {
   return /* @__PURE__ */ jsxRuntime.jsx(AuthContext.Provider, { value, children: /* @__PURE__ */ jsxRuntime.jsx(AuthThemeProvider, { children }) });
 };
 var useAuth2 = () => {
-  const context = React3.useContext(AuthContext);
+  const context = React.useContext(AuthContext);
   if (context === void 0) {
     throw new Error("useAuth must be used within an AuthProvider");
   }
@@ -1035,7 +1046,7 @@ try {
 } catch (error) {
   console.warn("react-phone-number-input not available, using fallback");
 }
-var CustomPhoneInput = React3__default.default.forwardRef((props, ref) => /* @__PURE__ */ jsxRuntime.jsx(
+var CustomPhoneInput = React__default.default.forwardRef((props, ref) => /* @__PURE__ */ jsxRuntime.jsx(
   "input",
   {
     ...props,
@@ -1054,8 +1065,8 @@ var PhoneInput = ({
   style = {}
 }) => {
   const colors = useThemeColors();
-  const [defaultCountry, setDefaultCountry] = React3.useState("US");
-  const styleContent = React3.useMemo(() => `
+  const [defaultCountry, setDefaultCountry] = React.useState("US");
+  const styleContent = React.useMemo(() => `
     .PhoneInput {
       display: flex;
       align-items: center;
@@ -1167,7 +1178,7 @@ var PhoneInput = ({
       opacity: 0.6;
     }
   `, [colors]);
-  React3.useEffect(() => {
+  React.useEffect(() => {
     const detectCountry = async () => {
       try {
         const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -1224,7 +1235,7 @@ var PhoneInput = ({
     };
     detectCountry();
   }, []);
-  const handleChange = React3.useMemo(() => (val) => {
+  const handleChange = React.useMemo(() => (val) => {
     onChange(val || "");
   }, [onChange]);
   if (!PhoneInputWithCountry) {
@@ -1288,15 +1299,15 @@ var LoginForm = ({
   showOAuthButtons = true
 }) => {
   const colors = useThemeColors();
-  const [email, setEmail] = React3.useState("");
-  const [phoneNumber, setPhoneNumber] = React3.useState("");
-  const [usePhone, setUsePhone] = React3.useState(false);
-  const [password, setPassword] = React3.useState("");
-  const [usePassword, setUsePassword] = React3.useState(false);
-  const [showPassword, setShowPassword] = React3.useState(false);
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [rememberMe, setRememberMe] = React3.useState(false);
+  const [email, setEmail] = React.useState("");
+  const [phoneNumber, setPhoneNumber] = React.useState("");
+  const [usePhone, setUsePhone] = React.useState(false);
+  const [password, setPassword] = React.useState("");
+  const [usePassword, setUsePassword] = React.useState(false);
+  const [showPassword, setShowPassword] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [rememberMe, setRememberMe] = React.useState(false);
   const { login } = useAuth({
     baseUrl: config?.baseUrl || "http://localhost:7000"
   });
@@ -1750,15 +1761,15 @@ var RegisterForm = ({
   invitationToken
 }) => {
   const colors = useThemeColors();
-  const [name, setName] = React3.useState("");
-  const [email, setEmail] = React3.useState("");
-  const [phoneNumber, setPhoneNumber] = React3.useState("");
-  const [password, setPassword] = React3.useState("");
-  const [confirmPassword, setConfirmPassword] = React3.useState("");
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [showPassword, setShowPassword] = React3.useState(false);
-  const [showConfirmPassword, setShowConfirmPassword] = React3.useState(false);
+  const [name, setName] = React.useState("");
+  const [email, setEmail] = React.useState("");
+  const [phoneNumber, setPhoneNumber] = React.useState("");
+  const [password, setPassword] = React.useState("");
+  const [confirmPassword, setConfirmPassword] = React.useState("");
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [showPassword, setShowPassword] = React.useState(false);
+  const [showConfirmPassword, setShowConfirmPassword] = React.useState(false);
   const getPasswordStrength = (pwd) => {
     if (!pwd) return { strength: "weak", score: 0, label: "" };
     let score = 0;
@@ -2214,11 +2225,11 @@ var OtpForm = ({
   baseUrl
 }) => {
   const colors = useThemeColors();
-  const [otp, setOtp] = React3.useState("");
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [resendCooldown, setResendCooldown] = React3.useState(0);
-  const [resendLoading, setResendLoading] = React3.useState(false);
+  const [otp, setOtp] = React.useState("");
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [resendCooldown, setResendCooldown] = React.useState(0);
+  const [resendLoading, setResendLoading] = React.useState(false);
   const { verify, login } = useAuth({
     baseUrl: baseUrl || process.env.NEXT_PUBLIC_AUTH_API_URL || "http://localhost:7000"
   });
@@ -2429,9 +2440,9 @@ var AuthFlow = ({
   initialStep = "login",
   showTitle = true
 }) => {
-  const [step, setStep] = React3.useState(initialStep);
-  const [email, setEmail] = React3.useState("");
-  const [message, setMessage] = React3.useState(null);
+  const [step, setStep] = React.useState(initialStep);
+  const [email, setEmail] = React.useState("");
+  const [message, setMessage] = React.useState(null);
   const handleLoginSuccess = (email2, needsOtpVerification) => {
     setEmail(email2);
     if (needsOtpVerification) {
@@ -2566,13 +2577,13 @@ var EmailVerificationPage = ({
   onVerificationError,
   baseUrl
 }) => {
-  const [isLoading, setIsLoading] = React3.useState(true);
-  const [message, setMessage] = React3.useState("");
-  const [isSuccess, setIsSuccess] = React3.useState(false);
+  const [isLoading, setIsLoading] = React.useState(true);
+  const [message, setMessage] = React.useState("");
+  const [isSuccess, setIsSuccess] = React.useState(false);
   const { verifyEmailToken } = useAuth({
     baseUrl: baseUrl || (typeof window !== "undefined" ? window.location.origin : "http://localhost:7000")
   });
-  React3.useEffect(() => {
+  React.useEffect(() => {
     const verifyEmail = async () => {
       if (!token) {
         setIsLoading(false);
@@ -2677,7 +2688,7 @@ var EmailVerificationPage = ({
     ] })
   ] }) });
 };
-var ThemeWrapper = React3.forwardRef(
+var ThemeWrapper = React.forwardRef(
   ({ children, className = "", style }, ref) => {
     const { theme, mounted } = useAuthTheme();
     if (!mounted) {
@@ -2690,18 +2701,18 @@ ThemeWrapper.displayName = "ThemeWrapper";
 var SignIn = ({ redirectUrl, appearance }) => {
   const { signIn, isSignedIn, loading: authLoading } = useAuth2();
   const colors = useThemeColors();
-  const [email, setEmail] = React3.useState("");
-  const [phoneNumber, setPhoneNumber] = React3.useState("");
-  const [password, setPassword] = React3.useState("");
-  const [otp, setOtp] = React3.useState("");
-  const [usePassword, setUsePassword] = React3.useState(false);
-  const [usePhone, setUsePhone] = React3.useState(false);
-  const [showPassword, setShowPassword] = React3.useState(false);
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [needsOtp, setNeedsOtp] = React3.useState(false);
-  const [success, setSuccess] = React3.useState(null);
-  React3.useEffect(() => {
+  const [email, setEmail] = React.useState("");
+  const [phoneNumber, setPhoneNumber] = React.useState("");
+  const [password, setPassword] = React.useState("");
+  const [otp, setOtp] = React.useState("");
+  const [usePassword, setUsePassword] = React.useState(false);
+  const [usePhone, setUsePhone] = React.useState(false);
+  const [showPassword, setShowPassword] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [needsOtp, setNeedsOtp] = React.useState(false);
+  const [success, setSuccess] = React.useState(null);
+  React.useEffect(() => {
     if (isSignedIn && redirectUrl) {
       const redirect = redirectUrl || process.env.NEXT_PUBLIC_AUTH_REDIRECT_AFTER_LOGIN || process.env.REACT_APP_AUTH_REDIRECT_AFTER_LOGIN || "/dashboard";
       const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_BASE_URL || process.env.REACT_APP_FRONTEND_BASE_URL || (typeof window !== "undefined" ? window.location.origin : "");
@@ -3092,16 +3103,16 @@ var SignIn = ({ redirectUrl, appearance }) => {
 var SignUp = ({ redirectUrl, appearance }) => {
   const { signUp, isSignedIn } = useAuth2();
   const colors = useThemeColors();
-  const [name, setName] = React3.useState("");
-  const [email, setEmail] = React3.useState("");
-  const [phoneNumber, setPhoneNumber] = React3.useState("");
-  const [password, setPassword] = React3.useState("");
-  const [confirmPassword, setConfirmPassword] = React3.useState("");
-  const [showPassword, setShowPassword] = React3.useState(false);
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [success, setSuccess] = React3.useState(null);
-  React3.useEffect(() => {
+  const [name, setName] = React.useState("");
+  const [email, setEmail] = React.useState("");
+  const [phoneNumber, setPhoneNumber] = React.useState("");
+  const [password, setPassword] = React.useState("");
+  const [confirmPassword, setConfirmPassword] = React.useState("");
+  const [showPassword, setShowPassword] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [success, setSuccess] = React.useState(null);
+  React.useEffect(() => {
     if (isSignedIn && redirectUrl) {
       const redirect = redirectUrl || process.env.NEXT_PUBLIC_AUTH_REDIRECT_AFTER_REGISTER || process.env.REACT_APP_AUTH_REDIRECT_AFTER_REGISTER || "/dashboard";
       const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_BASE_URL || process.env.REACT_APP_FRONTEND_BASE_URL || (typeof window !== "undefined" ? window.location.origin : "");
@@ -3455,7 +3466,7 @@ var SignUp = ({ redirectUrl, appearance }) => {
 };
 var SignOut = ({ redirectUrl }) => {
   const { signOut } = useAuth2();
-  React3.useEffect(() => {
+  React.useEffect(() => {
     const performSignOut = async () => {
       await signOut();
       const redirect = redirectUrl || process.env.NEXT_PUBLIC_AUTH_REDIRECT_AFTER_LOGOUT || process.env.REACT_APP_AUTH_REDIRECT_AFTER_LOGOUT || "/";
@@ -3469,9 +3480,9 @@ var SignOut = ({ redirectUrl }) => {
 var UserButton = ({ showName = false, appearance }) => {
   const { user, signOut } = useAuth2();
   const colors = useThemeColors();
-  const [isOpen, setIsOpen] = React3.useState(false);
-  const dropdownRef = React3.useRef(null);
-  React3.useEffect(() => {
+  const [isOpen, setIsOpen] = React.useState(false);
+  const dropdownRef = React.useRef(null);
+  React.useEffect(() => {
     const handleClickOutside = (event) => {
       if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
         setIsOpen(false);
@@ -3514,7 +3525,19 @@ var UserButton = ({ showName = false, appearance }) => {
           e.currentTarget.style.backgroundColor = "transparent";
         },
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { style: {
+          user.avatar ? /* @__PURE__ */ jsxRuntime.jsx(
+            "img",
+            {
+              src: user.avatar,
+              alt: user.name,
+              style: {
+                width: "36px",
+                height: "36px",
+                borderRadius: "50%",
+                objectFit: "cover"
+              }
+            }
+          ) : /* @__PURE__ */ jsxRuntime.jsx("div", { style: {
             width: "36px",
             height: "36px",
             borderRadius: "50%",
@@ -3551,7 +3574,19 @@ var UserButton = ({ showName = false, appearance }) => {
         alignItems: "center",
         gap: "12px"
       }, children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { style: {
+        user.avatar ? /* @__PURE__ */ jsxRuntime.jsx(
+          "img",
+          {
+            src: user.avatar,
+            alt: user.name,
+            style: {
+              width: "48px",
+              height: "48px",
+              borderRadius: "50%",
+              objectFit: "cover"
+            }
+          }
+        ) : /* @__PURE__ */ jsxRuntime.jsx("div", { style: {
           width: "48px",
           height: "48px",
           borderRadius: "50%",
@@ -3616,7 +3651,7 @@ var ProtectedRoute = ({
   redirectTo
 }) => {
   const { isSignedIn, isLoaded } = useAuth2();
-  React3.useEffect(() => {
+  React.useEffect(() => {
     if (isLoaded && !isSignedIn) {
       const loginPath = redirectTo || process.env.NEXT_PUBLIC_AUTH_REDIRECT_TO_LOGIN || process.env.REACT_APP_AUTH_REDIRECT_TO_LOGIN || "/auth/login";
       const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_BASE_URL || process.env.REACT_APP_FRONTEND_BASE_URL || (typeof window !== "undefined" ? window.location.origin : "");
@@ -3641,7 +3676,7 @@ var PublicRoute = ({
   redirectTo
 }) => {
   const { isSignedIn, isLoaded } = useAuth2();
-  React3.useEffect(() => {
+  React.useEffect(() => {
     if (isLoaded && isSignedIn) {
       const dashboardPath = redirectTo || process.env.NEXT_PUBLIC_AUTH_REDIRECT_AFTER_LOGIN || process.env.REACT_APP_AUTH_REDIRECT_AFTER_LOGIN || "/dashboard";
       const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_BASE_URL || process.env.REACT_APP_FRONTEND_BASE_URL || (typeof window !== "undefined" ? window.location.origin : "");
@@ -3663,9 +3698,9 @@ var PublicRoute = ({
 };
 var VerifyEmail = ({ token, onSuccess, onError }) => {
   const { verifyEmailToken } = useAuth2();
-  const [status, setStatus] = React3.useState("loading");
-  const [message, setMessage] = React3.useState("");
-  React3.useEffect(() => {
+  const [status, setStatus] = React.useState("loading");
+  const [message, setMessage] = React.useState("");
+  React.useEffect(() => {
     const verify = async () => {
       const verifyToken = token || (typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("token") : null);
       if (!verifyToken) {
@@ -3799,10 +3834,10 @@ var VerifyEmail = ({ token, onSuccess, onError }) => {
 };
 var ForgotPassword = ({ appearance }) => {
   const { forgotPassword } = useAuth2();
-  const [email, setEmail] = React3.useState("");
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [success, setSuccess] = React3.useState(null);
+  const [email, setEmail] = React.useState("");
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [success, setSuccess] = React.useState(null);
   const handleSubmit = async (e) => {
     e.preventDefault();
     setIsLoading(true);
@@ -3941,14 +3976,14 @@ var ForgotPassword = ({ appearance }) => {
 };
 var ResetPassword = ({ token, appearance }) => {
   const { resetPassword } = useAuth2();
-  const [resetToken, setResetToken] = React3.useState(token || "");
-  const [password, setPassword] = React3.useState("");
-  const [confirmPassword, setConfirmPassword] = React3.useState("");
-  const [showPassword, setShowPassword] = React3.useState(false);
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [success, setSuccess] = React3.useState(false);
-  React3.useEffect(() => {
+  const [resetToken, setResetToken] = React.useState(token || "");
+  const [password, setPassword] = React.useState("");
+  const [confirmPassword, setConfirmPassword] = React.useState("");
+  const [showPassword, setShowPassword] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [success, setSuccess] = React.useState(false);
+  React.useEffect(() => {
     if (!resetToken && typeof window !== "undefined") {
       const urlToken = new URLSearchParams(window.location.search).get("token");
       if (urlToken) {
@@ -4195,13 +4230,13 @@ var ResetPassword = ({ token, appearance }) => {
 };
 var ChangePassword = ({ onSuccess, appearance }) => {
   const { changePassword } = useAuth2();
-  const [oldPassword, setOldPassword] = React3.useState("");
-  const [newPassword, setNewPassword] = React3.useState("");
-  const [confirmPassword, setConfirmPassword] = React3.useState("");
-  const [showPasswords, setShowPasswords] = React3.useState(false);
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [success, setSuccess] = React3.useState(false);
+  const [oldPassword, setOldPassword] = React.useState("");
+  const [newPassword, setNewPassword] = React.useState("");
+  const [confirmPassword, setConfirmPassword] = React.useState("");
+  const [showPasswords, setShowPasswords] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [success, setSuccess] = React.useState(false);
   const getPasswordStrength = (pwd) => {
     if (!pwd) return { strength: "weak", color: "#ddd" };
     let score = 0;
@@ -4431,6 +4466,68 @@ var ChangePassword = ({ onSuccess, appearance }) => {
     )
   ] }) });
 };
+
+// src/react/components/utils/injectModalStyles.ts
+var injectModalStyles = () => {
+  if (document.getElementById("ttf-auth-modal-styles")) {
+    return;
+  }
+  const styleElement = document.createElement("style");
+  styleElement.id = "ttf-auth-modal-styles";
+  styleElement.textContent = `
+    /* ImageManager Modal Styles - Critical for proper modal display */
+    /* Radix UI Dialog styles - Force visibility */
+    [data-radix-portal] {
+      z-index: 99999 !important;
+      position: fixed !important;
+      inset: 0 !important;
+      pointer-events: none !important;
+    }
+
+    [data-radix-portal] > * {
+      pointer-events: auto !important;
+    }
+
+    /* Dialog Overlay */
+    [data-state="open"][data-radix-dialog-overlay],
+    [role="dialog"] + [data-radix-dialog-overlay] {
+      position: fixed !important;
+      inset: 0 !important;
+      z-index: 99998 !important;
+      background-color: rgba(0, 0, 0, 0.6) !important;
+      pointer-events: auto !important;
+    }
+
+    /* Dialog Content - Center the modal properly */
+    [data-state="open"][data-radix-dialog-content],
+    [role="dialog"][data-radix-dialog-content] {
+      position: fixed !important;
+      left: 50% !important;
+      top: 50% !important;
+      transform: translate(-50%, -50%) !important;
+      z-index: 99999 !important;
+      background: white !important;
+      border-radius: 16px !important;
+      box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25) !important;
+      pointer-events: auto !important;
+      width: 95vw !important;
+      max-width: 1280px !important;
+      height: 90vh !important;
+      max-height: 90vh !important;
+      min-width: 800px !important;
+      min-height: 600px !important;
+      overflow: hidden !important;
+    }
+
+    /* Dark mode support */
+    .dark [data-state="open"][data-radix-dialog-content],
+    .dark [role="dialog"][data-radix-dialog-content] {
+      background: #0f172a !important;
+      border: 1px solid #334155 !important;
+    }
+  `;
+  document.head.appendChild(styleElement);
+};
 var AvatarUploader = ({
   onUploadComplete,
   onError,
@@ -4441,32 +4538,30 @@ var AvatarUploader = ({
   upfilesConfig,
   buttonText = "Upload Avatar"
 }) => {
-  const { uploadAndUpdateAvatar } = useAuth2();
-  const [open, setOpen] = React3.useState(false);
-  const [uploading, setUploading] = React3.useState(false);
+  const { user, updateProfile } = useAuth2();
+  const [open, setOpen] = React.useState(false);
+  const [uploading, setUploading] = React.useState(false);
+  React.useEffect(() => {
+    injectModalStyles();
+  }, []);
+  const effectiveFolderPath = React.useMemo(() => {
+    if (user?.id) {
+      return `users/${user.id}/`;
+    }
+    return upfilesConfig.folderPath || "/";
+  }, [user?.id, upfilesConfig.folderPath]);
   const handleSelect = async (image) => {
     setUploading(true);
     try {
-      const proxyUrl = `${upfilesConfig.baseUrl}/api/download?fileKey=${encodeURIComponent(image.key)}`;
-      const response = await fetch(proxyUrl, {
-        headers: upfilesConfig.apiKey ? {
-          [upfilesConfig.apiKeyHeader || "authorization"]: upfilesConfig.apiKey.startsWith("upk_") ? `Bearer ${upfilesConfig.apiKey}` : upfilesConfig.apiKey
-        } : {}
-      });
-      if (!response.ok) {
-        throw new Error("Failed to fetch image");
-      }
-      const blob = await response.blob();
-      const file = new File([blob], image.originalName, { type: image.contentType });
-      const result = await uploadAndUpdateAvatar(file);
-      if (result.success && result.user?.avatar) {
-        onUploadComplete?.(result.user.avatar);
+      const response = await updateProfile({ avatar: image.url });
+      if (response.success && response.user?.avatar) {
+        onUploadComplete?.(response.user.avatar);
         setOpen(false);
       } else {
-        throw new Error(result.message || "Failed to update avatar");
+        throw new Error(response.message || "Failed to update avatar");
       }
     } catch (error) {
-      const err = error instanceof Error ? error : new Error("Upload failed");
+      const err = error instanceof Error ? error : new Error("Failed to update avatar");
       onError?.(err);
     } finally {
       setUploading(false);
@@ -4496,7 +4591,7 @@ var AvatarUploader = ({
           presignPath: upfilesConfig.presignPath
         },
         projectId: upfilesConfig.projectId,
-        folderPath: upfilesConfig.folderPath || "avatars/",
+        folderPath: effectiveFolderPath,
         title: "Select Avatar",
         description: "Upload a new avatar or select from existing images.",
         mode: "full",
@@ -4517,12 +4612,12 @@ var UserProfile = ({
 }) => {
   const { user, updateProfile, requestEmailChange } = useAuth2();
   const colors = useThemeColors();
-  const [name, setName] = React3.useState(user?.name || "");
-  const [phoneNumber, setPhoneNumber] = React3.useState(user?.phoneNumber || "");
-  const [newEmail, setNewEmail] = React3.useState("");
-  const [isLoading, setIsLoading] = React3.useState(false);
-  const [error, setError] = React3.useState(null);
-  const [success, setSuccess] = React3.useState(null);
+  const [name, setName] = React.useState(user?.name || "");
+  const [phoneNumber, setPhoneNumber] = React.useState(user?.phoneNumber || "");
+  const [newEmail, setNewEmail] = React.useState("");
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [error, setError] = React.useState(null);
+  const [success, setSuccess] = React.useState(null);
   const handleUpdateProfile = async (e) => {
     e.preventDefault();
     setIsLoading(true);
@@ -4813,12 +4908,27 @@ var AvatarManager = ({
   gridClassName,
   maxFileSize = 5 * 1024 * 1024,
   // 5MB default
+  maxFiles = 10,
   mode = "full",
   showDelete = false,
+  autoRecordToDb = true,
+  fetchThumbnails = true,
+  projectId,
+  deleteUrl,
+  onDelete,
   upfilesConfig
 }) => {
-  const { updateProfile } = useAuth2();
-  const [updating, setUpdating] = React3.useState(false);
+  const { user, updateProfile } = useAuth2();
+  const [updating, setUpdating] = React.useState(false);
+  React.useEffect(() => {
+    injectModalStyles();
+  }, []);
+  const effectiveFolderPath = React.useMemo(() => {
+    if (user?.id) {
+      return `users/${user.id}/`;
+    }
+    return upfilesConfig.folderPath || "/";
+  }, [user?.id, upfilesConfig.folderPath]);
   const handleSelect = async (image) => {
     setUpdating(true);
     try {
@@ -4846,24 +4956,31 @@ var AvatarManager = ({
         apiKey: upfilesConfig.apiKey,
         apiKeyHeader: upfilesConfig.apiKeyHeader || "authorization",
         presignUrl: upfilesConfig.presignUrl,
-        presignPath: upfilesConfig.presignPath
+        presignPath: upfilesConfig.presignPath,
+        headers: upfilesConfig.headers,
+        withCredentials: upfilesConfig.withCredentials
       },
-      folderPath: upfilesConfig.folderPath || "avatars/",
+      projectId,
+      folderPath: effectiveFolderPath,
       title,
       description,
       className,
       gridClassName,
       onSelect: handleSelect,
+      onDelete,
+      deleteUrl,
+      autoRecordToDb,
+      fetchThumbnails,
       maxFileSize,
+      maxFiles,
       mode,
-      showDelete,
-      fetchThumbnails: true
+      showDelete
     }
   );
 };
 var isServer = typeof window === "undefined";
 var useNextAuth = (config) => {
-  const [authService] = React3.useState(() => {
+  const [authService] = React.useState(() => {
     const service = new AuthService(config);
     if (isServer && config.token) {
       service["token"] = config.token;
@@ -4871,10 +4988,10 @@ var useNextAuth = (config) => {
     }
     return service;
   });
-  const [user, setUser] = React3.useState(null);
-  const [isAuthenticated, setIsAuthenticated] = React3.useState(false);
-  const [loading, setLoading] = React3.useState(true);
-  const checkAuthStatus = React3.useCallback(() => {
+  const [user, setUser] = React.useState(null);
+  const [isAuthenticated, setIsAuthenticated] = React.useState(false);
+  const [loading, setLoading] = React.useState(true);
+  const checkAuthStatus = React.useCallback(() => {
     if (isServer) {
       const token = config.token || authService.getToken();
       const authenticated = !!token;
@@ -4902,10 +5019,10 @@ var useNextAuth = (config) => {
     }
     setLoading(false);
   }, [authService, config.token]);
-  React3.useEffect(() => {
+  React.useEffect(() => {
     checkAuthStatus();
   }, [checkAuthStatus]);
-  const register = React3.useCallback(async (data) => {
+  const register = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.register(data);
@@ -4914,7 +5031,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const login = React3.useCallback(async (data) => {
+  const login = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.login(data);
@@ -4923,7 +5040,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const verify = React3.useCallback(async (data) => {
+  const verify = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.verify(data);
@@ -4936,7 +5053,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const verifyEmailToken = React3.useCallback(async (token) => {
+  const verifyEmailToken = React.useCallback(async (token) => {
     setLoading(true);
     try {
       const response = await authService.verifyEmailToken(token);
@@ -4949,7 +5066,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const logout = React3.useCallback(async () => {
+  const logout = React.useCallback(async () => {
     setLoading(true);
     try {
       await authService.logout();
@@ -4959,7 +5076,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const updateProfile = React3.useCallback(async (data) => {
+  const updateProfile = React.useCallback(async (data) => {
     setLoading(true);
     try {
       const response = await authService.updateProfile(data);
@@ -4971,7 +5088,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getProfile = React3.useCallback(async () => {
+  const getProfile = React.useCallback(async () => {
     setLoading(true);
     try {
       const userData = await authService.getProfile();
@@ -4981,7 +5098,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getAllUsers = React3.useCallback(async () => {
+  const getAllUsers = React.useCallback(async () => {
     setLoading(true);
     try {
       return await authService.getAllUsers();
@@ -4989,7 +5106,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const getUserById = React3.useCallback(async (id) => {
+  const getUserById = React.useCallback(async (id) => {
     setLoading(true);
     try {
       return await authService.getUserById(id);
@@ -4997,7 +5114,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const forgotPassword = React3.useCallback(async (email) => {
+  const forgotPassword = React.useCallback(async (email) => {
     setLoading(true);
     try {
       const response = await authService.forgotPassword(email);
@@ -5006,7 +5123,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const resetPassword = React3.useCallback(async (token, password) => {
+  const resetPassword = React.useCallback(async (token, password) => {
     setLoading(true);
     try {
       const response = await authService.resetPassword(token, password);
@@ -5015,7 +5132,7 @@ var useNextAuth = (config) => {
       setLoading(false);
     }
   }, [authService]);
-  const setToken = React3.useCallback((token) => {
+  const setToken = React.useCallback((token) => {
     authService["token"] = token;
     authService["httpClient"].setAuthToken(token);
     setIsAuthenticated(true);
@@ -5027,7 +5144,7 @@ var useNextAuth = (config) => {
       setUser(null);
     }
   }, [authService]);
-  const clearToken = React3.useCallback(() => {
+  const clearToken = React.useCallback(() => {
     authService["token"] = null;
     authService["httpClient"].removeAuthToken();
     setIsAuthenticated(false);