@nocios/crudify-ui 1.0.54 → 1.0.56

package/dist/index.js

@@ -47,7 +47,7 @@ var import_crudify_browser3 = __toESM(require("@nocios/crudify-browser"));
 __reExport(index_exports, require("@nocios/crudify-browser"), module.exports);
 
 // src/components/CrudifyLogin/index.tsx
-var import_react8 = require("react");
+var import_react8 = __toESM(require("react"));
 var import_material5 = require("@mui/material");
 
 // src/components/CrudifyLogin/context/I18nProvider.tsx
@@ -306,7 +306,7 @@ var secureLocalStorage = new SecureStorage("localStorage");
 
 // src/components/CrudifyLogin/Forms/LoginForm.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
-var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/" }) => {
+var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/", searchParams }) => {
   const [username, setUsername] = (0, import_react4.useState)("");
   const [password, setPassword] = (0, import_react4.useState)("");
   const [loading, setLoading] = (0, import_react4.useState)(false);
@@ -319,6 +319,21 @@ var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/
     showErrorNotifications: false,
     showSuccessNotifications: false
   });
+  const getRedirectUrl = () => {
+    if (searchParams) {
+      const redirectParam = searchParams.get("redirect");
+      if (redirectParam) {
+        try {
+          const decodedPath = decodeURIComponent(redirectParam);
+          if (decodedPath.startsWith("/") && !decodedPath.startsWith("//")) {
+            return decodedPath;
+          }
+        } catch (error) {
+        }
+      }
+    }
+    return redirectUrl || "/";
+  };
   (0, import_react4.useEffect)(() => {
     const timer = setTimeout(() => {
       if (usernameInputRef.current) usernameInputRef.current.focus();
@@ -363,9 +378,12 @@ var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/
       setLoading(false);
       if (response.success) {
         secureSessionStorage.setToken(response.data.token);
-        if (onLoginSuccess) {
-          onLoginSuccess(response.data.token, redirectUrl);
-        }
+        const finalRedirectUrl = getRedirectUrl();
+        setTimeout(() => {
+          if (onLoginSuccess) {
+            onLoginSuccess(response.data.token, finalRedirectUrl);
+          }
+        }, 50);
       } else {
         handleLoginError(response);
       }
@@ -500,7 +518,19 @@ var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/
               }
             )
           ] }),
-          config.loginActions?.includes("forgotPassword") && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.Box, { sx: { display: "flex", justifyContent: "flex-end", alignItems: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/forgotPassword"), variant: "body2", color: "secondary", children: t("login.forgotPasswordLink") }) }),
+          config.loginActions?.includes("forgotPassword") && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.Box, { sx: { display: "flex", justifyContent: "flex-end", alignItems: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+            import_material.Link,
+            {
+              sx: { cursor: "pointer" },
+              onClick: () => {
+                const searchString = searchParams ? `?${searchParams.toString()}` : "";
+                onNavigate?.(`/login/forgotPassword${searchString}`);
+              },
+              variant: "body2",
+              color: "secondary",
+              children: t("login.forgotPasswordLink")
+            }
+          ) }),
           /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.Button, { disabled: loading, type: "submit", fullWidth: true, variant: "contained", color: "primary", sx: { mt: 1, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.CircularProgress, { size: 20 }) : t("login.loginButton") })
         ]
       }
@@ -509,7 +539,19 @@ var LoginForm = ({ config, onNavigate, onLoginSuccess, onError, redirectUrl = "/
     config.loginActions?.includes("createUser") && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_material.Typography, { variant: "body2", align: "center", sx: { color: "text.secondary", mt: 3 }, children: [
       t("login.noAccountPrompt"),
       " ",
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_material.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/public/users/create"), fontWeight: "medium", color: "secondary", children: t("login.signUpLink") })
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+        import_material.Link,
+        {
+          sx: { cursor: "pointer" },
+          onClick: () => {
+            const searchString = searchParams ? `?${searchParams.toString()}` : "";
+            onNavigate?.(`/public/users/create${searchString}`);
+          },
+          fontWeight: "medium",
+          color: "secondary",
+          children: t("login.signUpLink")
+        }
+      )
     ] })
   ] });
 };
