@better-auth-ui/react 1.6.7 → 1.6.9

package/src/server/queries/api-key/list-api-keys-query.ts

@@ -0,0 +1,94 @@
+import { apiKeyQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { ApiKeyAuthServer } from "../../../lib/auth-server"
+
+export type ListApiKeysData<TAuth extends ApiKeyAuthServer = ApiKeyAuthServer> =
+  Awaited<ReturnType<TAuth["api"]["listApiKeys"]>>
+
+export type ListedApiKey<TAuth extends ApiKeyAuthServer = ApiKeyAuthServer> =
+  NonNullable<ListApiKeysData<TAuth>>["apiKeys"][number]
+
+export type ListApiKeysParams<
+  TAuth extends ApiKeyAuthServer = ApiKeyAuthServer
+> = Parameters<TAuth["api"]["listApiKeys"]>[0]
+
+/**
+ * Query options factory for the current user's API keys on the server.
+ *
+ * Uses the same query key as the client-side `listApiKeysOptions` so that data
+ * fetched during SSR hydrates seamlessly into the client's React Query cache.
+ *
+ * @param auth - The Better Auth server instance with the API key plugin.
+ * @param userId - The signed-in user's ID. Used for cache partitioning.
+ * @param params - Parameters forwarded to `auth.api.listApiKeys`.
+ */
+export function listApiKeysOptions<TAuth extends ApiKeyAuthServer>(
+  auth: TAuth,
+  userId: string,
+  params: ListApiKeysParams<TAuth>
+) {
+  type TData = ListApiKeysData<TAuth>
+  const queryKey = apiKeyQueryKeys.list(userId, params?.query)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.listApiKeys(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+/**
+ * Get the current user's API keys from the query cache, calling
+ * `fetchListApiKeys` under the hood if no cached entry exists.
+ *
+ * @param queryClient - The React Query client used for SSR hydration.
+ * @param auth - The Better Auth server instance with the API key plugin.
+ * @param userId - The signed-in user's ID, used for cache partitioning.
+ * @param params - Parameters forwarded to `auth.api.listApiKeys`.
+ */
+export const ensureListApiKeys = <TAuth extends ApiKeyAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListApiKeysParams<TAuth>
+) => queryClient.ensureQueryData(listApiKeysOptions(auth, userId, params))
+
+/**
+ * Prefetch the current user's API keys into the query cache.
+ *
+ * @param queryClient - The React Query client used for SSR hydration.
+ * @param auth - The Better Auth server instance with the API key plugin.
+ * @param userId - The signed-in user's ID, used for cache partitioning.
+ * @param params - Parameters forwarded to `auth.api.listApiKeys`.
+ */
+export const prefetchListApiKeys = <TAuth extends ApiKeyAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListApiKeysParams<TAuth>
+) => queryClient.prefetchQuery(listApiKeysOptions(auth, userId, params))
+
+/**
+ * Fetch and cache the current user's API keys, resolving with the data or
+ * throwing on error.
+ *
+ * @param queryClient - The React Query client used for SSR hydration.
+ * @param auth - The Better Auth server instance with the API key plugin.
+ * @param userId - The signed-in user's ID, used for cache partitioning.
+ * @param params - Parameters forwarded to `auth.api.listApiKeys`.
+ */
+export const fetchListApiKeys = <TAuth extends ApiKeyAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListApiKeysParams<TAuth>
+) => queryClient.fetchQuery(listApiKeysOptions(auth, userId, params))

package/src/server/queries/multi-session/list-device-sessions-query.ts

