@better-auth-ui/solid 1.6.19

package/src/queries/settings/list-accounts-query.ts

@@ -0,0 +1,94 @@
+import { authQueryKeys } from "@better-auth-ui/core"
+import type { QueryClient } from "@tanstack/solid-query"
+import type { AuthClient, InferData } from "../../lib/auth-client"
+import { useSession } from "../auth/session-query"
+import {
+  createUserScopedOptions,
+  createUserScopedQuery,
+  ensureUserScopedQuery,
+  fetchUserScopedQuery,
+  getSessionUserId,
+  prefetchUserScopedQuery
+} from "../create-user-scoped-query"
+
+export type ListAccountsData<TAuthClient extends AuthClient> = InferData<
+  TAuthClient["listAccounts"]
+>
+export type ListAccountsParams<TAuthClient extends AuthClient> = Parameters<
+  TAuthClient["listAccounts"]
+>[0]
+export type ListAccountsOptions<TAuthClient extends AuthClient> = Omit<
+  ReturnType<typeof listAccountsOptions<TAuthClient>>,
+  "queryKey" | "queryFn"
+>
+
+export function listAccountsOptions<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  userId: string | undefined,
+  params?: ListAccountsParams<TAuthClient>
+) {
+  return createUserScopedOptions(
+    authQueryKeys.listAccounts(userId, params?.query),
+    authClient.listAccounts,
+    params
+  )
+}
+
+export const ensureListAccounts = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListAccountsParams<TAuthClient>
+) =>
+  ensureUserScopedQuery(
+    queryClient,
+    authQueryKeys.listAccounts(userId, params?.query),
+    authClient.listAccounts,
+    params
+  )
+
+export const prefetchListAccounts = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListAccountsParams<TAuthClient>
+) =>
+  prefetchUserScopedQuery(
+    queryClient,
+    authQueryKeys.listAccounts(userId, params?.query),
+    authClient.listAccounts,
+    params
+  )
+
+export const fetchListAccounts = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListAccountsParams<TAuthClient>
+) =>
+  fetchUserScopedQuery(
+    queryClient,
+    authQueryKeys.listAccounts(userId, params?.query),
+    authClient.listAccounts,
+    params
+  )
+
+export type UseListAccountsOptions<TAuthClient extends AuthClient> =
+  ListAccountsOptions<TAuthClient> & ListAccountsParams<TAuthClient>
+
+export function useListAccounts<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options: UseListAccountsOptions<TAuthClient> = {}
+) {
+  const session = useSession(authClient)
+  const userId = () => getSessionUserId(session)
+  const { query, fetchOptions, ...queryOptionsRest } = options
+
+  return createUserScopedQuery(
+    () => authQueryKeys.listAccounts(userId(), query),
+    authClient.listAccounts,
+    () => ({ query, fetchOptions }) as ListAccountsParams<TAuthClient>,
+    () => Boolean(userId()),
+    () => queryOptionsRest
+  )
+}

package/src/queries/settings/list-sessions-query.ts