@@ -555,17 +597,26 @@ var ForgotPasswordForm = ({ config, onNavigate, onError }) => {
           setEmailSent(true);
         }
       } else {
-        if (response.errors) {
-          if (typeof response.errors === "string") {
-            setErrors([response.errors]);
-          } else if (response.errors.email) {
-            setHelperTextEmail(response.errors.email[0]);
+        const errorMessages = [];
+        if (response.data?.response?.status === "TOO_MANY_REQUESTS") {
+          errorMessages.push(t("errors.auth.TOO_MANY_REQUESTS"));
+        } else if (response.errors) {
+          if (response.errors._error) {
+            const errors2 = response.errors._error;
+            const translatedErrors = errors2.map((error) => {
+              if (error === "TOO_MANY_REQUESTS") {
+                return t("errors.auth.TOO_MANY_REQUESTS");
+              }
+              return error;
+            });
+            errorMessages.push(...translatedErrors);
           } else {
-            setErrors([t("error.unknown")]);
+            errorMessages.push(t("error.unknown"));
           }
         } else {
-          setErrors([t("error.unknown")]);
+          errorMessages.push(t("error.unknown"));
         }
+        setErrors(errorMessages);
       }
     } catch (error) {
       console.error("Forgot password error:", error);
@@ -577,38 +628,48 @@ var ForgotPasswordForm = ({ config, onNavigate, onError }) => {
       setLoading(false);
     }
   };
-  const handleFormSubmit = (e) => {
-    e.preventDefault();
-    handleSubmit();
+  const handleBack = () => {
+    onNavigate?.("/login");
   };
-  if (emailSent) {
-    return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { textAlign: "center" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Alert, { severity: "success", sx: { mb: 3 }, children: t("forgotPassword.emailSentMessage") }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { mb: 2 }, children: t("forgotPassword.checkEmailInstructions") }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/checkCode"), variant: "body2", color: "primary", children: t("forgotPassword.enterCodeLink") }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center", gap: 2, mt: 2 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.back") }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { color: "grey.400" }, children: "\u2022" }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/checkCode"), variant: "body2", color: "secondary", children: t("forgotPassword.alreadyHaveCodeLink") })
-      ] })
-    ] });
-  }
-  if (codeAlreadyExists) {
-    return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { textAlign: "center" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Alert, { severity: "info", sx: { mb: 3 }, children: t("forgotPassword.codeAlreadyExistsMessage") }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/checkCode"), variant: "body2", color: "primary", children: t("forgotPassword.enterCodeLink") }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center", gap: 2, mt: 2 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.back") }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { color: "grey.400" }, children: "\u2022" }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/checkCode"), variant: "body2", color: "secondary", children: t("forgotPassword.alreadyHaveCodeLink") })
-      ] })
-    ] });
+  const handleGoToCheckCode = () => {
+    console.log("\u{1F680} handleGoToCheckCode called:", { email, emailSent, codeAlreadyExists });
+    if (emailSent || codeAlreadyExists) {
+      console.log("\u2705 Navigating from success state");
+      onNavigate?.(`/login/checkCode?email=${encodeURIComponent(email)}`);
+      return;
+    }
+    if (!email) {
+      console.log("\u274C Email required");
+      setHelperTextEmail(t("forgotPassword.emailRequired"));
+      return;
+    }
+    if (!validateEmail(email)) {
+      console.log("\u274C Invalid email");
+      setHelperTextEmail(t("forgotPassword.invalidEmail"));
+      return;
+    }
+    console.log("\u2705 Navigating with valid email");
+    onNavigate?.(`/login/checkCode?email=${encodeURIComponent(email)}`);
+  };
+  if (emailSent || codeAlreadyExists) {
+    console.log("\u{1F4E7} Rendering SUCCESS state:", { emailSent, codeAlreadyExists });
+    return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { width: "100%", display: "flex", flexDirection: "column", gap: 2, textAlign: "center" }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { mb: 2 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "h5", component: "h1", sx: { mb: 1, fontWeight: 600 }, children: codeAlreadyExists ? t("forgotPassword.codeAlreadyExistsMessage") : t("forgotPassword.emailSentMessage") }),
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { color: codeAlreadyExists ? "success.main" : "grey.600" }, children: codeAlreadyExists ? t("forgotPassword.checkEmailInstructions") : t("forgotPassword.checkEmailInstructions") })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Button, { type: "button", onClick: handleGoToCheckCode, fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: t("forgotPassword.enterCodeLink") }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: handleBack, variant: "body2", color: "secondary", children: t("common.back") }) })
+    ] }) });
   }