@@ -1,4 +1,4 @@
-import { authQueryKeys } from "@better-auth-ui/core"
+import { multiSessionQueryKeys } from "@better-auth-ui/core/plugins"
 import {
   type DataTag,
   type QueryClient,
@@ -32,7 +32,7 @@ export function listDeviceSessionsOptions<TAuth extends MultiSessionAuthServer>(
   params: ListDeviceSessionsParams<TAuth>
 ) {
   type TData = ListDeviceSessionsData<TAuth>
-  const queryKey = authQueryKeys.listDeviceSessions(userId, params?.query)
+  const queryKey = multiSessionQueryKeys.list(userId, params?.query)
 
   const options = queryOptions<TData, APIError, TData, typeof queryKey>({
     queryKey,

package/src/server/queries/organization/active-organization-query.ts

@@ -0,0 +1,92 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+import type {
+  FullOrganizationData,
+  FullOrganizationParams
+} from "./full-organization-query"
+import type { ListOrganization } from "./list-organizations-query"
+
+/**
+ * Cache shape for the active organization. Intentionally narrowed to
+ * {@link ListOrganization} (basic fields only) so the cache stays
+ * compatible with `setActive`'s optimistic update, which can only produce
+ * list-shaped data. Use {@link FullOrganizationData} (via
+ * `fullOrganizationOptions`) when you need members / invitations.
+ */
+export type ActiveOrganizationData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = ListOrganization<TAuth>
+
+/**
+ * Same shape as {@link FullOrganizationParams} so server-side prefetches
+ * can target a specific organization (e.g. by `query.organizationSlug` for
+ * slug-driven routes) and produce a cache key that matches the client's
+ * `useActiveOrganization({ query: { organizationSlug } })` on hydration.
+ */
+export type ActiveOrganizationParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = FullOrganizationParams<TAuth>
+
+/**
+ * Query options factory for the active organization. Shares its cache key
+ * with the client-side `activeOrganizationOptions` (including any
+ * `params.query` partition such as `{ organizationSlug }`) so SSR-prefetched
+ * data hydrates without a refetch — even on slug-prefixed routes.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `activeOrganizationOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.getFullOrganization`. Pass
+ *   `{ query: { organizationSlug } }` for slug-driven prefetches.
+ */
+export function activeOrganizationOptions<TAuth extends OrganizationAuthServer>(
+  auth: TAuth,
+  userId: string,
+  params: ActiveOrganizationParams<TAuth>
+) {
+  type TData = ActiveOrganizationData<TAuth>
+  const queryKey = organizationQueryKeys.activeOrganization(
+    userId,
+    params?.query
+  )
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.getFullOrganization(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureActiveOrganization = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ActiveOrganizationParams<TAuth>
+) =>
+  queryClient.ensureQueryData(activeOrganizationOptions(auth, userId, params))
+
+export const prefetchActiveOrganization = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ActiveOrganizationParams<TAuth>
+) => queryClient.prefetchQuery(activeOrganizationOptions(auth, userId, params))
+
+export const fetchActiveOrganization = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ActiveOrganizationParams<TAuth>
+) => queryClient.fetchQuery(activeOrganizationOptions(auth, userId, params))

package/src/server/queries/organization/full-organization-query.ts

@@ -0,0 +1,64 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type FullOrganizationData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["getFullOrganization"]>>
+
+export type FullOrganizationParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Parameters<TAuth["api"]["getFullOrganization"]>[0]
+
+/**
+ * Query options factory for full organization details (members, invitations, etc.).
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `fullOrganizationOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.getFullOrganization`.
+ */
+export function fullOrganizationOptions<TAuth extends OrganizationAuthServer>(
+  auth: TAuth,
+  userId: string,
+  params: FullOrganizationParams<TAuth>
+) {
+  type TData = FullOrganizationData<TAuth>
+  const queryKey = organizationQueryKeys.fullDetail(userId, params?.query)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.getFullOrganization(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureFullOrganization = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: FullOrganizationParams<TAuth>
+) => queryClient.ensureQueryData(fullOrganizationOptions(auth, userId, params))
+
+export const prefetchFullOrganization = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: FullOrganizationParams<TAuth>
+) => queryClient.prefetchQuery(fullOrganizationOptions(auth, userId, params))
+
+export const fetchFullOrganization = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: FullOrganizationParams<TAuth>
+) => queryClient.fetchQuery(fullOrganizationOptions(auth, userId, params))

package/src/server/queries/organization/has-permission-query.ts

@@ -0,0 +1,66 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type HasPermissionData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["hasPermission"]>>
+
+export type HasPermissionParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Parameters<TAuth["api"]["hasPermission"]>[0]
+
+/**
+ * Query options factory for organization permission checks.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `hasPermissionOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.hasPermission`.
+ */
+export function hasPermissionOptions<TAuth extends OrganizationAuthServer>(
+  auth: TAuth,
+  userId: string,
+  params: HasPermissionParams<TAuth>
+) {
+  type TData = HasPermissionData<TAuth>
+  // Same logical payload as the client key (permissions ± organizationId): client
+  // strips `fetchOptions`; server keeps that shape under `body`.
+  const queryKey = organizationQueryKeys.permissions.has(userId, params?.body)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.hasPermission(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureHasPermission = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: HasPermissionParams<TAuth>
+) => queryClient.ensureQueryData(hasPermissionOptions(auth, userId, params))
+
+export const prefetchHasPermission = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: HasPermissionParams<TAuth>
+) => queryClient.prefetchQuery(hasPermissionOptions(auth, userId, params))
+
+export const fetchHasPermission = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: HasPermissionParams<TAuth>
+) => queryClient.fetchQuery(hasPermissionOptions(auth, userId, params))

package/src/server/queries/organization/list-invitations-query.ts

@@ -0,0 +1,81 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type ListOrganizationInvitationsData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["listInvitations"]>>
+
+export type ListOrganizationInvitationsParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Parameters<TAuth["api"]["listInvitations"]>[0]
+
+/**
+ * Query options factory for invitations of an organization.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `listOrganizationInvitationsOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.listInvitations`.
+ */
+export function listOrganizationInvitationsOptions<
+  TAuth extends OrganizationAuthServer
+>(
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationInvitationsParams<TAuth>
+) {
+  type TData = ListOrganizationInvitationsData<TAuth>
+  const queryKey = organizationQueryKeys.invitations.list(userId, params?.query)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.listInvitations(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureListOrganizationInvitations = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationInvitationsParams<TAuth>
+) =>
+  queryClient.ensureQueryData(
+    listOrganizationInvitationsOptions(auth, userId, params)
+  )
+
+export const prefetchListOrganizationInvitations = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationInvitationsParams<TAuth>
+) =>
+  queryClient.prefetchQuery(
+    listOrganizationInvitationsOptions(auth, userId, params)
+  )
+
+export const fetchListOrganizationInvitations = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationInvitationsParams<TAuth>
+) =>
+  queryClient.fetchQuery(
+    listOrganizationInvitationsOptions(auth, userId, params)
+  )

