@better-auth-ui/heroui 1.6.26 → 1.6.27

package/dist/components/auth/verify-email.d.ts

@@ -8,9 +8,9 @@ export type VerifyEmailProps = {
  * that is rate-limited by a cooldown timer.
  *
  * The target email is read from `sessionStorage` (set when sign-up or sign-in
- * redirects here); if none is stored the user is redirected back to sign-in.
- * The resend button is disabled while a cooldown is active and shows the
- * remaining seconds.
+ * redirects here); the OpenEmail/Resend controls are only shown when an email
+ * is stored. The resend button is disabled while a cooldown is active and shows
+ * the remaining seconds.
  *
  * @param className - Additional CSS classes applied to the outer card container
  * @param variant - Variant to apply to the card

package/dist/index.js

@@ -907,28 +907,19 @@ function st({ email: e, className: t }) {
 //#region src/components/auth/verify-email.tsx
 var ct = 60;
 function lt({ className: e, variant: t }) {
-	let { authClient: n, basePaths: r, baseURL: i, localization: a, navigate: o, redirectTo: s, viewPaths: c } = h(), [l, u] = X(Fe() && sessionStorage.getItem("better-auth-ui.verify-email") || ""), [d, f] = X(ct);
+	let { authClient: n, basePaths: r, baseURL: i, localization: a, redirectTo: o, viewPaths: s } = h(), [c, l] = X(Fe() && sessionStorage.getItem("better-auth-ui.verify-email") || ""), [u, d] = X(ct);
 	Y(() => {
-		let e = sessionStorage.getItem("better-auth-ui.verify-email");
-		if (!e) {
-			o({ to: `${r.auth}/${c.auth.signIn}` });
-			return;
-		}
-		u(e);
-	}, [
-		r.auth,
-		o,
-		c.auth.signIn
-	]), Y(() => {
-		if (d <= 0) return;
+		l(sessionStorage.getItem("better-auth-ui.verify-email") ?? "");
+	}, []), Y(() => {
+		if (u <= 0 || !c) return;
 		let e = setInterval(() => {
-			f((e) => e > 0 ? e - 1 : 0);
+			d((e) => e > 0 ? e - 1 : 0);
 		}, 1e3);
 		return () => clearInterval(e);
-	}, [d]);
-	let { mutate: p, isPending: m } = ne(n, { onSuccess: () => {
-		J.success(a.auth.verificationEmailSent), f(ct);
-	} }), g = d > 0;
+	}, [u, c]);
+	let { mutate: f, isPending: p } = ne(n, { onSuccess: () => {
+		J.success(a.auth.verificationEmailSent), d(ct);
+	} }), m = u > 0;
 	return /* @__PURE__ */ $(j, {
 		className: q("w-full max-w-sm gap-4 md:p-6", e),
 		variant: t,
@@ -942,21 +933,21 @@ function lt({ className: e, variant: t }) {
 				children: [/* @__PURE__ */ Q(N, {
 					className: "text-sm",
 					children: a.auth.checkYourEmail
-				}), /* @__PURE__ */ $("div", {
+				}), c && /* @__PURE__ */ $("div", {
 					className: "flex flex-col gap-3",
-					children: [/* @__PURE__ */ Q(st, { email: l }), /* @__PURE__ */ $(k, {
+					children: [/* @__PURE__ */ Q(st, { email: c }), /* @__PURE__ */ $(k, {
 						className: "w-full",
 						variant: "tertiary",
-						isDisabled: !l || g || m,
-						isPending: m,
-						onPress: () => p({
-							email: l,
-							callbackURL: `${i}${s}`
+						isDisabled: !c || m || p,
+						isPending: p,
+						onPress: () => f({
+							email: c,
+							callbackURL: `${i}${o}`
 						}),
-						children: [m && /* @__PURE__ */ Q(W, {
+						children: [p && /* @__PURE__ */ Q(W, {
 							color: "current",
 							size: "sm"
-						}), g ? a.auth.resendIn.replace("{{seconds}}", String(d)) : a.auth.resend]
+						}), m ? a.auth.resendIn.replace("{{seconds}}", String(u)) : a.auth.resend]
 					})]
 				})]
 			}),
@@ -968,7 +959,7 @@ function lt({ className: e, variant: t }) {
 						a.auth.alreadyVerifiedYourEmail,
 						" ",
 						/* @__PURE__ */ Q(V, {
-							href: `${r.auth}/${c.auth.signIn}`,
+							href: `${r.auth}/${s.auth.signIn}`,
 							className: "text-accent no-underline hover:underline decoration-accent-hover",
 							children: a.auth.signIn
 						})

package/dist/plugins.js

@@ -2712,12 +2712,16 @@ function Fn({ className: n, socialLayout: i, socialPosition: a = "bottom", varia
 		onError: (e, { email: t }) => {
 			S(""), e.error?.code === "EMAIL_NOT_VERIFIED" && (sessionStorage.setItem("better-auth-ui.verify-email", t), _({ to: `${c.auth}/${g.auth.verifyEmail}` })), y();
 		},
-		onSuccess: () => _({ to: f })
+		onSuccess: () => {
+			sessionStorage.removeItem("better-auth-ui.verify-email"), _({ to: f });
+		}
 	}), { mutate: te, isPending: ne } = ye(s, {
-		onError: () => {
-			S(""), y();
+		onError: (e) => {
+			S(""), e.error?.code === "EMAIL_NOT_VERIFIED" && (sessionStorage.removeItem("better-auth-ui.verify-email"), _({ to: `${c.auth}/${g.auth.verifyEmail}` })), y();
 		},
-		onSuccess: () => _({ to: f })
+		onSuccess: () => {
+			sessionStorage.removeItem("better-auth-ui.verify-email"), _({ to: f });
+		}
 	}), re = (e) => {
 		e.preventDefault();
 		let t = new FormData(e.currentTarget), n = t.get("email"), r = t.get("rememberMe") === "on";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth-ui/heroui",
-  "version": "1.6.26",
+  "version": "1.6.27",
   "type": "module",
   "scripts": {
     "build": "vite build",

package/src/components/auth/username/sign-in-username.tsx

@@ -82,16 +82,31 @@ export function SignInUsername({
 
         resetFetchOptions()
       },
-      onSuccess: () => navigate({ to: redirectTo })
+      onSuccess: () => {
+        sessionStorage.removeItem("better-auth-ui.verify-email")
+        navigate({ to: redirectTo })
+      }
     })
 
   const { mutate: signInUsername, isPending: isSignInUsernamePending } =
     useSignInUsername(authClient as UsernameAuthClient, {
-      onError: () => {
+      onError: (error) => {
         setPassword("")
+
+        if (error.error?.code === "EMAIL_NOT_VERIFIED") {
+          sessionStorage.removeItem("better-auth-ui.verify-email")
+
+          navigate({
+            to: `${basePaths.auth}/${viewPaths.auth.verifyEmail}`
+          })
+        }
+
         resetFetchOptions()
       },
-      onSuccess: () => navigate({ to: redirectTo })
+      onSuccess: () => {
+        sessionStorage.removeItem("better-auth-ui.verify-email")
+        navigate({ to: redirectTo })
+      }
     })
 
   const handleSubmit = (e: SyntheticEvent<HTMLFormElement>) => {

package/src/components/auth/verify-email.tsx

@@ -27,9 +27,9 @@ const RESEND_COOLDOWN_SECONDS = 60
  * that is rate-limited by a cooldown timer.
  *
  * The target email is read from `sessionStorage` (set when sign-up or sign-in
- * redirects here); if none is stored the user is redirected back to sign-in.
- * The resend button is disabled while a cooldown is active and shows the
- * remaining seconds.
+ * redirects here); the OpenEmail/Resend controls are only shown when an email
+ * is stored. The resend button is disabled while a cooldown is active and shows
+ * the remaining seconds.
  *
  * @param className - Additional CSS classes applied to the outer card container
  * @param variant - Variant to apply to the card
@@ -41,7 +41,6 @@ export function VerifyEmail({ className, variant }: VerifyEmailProps) {
     basePaths,
     baseURL,
     localization,
-    navigate,
     redirectTo,
     viewPaths
   } = useAuth()
@@ -53,25 +52,18 @@ export function VerifyEmail({ className, variant }: VerifyEmailProps) {
   const [cooldown, setCooldown] = useState(RESEND_COOLDOWN_SECONDS)
 
   useEffect(() => {
-    const storedEmail = sessionStorage.getItem("better-auth-ui.verify-email")
-
-    if (!storedEmail) {
-      navigate({ to: `${basePaths.auth}/${viewPaths.auth.signIn}` })
-      return
-    }
-
-    setEmail(storedEmail)
-  }, [basePaths.auth, navigate, viewPaths.auth.signIn])
+    setEmail(sessionStorage.getItem("better-auth-ui.verify-email") ?? "")
+  }, [])
 
   useEffect(() => {
-    if (cooldown <= 0) return
+    if (cooldown <= 0 || !email) return
 
     const interval = setInterval(() => {
       setCooldown((current) => (current > 0 ? current - 1 : 0))
     }, 1000)
 
     return () => clearInterval(interval)
-  }, [cooldown])
+  }, [cooldown, email])
 
   const { mutate: sendVerificationEmail, isPending } = useSendVerificationEmail(
     authClient,
@@ -101,31 +93,33 @@ export function VerifyEmail({ className, variant }: VerifyEmailProps) {
           {localization.auth.checkYourEmail}
         </Description>
 
-        <div className="flex flex-col gap-3">
-          <OpenEmailButton email={email} />
-
-          <Button
-            className="w-full"
-            variant="tertiary"
-            isDisabled={!email || isCoolingDown || isPending}
-            isPending={isPending}
-            onPress={() =>
-              sendVerificationEmail({
-                email,
-                callbackURL: `${baseURL}${redirectTo}`
-              })
-            }
-          >
-            {isPending && <Spinner color="current" size="sm" />}
-
-            {isCoolingDown
-              ? localization.auth.resendIn.replace(
-                  "{{seconds}}",
-                  String(cooldown)
-                )
-              : localization.auth.resend}
-          </Button>
-        </div>
+        {email && (
+          <div className="flex flex-col gap-3">
+            <OpenEmailButton email={email} />
+
+            <Button
+              className="w-full"
+              variant="tertiary"
+              isDisabled={!email || isCoolingDown || isPending}
+              isPending={isPending}
+              onPress={() =>
+                sendVerificationEmail({
+                  email,
+                  callbackURL: `${baseURL}${redirectTo}`
+                })
+              }
+            >
+              {isPending && <Spinner color="current" size="sm" />}
+
+              {isCoolingDown
+                ? localization.auth.resendIn.replace(
+                    "{{seconds}}",
+                    String(cooldown)
+                  )
+                : localization.auth.resend}
+            </Button>
+          </div>
+        )}
       </Card.Content>
 
       <Card.Footer className="flex-col gap-3">