+  console.log("\u{1F4DD} Rendering FORM state");
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "h5", component: "h1", sx: { mb: 3, textAlign: "center" }, children: t("forgotPassword.title") }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { mb: 3, textAlign: "center", color: "text.secondary" }, children: t("forgotPassword.instructions") }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { component: "form", noValidate: true, onSubmit: handleFormSubmit, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { component: "form", noValidate: true, sx: { width: "100%", display: "flex", flexDirection: "column", gap: 2 }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { mb: 2 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "h5", component: "h1", sx: { mb: 1, fontWeight: 600 }, children: t("forgotPassword.title") }),
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { color: "grey.600" }, children: t("forgotPassword.instructions") })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { mb: 1 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
           import_material2.Typography,
           {
@@ -637,14 +698,14 @@ var ForgotPasswordForm = ({ config, onNavigate, onError }) => {
           }
         )
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Button, { disabled: loading, type: "submit", fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.CircularProgress, { size: 20 }) : t("forgotPassword.sendCodeButton") }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Button, { disabled: loading, type: "button", onClick: handleSubmit, fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.CircularProgress, { size: 20 }) : t("forgotPassword.sendCodeButton") }),
       /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_material2.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center", gap: 2 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.back") }),
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: handleBack, variant: "body2", color: "secondary", children: t("common.back") }),
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Typography, { variant: "body2", sx: { color: "grey.400" }, children: "\u2022" }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/checkCode"), variant: "body2", color: "secondary", children: t("forgotPassword.alreadyHaveCodeLink") })
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Link, { sx: { cursor: "pointer" }, onClick: handleGoToCheckCode, variant: "body2", color: "secondary", children: t("login.alreadyHaveCodeLink") })
       ] })
     ] }),
-    errors.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Box, { sx: { mt: 2 }, children: errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Alert, { variant: "filled", severity: "error", children: error }, index)) })
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Box, { children: errors.length > 0 && errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material2.Alert, { variant: "filled", sx: { mt: 2 }, severity: "error", children: error }, index)) })
   ] });
 };
 var ForgotPasswordForm_default = ForgotPasswordForm;
@@ -653,7 +714,7 @@ var ForgotPasswordForm_default = ForgotPasswordForm;
 var import_react6 = require("react");
 var import_material3 = require("@mui/material");
 var import_jsx_runtime4 = require("react/jsx-runtime");