package/src/server/queries/organization/list-members-query.ts

@@ -0,0 +1,75 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type ListOrganizationMembersData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["listMembers"]>>
+
+export type ListOrganizationMembersParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Parameters<TAuth["api"]["listMembers"]>[0]
+
+/**
+ * Query options factory for members of an organization.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `listOrganizationMembersOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.listMembers`.
+ */
+export function listOrganizationMembersOptions<
+  TAuth extends OrganizationAuthServer
+>(auth: TAuth, userId: string, params: ListOrganizationMembersParams<TAuth>) {
+  type TData = ListOrganizationMembersData<TAuth>
+  const queryKey = organizationQueryKeys.members.list(userId, params?.query)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.listMembers(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureListOrganizationMembers = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationMembersParams<TAuth>
+) =>
+  queryClient.ensureQueryData(
+    listOrganizationMembersOptions(auth, userId, params)
+  )
+
+export const prefetchListOrganizationMembers = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationMembersParams<TAuth>
+) =>
+  queryClient.prefetchQuery(
+    listOrganizationMembersOptions(auth, userId, params)
+  )
+
+export const fetchListOrganizationMembers = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationMembersParams<TAuth>
+) =>
+  queryClient.fetchQuery(listOrganizationMembersOptions(auth, userId, params))

package/src/server/queries/organization/list-organizations-query.ts

@@ -0,0 +1,67 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type ListOrganizationsData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["listOrganizations"]>>
+
+export type ListOrganization<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = NonNullable<ListOrganizationsData<TAuth>>[number]
+
+export type ListOrganizationsParams<TAuth extends OrganizationAuthServer> =
+  Parameters<TAuth["api"]["listOrganizations"]>[0]
+
+/**
+ * Query options factory for organizations the current user belongs to.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `listOrganizationsOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.listOrganizations`.
+ */
+export function listOrganizationsOptions<TAuth extends OrganizationAuthServer>(
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationsParams<TAuth>
+) {
+  type TData = ListOrganizationsData<TAuth>
+  const queryKey = organizationQueryKeys.list(userId, params?.query)
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.listOrganizations(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureListOrganizations = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationsParams<TAuth>
+) => queryClient.ensureQueryData(listOrganizationsOptions(auth, userId, params))
+
+export const prefetchListOrganizations = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationsParams<TAuth>
+) => queryClient.prefetchQuery(listOrganizationsOptions(auth, userId, params))
+
+export const fetchListOrganizations = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListOrganizationsParams<TAuth>
+) => queryClient.fetchQuery(listOrganizationsOptions(auth, userId, params))