@@ -0,0 +1,96 @@
+import { authQueryKeys } from "@better-auth-ui/core"
+import type { QueryClient } from "@tanstack/solid-query"
+import type { AuthClient, InferData } from "../../lib/auth-client"
+import { useSession } from "../auth/session-query"
+import {
+  createUserScopedOptions,
+  createUserScopedQuery,
+  ensureUserScopedQuery,
+  fetchUserScopedQuery,
+  getSessionUserId,
+  prefetchUserScopedQuery
+} from "../create-user-scoped-query"
+
+export type ListSessionsData<TAuthClient extends AuthClient> = InferData<
+  TAuthClient["listSessions"]
+>
+export type ListSessionsParams<TAuthClient extends AuthClient> = Parameters<
+  TAuthClient["listSessions"]
+>[0]
+export type ListSession<TAuthClient extends AuthClient = AuthClient> =
+  NonNullable<ListSessionsData<TAuthClient>>[number]
+export type ListSessionsOptions<TAuthClient extends AuthClient> = Omit<
+  ReturnType<typeof listSessionsOptions<TAuthClient>>,
+  "queryKey" | "queryFn"
+>
+
+export function listSessionsOptions<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  userId: string | undefined,
+  params?: ListSessionsParams<TAuthClient>
+) {
+  return createUserScopedOptions(
+    authQueryKeys.listSessions(userId, params?.query),
+    authClient.listSessions,
+    params
+  )
+}
+
+export const ensureListSessions = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListSessionsParams<TAuthClient>
+) =>
+  ensureUserScopedQuery(
+    queryClient,
+    authQueryKeys.listSessions(userId, params?.query),
+    authClient.listSessions,
+    params
+  )
+
+export const prefetchListSessions = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListSessionsParams<TAuthClient>
+) =>
+  prefetchUserScopedQuery(
+    queryClient,
+    authQueryKeys.listSessions(userId, params?.query),
+    authClient.listSessions,
+    params
+  )
+
+export const fetchListSessions = <TAuthClient extends AuthClient>(
+  queryClient: QueryClient,
+  authClient: TAuthClient,
+  userId: string,
+  params?: ListSessionsParams<TAuthClient>
+) =>
+  fetchUserScopedQuery(
+    queryClient,
+    authQueryKeys.listSessions(userId, params?.query),
+    authClient.listSessions,
+    params
+  )
+
+export type UseListSessionsOptions<TAuthClient extends AuthClient> =
+  ListSessionsOptions<TAuthClient> & ListSessionsParams<TAuthClient>
+
+export function useListSessions<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options: UseListSessionsOptions<TAuthClient> = {}
+) {
+  const session = useSession(authClient)
+  const userId = () => getSessionUserId(session)
+  const { query, fetchOptions, ...queryOptionsRest } = options
+
+  return createUserScopedQuery(
+    () => authQueryKeys.listSessions(userId(), query),
+    authClient.listSessions,
+    () => ({ query, fetchOptions }) as ListSessionsParams<TAuthClient>,
+    () => Boolean(userId()),
+    () => queryOptionsRest
+  )
+}

package/src/server/queries/auth/session-query.ts

@@ -0,0 +1,56 @@
+import { authQueryKeys } from "@better-auth-ui/core"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/solid-query"
+import type { APIError } from "better-auth"
+
+import type { AuthServer } from "../../../lib/auth-server"
+
+export type SessionData<TAuth extends AuthServer = AuthServer> = Awaited<
+  ReturnType<TAuth["api"]["getSession"]>
+>
+
+export type Session<TAuth extends AuthServer = AuthServer> = NonNullable<
+  SessionData<TAuth>
+>
+
+export type SessionParams<TAuth extends AuthServer> = Parameters<
+  TAuth["api"]["getSession"]
+>[0]
+
+export function sessionOptions<TAuth extends AuthServer>(
+  auth: TAuth,
+  params: SessionParams<TAuth>
+) {
+  type TData = SessionData<TAuth>
+  const queryKey = authQueryKeys.session
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.getSession(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureSession = <TAuth extends AuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  params: SessionParams<TAuth>
+) => queryClient.ensureQueryData(sessionOptions(auth, params) as never)
+
+export const prefetchSession = <TAuth extends AuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  params: SessionParams<TAuth>
+) => queryClient.prefetchQuery(sessionOptions(auth, params) as never)
+
+export const fetchSession = <TAuth extends AuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  params: SessionParams<TAuth>
+) => queryClient.fetchQuery(sessionOptions(auth, params) as never)

package/src/server.ts

@@ -0,0 +1,7 @@
+export type * from "./lib/auth-server"
+export * from "./queries/api-key/list-api-keys-query"
+export * from "./queries/multi-session/list-device-sessions-query"
+export * from "./queries/passkey/list-passkeys-query"
+export * from "./queries/settings/account-info-query"
+export * from "./queries/settings/list-accounts-query"
+export * from "./server/queries/auth/session-query"