-var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
+var ResetPasswordForm = ({ config, onNavigate, onError, searchParams, onResetSuccess }) => {
   const [newPassword, setNewPassword] = (0, import_react6.useState)("");
   const [confirmPassword, setConfirmPassword] = (0, import_react6.useState)("");
   const [loading, setLoading] = (0, import_react6.useState)(false);
@@ -662,14 +723,15 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
   const [helperTextConfirmPassword, setHelperTextConfirmPassword] = (0, import_react6.useState)(null);
   const [email, setEmail] = (0, import_react6.useState)("");
   const [code, setCode] = (0, import_react6.useState)("");
+  const [fromCodeVerification, setFromCodeVerification] = (0, import_react6.useState)(false);
   const [validatingCode, setValidatingCode] = (0, import_react6.useState)(true);
   const [codeValidated, setCodeValidated] = (0, import_react6.useState)(false);
-  const [resetSuccess, setResetSuccess] = (0, import_react6.useState)(false);
   const { t } = useTranslation();
   const { crudify: crudify3 } = useCrudifyLogin(config);
   (0, import_react6.useEffect)(() => {
     const validateCode = async (emailToValidate, codeToValidate) => {
       if (!crudify3) return;
+      console.log("\u{1F50D} Validating reset code:", { emailToValidate, codeToValidate });
       try {
         const data = [
           {
@@ -677,60 +739,114 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
             data: { email: emailToValidate, codePassword: codeToValidate }
           }
         ];
+        console.log("\u{1F4E4} Sending validation request:", data);
         const response = await crudify3.transaction(data);
+        console.log("\u{1F4E5} Validation response:", response);
         if (response.success) {
+          console.log("\u2705 Code validation successful");
           setCodeValidated(true);
         } else {
-          setErrors([t("resetPassword.invalidCode")]);
+          console.log("\u274C Code validation failed:", response);
+          if (response.data?.response?.status === "TOO_MANY_REQUESTS") {
+            setErrors([t("errors.auth.TOO_MANY_REQUESTS")]);
+          } else {
+            let errorMessage = t("resetPassword.invalidCode");
+            if (response.errors?._error) {
+              const error = response.errors._error[0];
+              if (error === "TOO_MANY_REQUESTS") {
+                errorMessage = t("errors.auth.TOO_MANY_REQUESTS");
+              } else {
+                const errorMsg = error?.toLowerCase() || "";
+                if (errorMsg.includes("expired")) {
+                  errorMessage = t("resetPassword.codeExpiredOrInvalid");
+                } else if (errorMsg.includes("invalid")) {
+                  errorMessage = t("resetPassword.invalidCode");
+                }
+              }
+            }
+            setErrors([errorMessage]);
+          }
+          setTimeout(() => onNavigate?.("/login/forgotPassword"), 3e3);
         }
       } catch (error) {
         console.error("Code validation error:", error);
-        setErrors([t("error.unknown")]);
+        setErrors([t("resetPassword.invalidCode")]);
+        setTimeout(() => onNavigate?.("/login/forgotPassword"), 3e3);
       } finally {
         setValidatingCode(false);
       }
     };
     if (searchParams) {
+      const fromCodeVerificationParam = searchParams.get("fromCodeVerification");
       const emailParam = searchParams.get("email");
       const codeParam = searchParams.get("code");
+      if (fromCodeVerificationParam === "true" && emailParam && codeParam) {
+        setEmail(emailParam);
+        setCode(codeParam);
+        setFromCodeVerification(true);
+        setCodeValidated(true);
+        setValidatingCode(false);
+        return;
+      }
+      const linkParam = searchParams.get("link");
+      if (linkParam) {
+        try {
+          const decodedLink = decodeURIComponent(linkParam);
+          const [linkCode, linkEmail] = decodedLink.split("/");
+          if (linkCode && linkEmail && linkCode.length === 6) {
+            console.log("\u{1F517} Reset link detected:", { linkCode, linkEmail });
+            setCode(linkCode);
+            setEmail(linkEmail);
+            setFromCodeVerification(false);
+            validateCode(linkEmail, linkCode);
+            return;
+          }
+        } catch (error) {
+          console.error("Failed to parse reset link:", error);
+        }
+      }
       if (emailParam && codeParam) {
         setEmail(emailParam);
         setCode(codeParam);
+        setFromCodeVerification(false);
         validateCode(emailParam, codeParam);
-      } else {
-        setValidatingCode(false);
-        setErrors([t("resetPassword.missingParameters")]);
+        return;
       }
-    } else {
-      setValidatingCode(false);
-      setErrors([t("resetPassword.missingParameters")]);
     }
-  }, [searchParams, crudify3, t]);
-  const validatePasswords = () => {
+    setErrors([t("resetPassword.invalidCode")]);
+    setValidatingCode(false);
+    setTimeout(() => onNavigate?.("/login/forgotPassword"), 3e3);
+  }, [searchParams, crudify3, t, onNavigate]);
+  const validatePassword = (password) => {
+    if (password.length < 8) {
+      return t("resetPassword.passwordTooShort");
+    }
+    return null;
+  };
+  const handleSubmit = async () => {
+    if (loading || !crudify3) return;
+    setErrors([]);
     setHelperTextNewPassword(null);
     setHelperTextConfirmPassword(null);
+    let hasErrors = false;
     if (!newPassword) {
       setHelperTextNewPassword(t("resetPassword.newPasswordRequired"));
-      return false;
-    }
-    if (newPassword.length < 8) {
-      setHelperTextNewPassword(t("resetPassword.passwordTooShort"));
-      return false;
+      hasErrors = true;
+    } else {
+      const passwordError = validatePassword(newPassword);
+      if (passwordError) {
+        setHelperTextNewPassword(passwordError);
+        hasErrors = true;
+      }
     }
     if (!confirmPassword) {
       setHelperTextConfirmPassword(t("resetPassword.confirmPasswordRequired"));
-      return false;
-    }
-    if (newPassword !== confirmPassword) {
+      hasErrors = true;
+    } else if (newPassword !== confirmPassword) {
       setHelperTextConfirmPassword(t("resetPassword.passwordsDoNotMatch"));
-      return false;
+      hasErrors = true;
     }
-    return true;
-  };
-  const handleSubmit = async () => {
-    if (loading || !crudify3) return;
-    setErrors([]);
-    if (!validatePasswords()) return;
+    if (hasErrors) return;
     setLoading(true);
     try {
       const data = [
@@ -741,22 +857,57 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
       ];
       const response = await crudify3.transaction(data);
       if (response.success) {
-        setResetSuccess(true);
+        setErrors([]);
+        setTimeout(() => {
+          onResetSuccess?.();
+        }, 1e3);
       } else {
-        if (response.errors) {
-          if (typeof response.errors === "string") {
-            setErrors([response.errors]);
-          } else {
-            if (response.errors.newPassword) {
-              setHelperTextNewPassword(response.errors.newPassword[0]);
+        const errorMessages = [];
+        if (response.data?.response?.status === "TOO_MANY_REQUESTS") {
+          errorMessages.push(t("errors.auth.TOO_MANY_REQUESTS"));
+        } else if (response.errors?._transaction) {
+          const transactionErrors = response.errors._transaction;
+          if (Array.isArray(transactionErrors) && transactionErrors.length > 0) {
+            const firstError = transactionErrors[0];
+            let errorMsg = "";
+            if (typeof firstError === "string") {
+              try {
+                const parsed = JSON.parse(firstError);
+                if (parsed?.response?.message) {
+                  errorMsg = parsed.response.message.toLowerCase();
+                }
+              } catch {
+                errorMsg = firstError.toLowerCase();
+              }
             }
-            if (response.errors._error) {
-              setErrors(response.errors._error);
+            if (errorMsg.includes("expired")) {
+              errorMessages.push(t("resetPassword.codeExpiredOrInvalid"));
+            } else if (errorMsg.includes("invalid")) {
+              errorMessages.push(t("resetPassword.invalidCode"));
+            } else {
+              errorMessages.push(t("error.unknown"));
+            }
+          } else {
+            errorMessages.push(t("error.unknown"));
+          }
+        } else if (response.errors?._error) {
+          const error = response.errors._error[0];
+          if (error === "TOO_MANY_REQUESTS") {
+            errorMessages.push(t("errors.auth.TOO_MANY_REQUESTS"));
+          } else {
+            const errorMsg = error?.toLowerCase() || "";
+            if (errorMsg.includes("expired")) {
+              errorMessages.push(t("resetPassword.codeExpiredOrInvalid"));
+            } else if (errorMsg.includes("invalid")) {
+              errorMessages.push(t("resetPassword.invalidCode"));
+            } else {
+              errorMessages.push(error || t("error.unknown"));
             }
           }
         } else {
-          setErrors([t("error.unknown")]);
+          errorMessages.push(t("error.unknown"));
         }
+        setErrors(errorMessages);
       }
     } catch (error) {
       console.error("Reset password error:", error);
@@ -764,47 +915,26 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
       if (onError) {
         onError(typeof error === "string" ? error : t("error.unknown"));
       }
-    } finally {
-      setLoading(false);
     }
+    setLoading(false);
   };
-  const handleFormSubmit = (e) => {
-    e.preventDefault();
-    handleSubmit();
-  };
-  const handleKeyDown = (e) => {
-    if (e.key === "Enter" && !loading) {
-      e.preventDefault();
-      handleSubmit();
-    }
+  const handleBack = () => {
+    if (fromCodeVerification) onNavigate?.(`/login/checkCode?email=${encodeURIComponent(email)}`);
+    else onNavigate?.("/login/forgotPassword");
   };
   if (validatingCode) {
-    return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { textAlign: "center", py: 4 }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.CircularProgress, { size: 40 }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "body2", sx: { mt: 2 }, children: t("resetPassword.validatingCode") })
-    ] });
-  }
-  if (resetSuccess) {
-    return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { textAlign: "center" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Alert, { severity: "success", sx: { mb: 3 }, children: t("resetPassword.successMessage") }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "body2", sx: { mb: 3 }, children: t("resetPassword.successInstructions") }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Button, { variant: "contained", color: "primary", onClick: () => onNavigate?.("/login"), fullWidth: true, children: t("resetPassword.goToLoginButton") })
-    ] });
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "300px" }, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.CircularProgress, {}) });
   }
   if (!codeValidated) {
-    return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { textAlign: "center" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Alert, { severity: "error", sx: { mb: 3 }, children: t("resetPassword.codeExpiredOrInvalid") }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { display: "flex", flexDirection: "column", gap: 2 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Button, { variant: "contained", color: "primary", onClick: () => onNavigate?.("/login/forgotPassword"), fullWidth: true, children: t("resetPassword.requestNewCodeButton") }),
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.backToLogin") })
-      ] })
-    ] });
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { children: errors.length > 0 && errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Alert, { variant: "filled", sx: { mt: 2 }, severity: "error", children: error }, index)) });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "h5", component: "h1", sx: { mb: 3, textAlign: "center" }, children: t("resetPassword.title") }),
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "body2", sx: { mb: 3, textAlign: "center", color: "text.secondary" }, children: t("resetPassword.instructions") }),
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { component: "form", noValidate: true, onSubmit: handleFormSubmit, onKeyDown: handleKeyDown, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { component: "form", noValidate: true, sx: { width: "100%", display: "flex", flexDirection: "column", gap: 2 }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { mb: 2 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "h5", component: "h1", sx: { mb: 1, fontWeight: 600 }, children: t("resetPassword.title") }),
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Typography, { variant: "body2", sx: { color: "grey.600" }, children: t("resetPassword.instructions") })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { mb: 1 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
           import_material3.Typography,
           {
@@ -833,7 +963,7 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
           }
         )
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { mb: 2 }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_material3.Box, { sx: { mb: 1 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
           import_material3.Typography,
           {
@@ -862,10 +992,10 @@ var ResetPasswordForm = ({ config, onNavigate, onError, searchParams }) => {
           }
         )
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Button, { disabled: loading, type: "submit", fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.CircularProgress, { size: 20 }) : t("resetPassword.resetPasswordButton") }),
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { sx: { textAlign: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.backToLogin") }) })
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Button, { disabled: loading, type: "button", onClick: handleSubmit, fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.CircularProgress, { size: 20 }) : t("resetPassword.resetPasswordButton") }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Link, { sx: { cursor: "pointer" }, onClick: handleBack, variant: "body2", color: "secondary", children: t("common.back") }) })
     ] }),
