A Refactor of

README.md

@@ -515,7 +515,7 @@ export function useUpdateUser(
     options?: Partial<AuthQueryOptions>
 ) {
     type SessionData = typeof authClient["$Infer"]["Session"]
-    const { sessionKey: queryKey } = useContext(AuthQueryContext)
+    const { sessionKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/accounts/use-list-accounts.ts

@@ -1,15 +1,14 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthQuery } from "../shared/use-auth-query"
 
 export function useListAccounts<TAuthClient extends AnyAuthClient>(
     authClient: TAuthClient,
     options?: Partial<AnyUseQueryOptions>
 ) {
-    const { listAccountsKey: queryKey } = useContext(AuthQueryContext)
+    const { listAccountsKey: queryKey } = useAuthQueryContext()
 
     return useAuthQuery({
         authClient,

src/hooks/accounts/use-unlink-account.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useUnlinkAccount<TAuthClient extends AnyAuthClient>(
     authClient: TAuthClient,
     options?: AuthQueryOptions
 ) {
-    const { listAccountsKey: queryKey } = useContext(AuthQueryContext)
+    const { listAccountsKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/api-key/use-create-api-key.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useCreateApiKey<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    const { listApiKeysKey: queryKey } = useContext(AuthQueryContext)
+    const { listApiKeysKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/api-key/use-delete-api-key.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useDeleteApiKey<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    const { listApiKeysKey: queryKey } = useContext(AuthQueryContext)
+    const { listApiKeysKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/api-key/use-list-api-keys.ts

@@ -1,7 +1,6 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthQuery } from "../shared/use-auth-query"
@@ -10,7 +9,7 @@ export function useListApiKeys<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AnyUseQueryOptions>
 ) {
-    const { listApiKeysKey: queryKey } = useContext(AuthQueryContext)
+    const { listApiKeysKey: queryKey } = useAuthQueryContext()
 
     return useAuthQuery({
         authClient,

src/hooks/device-sessions/use-list-device-sessions.ts

@@ -1,7 +1,6 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthQuery } from "../shared/use-auth-query"
@@ -10,7 +9,7 @@ export function useListDeviceSessions<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AnyUseQueryOptions>
 ) {
-    const { listDeviceSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listDeviceSessionsKey: queryKey } = useAuthQueryContext()
 
     return useAuthQuery({
         authClient,

src/hooks/device-sessions/use-revoke-device-session.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useRevokeDeviceSession<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    const { listDeviceSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listDeviceSessionsKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/device-sessions/use-revoke-device-sessions.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useRevokeDeviceSessions<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: AuthQueryOptions
 ) {
-    const { listDeviceSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listDeviceSessionsKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/device-sessions/use-set-active-session.ts

@@ -1,8 +1,7 @@
 import { useMutation } from "@tanstack/react-query"
 import { useQueryClient } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 
 import type { AuthClient } from "../../types/auth-client"
 import { useOnMutateError } from "../shared/use-mutate-error"
@@ -15,7 +14,7 @@ export function useSetActiveSession<TAuthClient extends AuthClient>(
 
     const queryClient = useQueryClient()
     const { onMutateError } = useOnMutateError()
-    const context = useContext(AuthQueryContext)
+    const context = useAuthQueryContext()
     const { listDeviceSessionsKey: queryKey } = { ...context, ...options }
 
     const mutation = useMutation({

src/hooks/passkey/use-delete-passkey.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useDeletePasskey<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    const { listPasskeysKey: queryKey } = useContext(AuthQueryContext)
+    const { listPasskeysKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/passkey/use-list-passkeys.ts

@@ -1,15 +1,14 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import type { AuthClient } from "../../types/auth-client"
 import { useAuthQuery } from "../shared/use-auth-query"
 
 export function useListPasskeys<TAuthClient extends AuthClient>(
     authClient: TAuthClient,
     options?: Partial<AnyUseQueryOptions>
 ) {
-    const { listPasskeysKey: queryKey } = useContext(AuthQueryContext)
+    const { listPasskeysKey: queryKey } = useAuthQueryContext()
 
     return useAuthQuery({
         authClient,

src/hooks/session/use-session.ts

@@ -1,7 +1,6 @@
 import { type AnyUseQueryOptions, useQuery } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import type { AuthClient } from "../../types/auth-client"
 
@@ -13,7 +12,7 @@ export function useSession<TAuthClient extends AnyAuthClient>(
     type User = TAuthClient["$Infer"]["Session"]["user"]
     type Session = TAuthClient["$Infer"]["Session"]["session"]
 
-    const { sessionQueryOptions, sessionKey: queryKey, queryOptions } = useContext(AuthQueryContext)
+    const { sessionQueryOptions, sessionKey: queryKey, queryOptions } = useAuthQueryContext()
     const mergedOptions = { ...queryOptions, ...sessionQueryOptions, ...options }
 
     const result = useQuery<SessionData>({

src/hooks/session/use-update-user.ts

@@ -1,5 +1,4 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
@@ -9,7 +8,7 @@ export function useUpdateUser<TAuthClient extends AnyAuthClient>(
 ) {
     type SessionData = TAuthClient["$Infer"]["Session"]
 
-    const { sessionKey: queryKey } = useContext(AuthQueryContext)
+    const { sessionKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/sessions/use-list-sessions.ts

@@ -1,14 +1,13 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthQuery } from "../shared/use-auth-query"
 
 export function useListSessions<TAuthClient extends AnyAuthClient>(
     authClient: TAuthClient,
     options?: Partial<AnyUseQueryOptions>
 ) {
-    const { listSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listSessionsKey: queryKey } = useAuthQueryContext()
     return useAuthQuery({ authClient, queryKey, queryFn: authClient.listSessions, options })
 }

src/hooks/sessions/use-revoke-other-sessions.ts

@@ -1,5 +1,4 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useSession } from "../session/use-session"
 import { useAuthMutation } from "../shared/use-auth-mutation"
@@ -10,7 +9,7 @@ export function useRevokeOtherSessions<TAuthClient extends AnyAuthClient>(
 ) {
     type Session = TAuthClient["$Infer"]["Session"]["session"]
 
-    const { listSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listSessionsKey: queryKey } = useAuthQueryContext()
     const { data: sessionData } = useSession(authClient)
 
     return useAuthMutation({

src/hooks/sessions/use-revoke-session.ts

@@ -1,14 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useRevokeSession<TAuthClient extends AnyAuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    type Session = TAuthClient["$Infer"]["Session"]["session"]
-    const { listSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listSessionsKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/sessions/use-revoke-sessions.ts

@@ -1,13 +1,12 @@
-import { useContext } from "react"
-import { AuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
+import { useAuthQueryContext, type AuthQueryOptions } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useAuthMutation } from "../shared/use-auth-mutation"
 
 export function useRevokeSessions<TAuthClient extends AnyAuthClient>(
     authClient: TAuthClient,
     options?: Partial<AuthQueryOptions>
 ) {
-    const { listSessionsKey: queryKey } = useContext(AuthQueryContext)
+    const { listSessionsKey: queryKey } = useAuthQueryContext()
 
     return useAuthMutation({
         queryKey,

src/hooks/shared/use-auth-mutation.ts

@@ -1,8 +1,7 @@
 import { type QueryKey, useMutation, useQueryClient } from "@tanstack/react-query"
 import type { BetterFetchOption } from "better-auth/react"
-import { useContext } from "react"
 import type { AuthQueryOptions, NonThrowableResult, ThrowableResult } from "../.."
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import { useOnMutateError } from "./use-mutate-error"
 
 type AuthMutationFn<TParams> = (params: TParams) => Promise<ThrowableResult | NonThrowableResult>
@@ -26,7 +25,7 @@ export function useAuthMutation<
 }) {
     type TParams = Parameters<TAuthFn>[0]
     const queryClient = useQueryClient()
-    const context = useContext(AuthQueryContext)
+    const context = useAuthQueryContext()
     const { optimistic } = { ...context, ...options }
     const { onMutateError } = useOnMutateError()
 

src/hooks/shared/use-auth-query.ts

@@ -1,9 +1,8 @@
 import { type QueryKey, skipToken } from "@tanstack/query-core"
 import { type AnyUseQueryOptions, useQuery } from "@tanstack/react-query"
 import type { BetterFetchOption, BetterFetchResponse } from "better-auth/react"
-import { useContext } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useSession } from "../session/use-session"
 
@@ -25,7 +24,7 @@ export function useAuthQuery<TData, TAuthClient extends AnyAuthClient = AnyAuthC
     options
 }: UseAuthQueryProps<TData, TAuthClient>) {
     const { data: sessionData } = useSession(authClient)
-    const { queryOptions } = useContext(AuthQueryContext)
+    const { queryOptions } = useAuthQueryContext()
     const mergedOptions = { ...queryOptions, ...options }
 
     return useQuery<TData>({

src/hooks/shared/use-mutate-error.ts

@@ -1,10 +1,9 @@
 import { type Query, type QueryKey, useQueryClient } from "@tanstack/react-query"
-import { useContext } from "react"
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 
 export const useOnMutateError = () => {
     const queryClient = useQueryClient()
-    const { optimistic } = useContext(AuthQueryContext)
+    const { optimistic } = useAuthQueryContext()
 
     const onMutateError = (
         error: Error,

src/hooks/token/use-token.ts

@@ -1,7 +1,7 @@
 import type { AnyUseQueryOptions } from "@tanstack/react-query"
-import { useCallback, useContext, useEffect, useMemo } from "react"
+import { useCallback, useEffect, useMemo } from "react"
 
-import { AuthQueryContext } from "../../lib/auth-query-provider"
+import { useAuthQueryContext } from "../../lib/auth-query-provider"
 
 import type { AnyAuthClient } from "../../types/any-auth-client"
 import { useSession } from "../session/use-session"
@@ -25,7 +25,7 @@ export function useToken<TAuthClient extends AnyAuthClient>(
     options?: Partial<AnyUseQueryOptions>
 ) {
     const { data: sessionData } = useSession(authClient, options)
-    const { tokenKey, tokenQueryOptions, queryOptions } = useContext(AuthQueryContext)
+    const { tokenKey, tokenQueryOptions, queryOptions } = useAuthQueryContext()
     const mergedOptions = { ...queryOptions, ...tokenQueryOptions, ...options }
 
     const queryResult = useAuthQuery<{ token: string }>({