package/src/server/queries/organization/list-user-invitations-query.ts

@@ -0,0 +1,68 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import {
+  type DataTag,
+  type QueryClient,
+  queryOptions
+} from "@tanstack/react-query"
+import type { APIError } from "better-auth"
+
+import type { OrganizationAuthServer } from "../../../lib/auth-server"
+
+export type ListUserInvitationsData<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Awaited<ReturnType<TAuth["api"]["listUserInvitations"]>>
+
+export type ListUserInvitationsParams<
+  TAuth extends OrganizationAuthServer = OrganizationAuthServer
+> = Parameters<TAuth["api"]["listUserInvitations"]>[0]
+
+/**
+ * Query options factory for invitations addressed to the current user.
+ *
+ * @param auth - The Better Auth server instance.
+ * @param userId - The signed-in user's ID. Used for cache partitioning so
+ *   the key matches the client-side `listUserInvitationsOptions` for SSR hydration.
+ * @param params - Parameters forwarded to `auth.api.listUserInvitations`.
+ */
+export function listUserInvitationsOptions<
+  TAuth extends OrganizationAuthServer
+>(auth: TAuth, userId: string, params: ListUserInvitationsParams<TAuth>) {
+  type TData = ListUserInvitationsData<TAuth>
+  const queryKey = organizationQueryKeys.userInvitations.list(
+    userId,
+    params?.query
+  )
+
+  const options = queryOptions<TData, APIError, TData, typeof queryKey>({
+    queryKey,
+    queryFn: () => auth.api.listUserInvitations(params) as Promise<TData>
+  })
+
+  return options as typeof options & {
+    queryKey: DataTag<typeof queryKey, TData, APIError>
+  }
+}
+
+export const ensureListUserInvitations = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListUserInvitationsParams<TAuth>
+) =>
+  queryClient.ensureQueryData(listUserInvitationsOptions(auth, userId, params))
+
+export const prefetchListUserInvitations = <
+  TAuth extends OrganizationAuthServer
+>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListUserInvitationsParams<TAuth>
+) => queryClient.prefetchQuery(listUserInvitationsOptions(auth, userId, params))
+
+export const fetchListUserInvitations = <TAuth extends OrganizationAuthServer>(
+  queryClient: QueryClient,
+  auth: TAuth,
+  userId: string,
+  params: ListUserInvitationsParams<TAuth>
+) => queryClient.fetchQuery(listUserInvitationsOptions(auth, userId, params))

package/src/server/queries/passkey/list-passkeys-query.ts

@@ -1,4 +1,4 @@
-import { authQueryKeys } from "@better-auth-ui/core"
+import { passkeyQueryKeys } from "@better-auth-ui/core/plugins"
 import {
   type DataTag,
   type QueryClient,
@@ -33,7 +33,7 @@ export function listPasskeysOptions<TAuth extends PasskeyAuthServer>(
   params: ListPasskeysParams<TAuth>
 ) {
   type TData = ListPasskeysData<TAuth>
-  const queryKey = authQueryKeys.listPasskeys(userId, params?.query)
+  const queryKey = passkeyQueryKeys.list(userId, params?.query)
 
   const options = queryOptions<TData, APIError, TData, typeof queryKey>({
     queryKey,

package/src/server.ts

@@ -1,6 +1,14 @@
 export type * from "./lib/auth-server"
+export * from "./server/queries/api-key/list-api-keys-query"
 export * from "./server/queries/auth/session-query"
 export * from "./server/queries/multi-session/list-device-sessions-query"
+export * from "./server/queries/organization/active-organization-query"
+export * from "./server/queries/organization/full-organization-query"
+export * from "./server/queries/organization/has-permission-query"
+export * from "./server/queries/organization/list-invitations-query"
+export * from "./server/queries/organization/list-members-query"
+export * from "./server/queries/organization/list-organizations-query"
+export * from "./server/queries/organization/list-user-invitations-query"
 export * from "./server/queries/passkey/list-passkeys-query"
 export * from "./server/queries/settings/account-info-query"
 export * from "./server/queries/settings/list-accounts-query"