-    errors.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { sx: { mt: 2 }, children: errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Alert, { variant: "filled", severity: "error", children: error }, index)) })
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Box, { children: errors.length > 0 && errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_material3.Alert, { variant: "filled", sx: { mt: 2 }, severity: "error", children: error }, index)) })
   ] });
 };
 var ResetPasswordForm_default = ResetPasswordForm;
@@ -874,40 +1004,31 @@ var ResetPasswordForm_default = ResetPasswordForm;
 var import_react7 = require("react");
 var import_material4 = require("@mui/material");
 var import_jsx_runtime5 = require("react/jsx-runtime");
-var CheckCodeForm = ({ config, onNavigate, onError }) => {
-  const [email, setEmail] = (0, import_react7.useState)("");
+var CheckCodeForm = ({ config, onNavigate, onError, searchParams }) => {
   const [code, setCode] = (0, import_react7.useState)("");
   const [loading, setLoading] = (0, import_react7.useState)(false);
   const [errors, setErrors] = (0, import_react7.useState)([]);
-  const [helperTextEmail, setHelperTextEmail] = (0, import_react7.useState)(null);
   const [helperTextCode, setHelperTextCode] = (0, import_react7.useState)(null);
+  const [email, setEmail] = (0, import_react7.useState)("");
   const { t } = useTranslation();
   const { crudify: crudify3 } = useCrudifyLogin(config);
   (0, import_react7.useEffect)(() => {
-    const timer = setTimeout(() => {
-      const emailInput = document.getElementById("email");
-      if (emailInput) emailInput.focus();
-    }, 100);
-    return () => clearTimeout(timer);
-  }, []);
-  const validateEmail = (email2) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email2);
-  };
+    const emailParam = searchParams?.get("email");
+    if (emailParam) {
+      setEmail(emailParam);
+    } else {
+      onNavigate?.("/login/forgotPassword");
+    }
+  }, [searchParams, onNavigate]);
   const handleSubmit = async () => {
     if (loading || !crudify3) return;
     setErrors([]);
-    setHelperTextEmail(null);
     setHelperTextCode(null);
-    if (!email) {
-      setHelperTextEmail(t("checkCode.emailRequired"));
-      return;
-    }
-    if (!validateEmail(email)) {
-      setHelperTextEmail(t("checkCode.invalidEmail"));
+    if (!code) {
+      setHelperTextCode(t("checkCode.codeRequired"));
       return;
     }
-    if (!code) {
+    if (code.length !== 6) {
       setHelperTextCode(t("checkCode.codeRequired"));
       return;
     }
@@ -921,75 +1042,53 @@ var CheckCodeForm = ({ config, onNavigate, onError }) => {
       ];
       const response = await crudify3.transaction(data);
       if (response.success) {
-        const params = new URLSearchParams({ email, code }).toString();
-        onNavigate?.(`/login/resetPassword?${params}`);
+        onNavigate?.(`/login/resetPassword?email=${encodeURIComponent(email)}&code=${encodeURIComponent(code)}&fromCodeVerification=true`);
       } else {
-        if (response.errors) {
-          if (typeof response.errors === "string") {
-            setErrors([response.errors]);
+        const errorMessages = [];
+        if (response.data?.response?.status === "TOO_MANY_REQUESTS") {
+          errorMessages.push(t("errors.auth.TOO_MANY_REQUESTS"));
+        } else if (response.errors) {
+          if (response.errors._error) {
+            const errors2 = response.errors._error;
+            const translatedErrors = errors2.map((error) => {
+              if (error === "TOO_MANY_REQUESTS") {
+                return t("errors.auth.TOO_MANY_REQUESTS");
+              }
+              return error;
+            });
+            errorMessages.push(...translatedErrors);
           } else {
-            if (response.errors.email) setHelperTextEmail(response.errors.email[0]);
-            if (response.errors.code) setHelperTextCode(response.errors.code[0]);
-            if (response.errors._error) setErrors(response.errors._error);
+            errorMessages.push(t("error.unknown"));
           }
         } else {
-          setErrors([t("error.unknown")]);
+          errorMessages.push(t("checkCode.verifyError"));
         }
+        setErrors(errorMessages);
+        setLoading(false);
       }
     } catch (error) {
       console.error("Check code error:", error);
       setErrors([t("error.unknown")]);
+      setLoading(false);
       if (onError) {
         onError(typeof error === "string" ? error : t("error.unknown"));
       }
-    } finally {
-      setLoading(false);
     }
   };
-  const handleFormSubmit = (e) => {
-    e.preventDefault();
-    handleSubmit();
+  const handleBack = () => {
+    onNavigate?.("/login/forgotPassword");
   };
-  const handleKeyDown = (e) => {
-    if (e.key === "Enter" && !loading) {
-      e.preventDefault();
-      handleSubmit();
-    }
+  const handleCodeChange = (event) => {
+    const value = event.target.value.replace(/\D/g, "").slice(0, 6);
+    setCode(value);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Typography, { variant: "h5", component: "h1", sx: { mb: 3, textAlign: "center" }, children: t("checkCode.title") }),
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Typography, { variant: "body2", sx: { mb: 3, textAlign: "center", color: "text.secondary" }, children: t("checkCode.instructions") }),
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { component: "form", noValidate: true, onSubmit: handleFormSubmit, onKeyDown: handleKeyDown, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { component: "form", noValidate: true, sx: { width: "100%", display: "flex", flexDirection: "column", gap: 2 }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { sx: { mb: 2 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-          import_material4.Typography,
-          {
-            variant: "body2",
-            component: "label",
-            htmlFor: "email",
-            sx: { display: "block", fontWeight: 500, color: "grey.700", mb: 0.5 },
-            children: t("checkCode.emailLabel")
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-          import_material4.TextField,
-          {
-            fullWidth: true,
-            id: "email",
-            name: "email",
-            type: "email",
-            value: email,
-            disabled: loading,
-            onChange: (e) => setEmail(e.target.value),
-            error: !!helperTextEmail,
-            helperText: helperTextEmail,
-            autoComplete: "email",
-            placeholder: t("checkCode.emailPlaceholder"),
-            required: true
-          }
-        )
+        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Typography, { variant: "h5", component: "h1", sx: { mb: 1, fontWeight: 600 }, children: t("checkCode.title") }),
+        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Typography, { variant: "body2", sx: { color: "grey.600" }, children: t("checkCode.instructions") })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { sx: { mb: 2 }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { sx: { mb: 1 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
           import_material4.Typography,
           {
@@ -1009,21 +1108,34 @@ var CheckCodeForm = ({ config, onNavigate, onError }) => {
             type: "text",
             value: code,
             disabled: loading,
-            onChange: (e) => setCode(e.target.value),
+            onChange: handleCodeChange,
             error: !!helperTextCode,
             helperText: helperTextCode,
             placeholder: t("checkCode.codePlaceholder"),
+            inputProps: {
+              maxLength: 6,
+              style: { textAlign: "center", fontSize: "1.5rem", letterSpacing: "0.4rem" }
+            },
             required: true
           }
         )
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Button, { disabled: loading, type: "submit", fullWidth: true, variant: "contained", color: "primary", sx: { mt: 2, mb: 2 }, children: loading ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.CircularProgress, { size: 20 }) : t("checkCode.verifyButton") }),
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_material4.Box, { sx: { textAlign: "center", display: "flex", flexDirection: "column", gap: 1 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login/forgotPassword"), variant: "body2", color: "primary", children: t("checkCode.resendCodeLink") }),
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Link, { sx: { cursor: "pointer" }, onClick: () => onNavigate?.("/login"), variant: "body2", color: "secondary", children: t("common.backToLogin") })
-      ] })
+      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+        import_material4.Button,
+        {
+          disabled: loading || code.length !== 6,
+          type: "button",
+          onClick: handleSubmit,
+          fullWidth: true,
+          variant: "contained",
+          color: "primary",
+          sx: { mt: 2, mb: 2 },
+          children: loading ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.CircularProgress, { size: 20 }) : t("checkCode.verifyButton")
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Box, { sx: { display: "flex", justifyContent: "center", alignItems: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Link, { sx: { cursor: "pointer" }, onClick: handleBack, variant: "body2", color: "secondary", children: t("common.back") }) })
     ] }),
-    errors.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Box, { sx: { mt: 2 }, children: errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Alert, { variant: "filled", severity: "error", children: error }, index)) })
+    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Box, { children: errors.length > 0 && errors.map((error, index) => /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_material4.Alert, { sx: { mt: 2 }, severity: "error", children: error }, index)) })
   ] });
 };
 var CheckCodeForm_default = CheckCodeForm;
