@better-auth-ui/heroui 1.6.2 → 1.6.4

package/src/components/{settings → auth/settings}/security/active-session.tsx

@@ -46,13 +46,15 @@ export type ActiveSessionProps = {
  * @returns A JSX element containing the active session row
  */
 export function ActiveSession({ activeSession }: ActiveSessionProps) {
-  const { basePaths, localization, viewPaths, navigate } = useAuth()
-  const { data: session } = useSession({ refetchOnMount: false })
+  const { authClient, basePaths, localization, viewPaths, navigate } = useAuth()
+  const { data: session } = useSession(authClient, { refetchOnMount: false })
 
-  const { mutate: revokeSession, isPending: isRevoking } = useRevokeSession({
-    onError: (error) => toast.danger(error.error?.message || error.message),
-    onSuccess: () => toast.success(localization.settings.revokeSessionSuccess)
-  })
+  const { mutate: revokeSession, isPending: isRevoking } = useRevokeSession(
+    authClient,
+    {
+      onSuccess: () => toast.success(localization.settings.revokeSessionSuccess)
+    }
+  )
 
   const isCurrentSession = activeSession.token === session?.session.token
   const ua = Bowser.parse(activeSession.userAgent || "")

package/src/components/{settings → auth/settings}/security/active-sessions.tsx

@@ -1,5 +1,5 @@
 import { useAuth, useListSessions, useSession } from "@better-auth-ui/react"
-import { Card, type CardProps, cn, Skeleton, toast } from "@heroui/react"
+import { Card, type CardProps, cn, Skeleton } from "@heroui/react"
 import { ActiveSession } from "./active-session"
 
 export type ActiveSessionsProps = {
@@ -19,16 +19,11 @@ export function ActiveSessions({
   className,
   variant,
   ...props
-}: ActiveSessionsProps & CardProps) {
-  const { localization } = useAuth()
-  const { data: session } = useSession()
+}: ActiveSessionsProps & Omit<CardProps, "children">) {
+  const { authClient, localization } = useAuth()
+  const { data: session } = useSession(authClient)
 
-  const { data: sessions, isPending } = useListSessions({
-    throwOnError: (error) => {
-      if (error.error) toast.danger(error.error.message)
-      return false
-    }
-  })
+  const { data: sessions, isPending } = useListSessions(authClient)
 
   const activeSessions = sessions?.toSorted((activeSession) =>
     activeSession.id === session?.session.id ? -1 : 1

package/src/components/{settings → auth/settings}/security/change-password.tsx

@@ -42,10 +42,11 @@ export function ChangePassword({
   className,
   variant,
   ...props
-}: ChangePasswordProps & CardProps) {
-  const { emailAndPassword, localization } = useAuth()
-  const { data: session } = useSession()
-  const { data: accounts, isPending: isAccountsPending } = useListAccounts()
+}: ChangePasswordProps & Omit<CardProps, "children">) {
+  const { authClient, emailAndPassword, localization } = useAuth()
+  const { data: session } = useSession(authClient)
+  const { data: accounts, isPending: isAccountsPending } =
+    useListAccounts(authClient)
 
   const hasCredentialAccount = accounts?.some(
     (account) => account.providerId === "credential"
@@ -67,14 +68,20 @@ export function ChangePassword({
   )
 }
 
-function SetPassword({ className, variant, ...props }: CardProps) {
-  const { localization } = useAuth()
-  const { data: session } = useSession()
-
-  const { mutate: requestPasswordReset, isPending } = useRequestPasswordReset({
-    onError: (error) => toast.danger(error.error?.message || error.message),
-    onSuccess: () => toast.success(localization.auth.passwordResetEmailSent)
-  })
+function SetPassword({
+  className,
+  variant,
+  ...props
+}: Omit<CardProps, "children">) {
+  const { authClient, localization } = useAuth()
+  const { data: session } = useSession(authClient)
+
+  const { mutate: requestPasswordReset, isPending } = useRequestPasswordReset(
+    authClient,
+    {
+      onSuccess: () => toast.success(localization.auth.passwordResetEmailSent)
+    }
+  )
 
   const handleSetPassword = () => {
     if (!session?.user.email) return
@@ -125,12 +132,13 @@ function ChangePasswordForm({
   emailAndPassword: ReturnType<typeof useAuth>["emailAndPassword"]
   localization: ReturnType<typeof useAuth>["localization"]
   session: ReturnType<typeof useSession>["data"]
-} & CardProps) {
+} & Omit<CardProps, "children">) {
+  const { authClient } = useAuth()
   const [currentPassword, setCurrentPassword] = useState("")
   const [newPassword, setNewPassword] = useState("")
   const [confirmPassword, setConfirmPassword] = useState("")
 
-  const { mutate: changePassword, isPending } = useChangePassword({
+  const { mutate: changePassword, isPending } = useChangePassword(authClient, {
     onError: (error) => {
       setCurrentPassword("")
       setNewPassword("")

package/src/components/{settings → auth/settings}/security/linked-account.tsx

@@ -26,27 +26,21 @@ export type LinkedAccountProps = {
  * @returns A JSX element containing the linked account row
  */
 export function LinkedAccount({ account, provider }: LinkedAccountProps) {
-  const { baseURL, localization } = useAuth()
+  const { authClient, baseURL, localization } = useAuth()
 
   const { data: accountInfo, isPending: isLoadingInfo } = useAccountInfo(
-    account?.accountId,
-    {
-      enabled: !!account,
-      throwOnError: (error) => {
-        if (error.error) toast.danger(error.error.message)
-        return false
-      }
-    }
+    authClient,
+    { query: { accountId: account?.accountId } }
   )
 
-  const { mutate: linkSocial, isPending: isLinking } = useLinkSocial({
-    onError: (error) => toast.danger(error.error?.message || error.message)
-  })
+  const { mutate: linkSocial, isPending: isLinking } = useLinkSocial(authClient)
 
-  const { mutate: unlinkAccount, isPending: isUnlinking } = useUnlinkAccount({
-    onError: (error) => toast.danger(error.error?.message || error.message),
-    onSuccess: () => toast.success(localization.settings.accountUnlinked)
-  })
+  const { mutate: unlinkAccount, isPending: isUnlinking } = useUnlinkAccount(
+    authClient,
+    {
+      onSuccess: () => toast.success(localization.settings.accountUnlinked)
+    }
+  )
 
   const ProviderIcon = providerIcons[provider]
   const providerName = getProviderName(provider)

package/src/components/{settings → auth/settings}/security/linked-accounts.tsx

@@ -1,5 +1,5 @@
 import { useAuth, useListAccounts } from "@better-auth-ui/react"
-import { Card, type CardProps, cn, Skeleton, toast } from "@heroui/react"
+import { Card, type CardProps, cn, Skeleton } from "@heroui/react"
 import { LinkedAccount } from "./linked-account"
 
 export type LinkedAccountsProps = {
@@ -20,15 +20,10 @@ export function LinkedAccounts({
   className,
   variant,
   ...props
-}: LinkedAccountsProps & CardProps) {
-  const { localization, socialProviders } = useAuth()
+}: LinkedAccountsProps & Omit<CardProps, "children">) {
+  const { authClient, localization, socialProviders } = useAuth()
 
-  const { data: accounts, isPending } = useListAccounts({
-    throwOnError: (error) => {
-      if (error.error) toast.danger(error.error.message)
-      return false
-    }
-  })
+  const { data: accounts, isPending } = useListAccounts(authClient)
 
   const linkedAccounts = accounts?.filter(
     (account) => account.providerId !== "credential"

package/src/components/{settings → auth/settings}/security/security-settings.tsx

@@ -4,9 +4,7 @@ import type { ComponentProps } from "react"
 
 import { ActiveSessions } from "./active-sessions"
 import { ChangePassword } from "./change-password"
-import { DangerZone } from "./danger-zone"
 import { LinkedAccounts } from "./linked-accounts"
-import { Passkeys } from "./passkeys"
 
 export type SecuritySettingsProps = {
   className?: string
@@ -17,7 +15,7 @@ export type SecuritySettingsProps = {
  * Renders the security settings layout including password management, linked accounts, and active sessions.
  *
  * ChangePassword is rendered when password authentication is enabled; LinkedAccounts is rendered when social providers are present.
- * DangerZone is rendered when `deleteUser.enabled` is true in auth config.
+ * Each registered auth plugin may contribute `securityCards` (for example delete-user, passkeys).
  *
  * @param className - Optional additional CSS class names for the outer container.
  * @param variant - Card variant forwarded to each security settings card.
@@ -28,7 +26,7 @@ export function SecuritySettings({
   variant,
   ...props
 }: SecuritySettingsProps & ComponentProps<"div">) {
-  const { deleteUser, emailAndPassword, passkey, socialProviders } = useAuth()
+  const { emailAndPassword, plugins, socialProviders } = useAuth()
 
   return (
     <div
@@ -37,9 +35,12 @@ export function SecuritySettings({
     >
       {emailAndPassword?.enabled && <ChangePassword variant={variant} />}
       {!!socialProviders?.length && <LinkedAccounts variant={variant} />}
-      {passkey && <Passkeys variant={variant} />}
       <ActiveSessions variant={variant} />
-      {deleteUser?.enabled && <DangerZone variant={variant} />}
+      {plugins.flatMap((plugin) =>
+        plugin.securityCards?.map((Card, index) => (
+          <Card key={`${plugin.id}-${index.toString()}`} variant={variant} />
+        ))
+      )}
     </div>
   )
 }

package/src/components/{settings → auth/settings}/settings.tsx

@@ -35,8 +35,8 @@ export function Settings({
   view,
   ...props
 }: SettingsProps & ComponentProps<"div">) {
-  const { basePaths, localization, viewPaths } = useAuth()
-  useAuthenticate()
+  const { authClient, basePaths, localization, viewPaths } = useAuth()
+  useAuthenticate(authClient)
 
   if (!view && !path) {
     throw new Error("[Better Auth UI] Either `view` or `path` must be provided")

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

@@ -1,9 +1,8 @@
+import { authMutationKeys } from "@better-auth-ui/core"
 import {
   useAuth,
   useSendVerificationEmail,
-  useSignInEmail,
-  useSignInSocial,
-  useSignInUsername
+  useSignInEmail
 } from "@better-auth-ui/react"
 import {
   Button,
@@ -21,11 +20,10 @@ import {
   TextField,
   toast
 } from "@heroui/react"
+import { useIsMutating } from "@tanstack/react-query"
 import { type SyntheticEvent, useState } from "react"
 
 import { FieldSeparator } from "./field-separator"
-import { MagicLinkButton } from "./magic-link-button"
-import { PasskeyButton } from "./passkey-button"
 import { ProviderButtons, type SocialLayout } from "./provider-buttons"
 
 export interface SignInProps {
@@ -35,10 +33,6 @@ export interface SignInProps {
   variant?: CardProps["variant"]
 }
 
-function isEmail(value: string): boolean {
-  return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)
-}
-
 /**
  * Render the sign-in UI using auth context for configuration and localization.
  *
@@ -50,29 +44,31 @@ export function SignIn({
   socialPosition = "bottom",
   variant,
   ...props
-}: SignInProps & CardProps) {
+}: SignInProps & Omit<CardProps, "children">) {
   const {
+    authClient,
     basePaths,
     baseURL,
     emailAndPassword,
     localization,
-    magicLink,
-    passkey,
+    plugins,
     redirectTo,
     socialProviders,
-    username: usernameConfig,
     viewPaths,
     navigate
   } = useAuth()
 
   const [password, setPassword] = useState("")
 
-  const { mutate: sendVerificationEmail } = useSendVerificationEmail({
-    onError: (error) => toast.danger(error.error?.message || error.message),
-    onSuccess: () => toast.success(localization.auth.verificationEmailSent)
-  })
+  const { mutate: sendVerificationEmail } = useSendVerificationEmail(
+    authClient,
+    {
+      onSuccess: () => toast.success(localization.auth.verificationEmailSent)
+    }
+  )
 
   const { mutate: signInEmail, isPending: signInEmailPending } = useSignInEmail(
+    authClient,
     {
       onError: (error, { email }) => {
         setPassword("")
@@ -96,28 +92,6 @@ export function SignIn({
     }
   )
 
-  const { mutate: signInUsername, isPending: signInUsernamePending } =
-    useSignInUsername({
-      onError: (error) => {
-        setPassword("")
-        toast.danger(error.error?.message || error.message)
-      },
-      onSuccess: () => navigate({ to: redirectTo })
-    })
-
-  const [socialRedirecting, setSocialRedirecting] = useState(false)
-
-  const { mutate: signInSocial, isPending: socialPending } = useSignInSocial({
-    onError: (error) => toast.danger(error.error?.message || error.message),
-    onSuccess: () => {
-      setSocialRedirecting(true)
-
-      setTimeout(() => {
-        setSocialRedirecting(false)
-      }, 5000)
-    }
-  })
-
   const handleSubmit = (e: SyntheticEvent<HTMLFormElement>) => {
     e.preventDefault()
 
@@ -125,22 +99,20 @@ export function SignIn({
     const email = formData.get("email") as string
     const rememberMe = formData.get("rememberMe") === "on"
 
-    if (usernameConfig?.enabled && !isEmail(email)) {
-      signInUsername({
-        username: email,
-        password
-      })
-    } else {
-      signInEmail({
-        email,
-        password,
-        ...(emailAndPassword?.rememberMe ? { rememberMe } : {})
-      })
-    }
+    signInEmail({
+      email,
+      password,
+      ...(emailAndPassword?.rememberMe ? { rememberMe } : {})
+    })
   }
 
-  const signInPending = signInEmailPending || signInUsernamePending
-  const isPending = signInPending || socialPending || socialRedirecting
+  const signInMutating = useIsMutating({
+    mutationKey: authMutationKeys.signIn.all
+  })
+  const signUpMutating = useIsMutating({
+    mutationKey: authMutationKeys.signUp.all
+  })
+  const isPending = signInMutating + signUpMutating > 0
 
   const showSeparator = emailAndPassword?.enabled && !!socialProviders?.length
 
@@ -160,11 +132,7 @@ export function SignIn({
         {socialPosition === "top" && (
           <>
             {!!socialProviders?.length && (
-              <ProviderButtons
-                socialLayout={socialLayout}
-                signInSocial={signInSocial}
-                isPending={isPending}
-              />
+              <ProviderButtons socialLayout={socialLayout} />
             )}
 
             {showSeparator && (
@@ -177,22 +145,14 @@ export function SignIn({
           <Form onSubmit={handleSubmit} className="flex flex-col gap-4">
             <TextField
               name="email"
-              type={usernameConfig?.enabled ? "text" : "email"}
-              autoComplete={usernameConfig?.enabled ? "username" : "email"}
+              type="email"
+              autoComplete="email"
               isDisabled={isPending}
             >
-              <Label>
-                {usernameConfig?.enabled
-                  ? localization.auth.username
-                  : localization.auth.email}
-              </Label>
+              <Label>{localization.auth.email}</Label>
 
               <Input
-                placeholder={
-                  usernameConfig?.enabled
-                    ? localization.auth.usernameOrEmailPlaceholder
-                    : localization.auth.emailPlaceholder
-                }
+                placeholder={localization.auth.emailPlaceholder}
                 variant={variant === "transparent" ? "primary" : "secondary"}
                 required
               />
@@ -239,16 +199,19 @@ export function SignIn({
 
             <div className="flex flex-col gap-3">
               <Button type="submit" className="w-full" isPending={isPending}>
-                {isPending && <Spinner color="current" size="sm" />}
+                {signInEmailPending && <Spinner color="current" size="sm" />}
 
                 {localization.auth.signIn}
               </Button>
 
-              {magicLink && (
-                <MagicLinkButton view="signIn" isPending={isPending} />
+              {plugins.flatMap((plugin) =>
+                plugin.authButtons?.map((AuthButton, index) => (
+                  <AuthButton
+                    key={`${plugin.id}-${index.toString()}`}
+                    view="signIn"
+                  />
+                ))
               )}
-
-              {passkey && <PasskeyButton isPending={isPending} />}
             </div>
           </Form>
         )}
@@ -260,11 +223,7 @@ export function SignIn({
             )}
 
             {!!socialProviders?.length && (
-              <ProviderButtons
-                socialLayout={socialLayout}
-                signInSocial={signInSocial}
-                isPending={isPending}
-              />
+              <ProviderButtons socialLayout={socialLayout} />
             )}
           </>
         )}

package/src/components/auth/sign-out.tsx

@@ -12,9 +12,9 @@ export type SignOutProps = {
  * @returns A Card containing a centered Spinner shown during the sign-out process
  */
 export function SignOut({ className }: SignOutProps) {
-  const { basePaths, navigate, viewPaths } = useAuth()
+  const { authClient, basePaths, navigate, viewPaths } = useAuth()
 
-  const { mutate: signOut } = useSignOut({
+  const { mutate: signOut } = useSignOut(authClient, {
     onError: (error) => {
       toast.danger(error.error?.message || error.message)
       navigate({