@@ -1042,6 +1154,25 @@ var CrudifyLoginInternal = ({
   const { t } = useTranslation();
   const [currentScreen, setCurrentScreen] = (0, import_react8.useState)(initialScreen);
   const [searchParams, setSearchParams] = (0, import_react8.useState)();
+  console.log("\u{1F504} CrudifyLoginInternal RENDER:", { currentScreen, initialScreen });
+  import_react8.default.useEffect(() => {
+    const urlParams = new URLSearchParams(window.location.search);
+    if (initialScreen === "checkCode") {
+      const email = urlParams.get("email");
+      const code = urlParams.get("code");
+      console.log("\u{1F517} CheckCode link detected:", { email, code });
+      if (email) {
+        setSearchParams(urlParams);
+      }
+    }
+    if (initialScreen === "resetPassword") {
+      const link = urlParams.get("link");
+      console.log("\u{1F517} ResetPassword link detected:", { link });
+      if (link) {
+        setSearchParams(urlParams);
+      }
+    }
+  }, [initialScreen]);
   const finalConfig = (0, import_react8.useMemo)(() => {
     let cookieConfig = {};
     if (autoReadFromCookies) {
@@ -1085,39 +1216,73 @@ var CrudifyLoginInternal = ({
     };
   }, [providedConfig, autoReadFromCookies]);
   const handleNavigate = (path) => {
+    console.log("\u{1F680} INTERNAL handleNavigate called with:", path);
     const [basePath, queryString] = path.split("?");
     if (queryString) {
       setSearchParams(new URLSearchParams(queryString));
     } else {
       setSearchParams(void 0);
     }
+    let newScreen = "login";
     if (basePath.includes("/forgotPassword")) {
-      setCurrentScreen("forgotPassword");
+      newScreen = "forgotPassword";
     } else if (basePath.includes("/checkCode")) {
-      setCurrentScreen("checkCode");
+      newScreen = "checkCode";
     } else if (basePath.includes("/resetPassword")) {
-      setCurrentScreen("resetPassword");
+      newScreen = "resetPassword";
     } else {
-      setCurrentScreen("login");
+      newScreen = "login";
     }
+    console.log("\u{1F3AF} INTERNAL Setting currentScreen from", currentScreen, "to", newScreen);
+    setCurrentScreen(newScreen);
+    console.log("\u{1F512} All navigation handled internally - no external calls");
+  };
+  const notifyExternal = (path, reason) => {
+    console.log(`\u{1F4E2} Notifying external: ${reason} - ${path}`);
     onNavigate?.(path);
   };
   const renderCurrentForm = () => {
+    console.log("\u{1F3A8} renderCurrentForm for screen:", currentScreen);
     const commonProps = {
       config: finalConfig,
       onNavigate: handleNavigate,
+      // Navegación interna
       onError,
       redirectUrl
     };
     switch (currentScreen) {
       case "forgotPassword":
+        console.log("\u{1F4CB} Rendering ForgotPasswordForm");
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ForgotPasswordForm_default, { ...commonProps });
       case "checkCode":
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CheckCodeForm_default, { ...commonProps });
+        console.log("\u{1F522} Rendering CheckCodeForm");
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CheckCodeForm_default, { ...commonProps, searchParams });
       case "resetPassword":
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ResetPasswordForm_default, { ...commonProps, searchParams });
+        console.log("\u{1F510} Rendering ResetPasswordForm");
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+          ResetPasswordForm_default,
+          {
+            ...commonProps,
+            searchParams,
+            onResetSuccess: () => {
+              notifyExternal(redirectUrl, "Password reset successful");
+            }
+          }
+        );
       default:
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(LoginForm_default, { ...commonProps, onLoginSuccess });
+        console.log("\u{1F511} Rendering LoginForm");
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+          LoginForm_default,
+          {
+            ...commonProps,
+            onLoginSuccess: (result) => {
+              if (onLoginSuccess) {
+                onLoginSuccess(result);
+              }
+              notifyExternal(redirectUrl, "Login successful");
+            }
+          }
+        );
     }
   };
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [