@better-auth-ui/solid 1.6.19

package/src/mutations/organization/cancel-invitation-mutation.ts

@@ -0,0 +1,38 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { cancelInvitationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type CancelInvitationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["cancelInvitation"]>[0]
+
+export type CancelInvitationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["cancelInvitation"]>
+
+export function cancelInvitationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.cancelInvitation,
+    organizationMutationKeys.cancelInvitation
+  )
+}
+
+export function useCancelInvitation<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient,
+  options?: CancelInvitationOptions<TAuthClient>
+) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.cancelInvitation,
+    organizationMutationKeys.cancelInvitation,
+    cancelInvitationMeta,
+    options
+  )
+}

package/src/mutations/organization/check-slug-mutation.ts

@@ -0,0 +1,36 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import { createMutation } from "@tanstack/solid-query"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions
+} from "./utils"
+
+export type CheckOrganizationSlugParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["checkSlug"]>[0]
+
+export type CheckOrganizationSlugOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["checkSlug"]>
+
+export function checkOrganizationSlugOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.checkSlug,
+    organizationMutationKeys.checkSlug
+  )
+}
+
+export function useCheckOrganizationSlug<
+  TAuthClient extends OrganizationAuthClient
+>(
+  authClient: TAuthClient,
+  options?: CheckOrganizationSlugOptions<TAuthClient>
+) {
+  return createMutation(() => ({
+    ...checkOrganizationSlugOptions(authClient),
+    ...options
+  }))
+}

package/src/mutations/organization/create-organization-mutation.ts

@@ -0,0 +1,37 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { createOrganizationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type CreateOrganizationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["create"]>[0]
+
+export type CreateOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["create"]>
+
+export function createOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.create,
+    organizationMutationKeys.create
+  )
+}
+
+export function useCreateOrganization<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient, options?: CreateOrganizationOptions<TAuthClient>) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.create,
+    organizationMutationKeys.create,
+    createOrganizationMeta,
+    options
+  )
+}

package/src/mutations/organization/delete-organization-mutation.ts

@@ -0,0 +1,37 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { deleteOrganizationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type DeleteOrganizationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["delete"]>[0]
+
+export type DeleteOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["delete"]>
+
+export function deleteOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.delete,
+    organizationMutationKeys.delete
+  )
+}
+
+export function useDeleteOrganization<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient, options?: DeleteOrganizationOptions<TAuthClient>) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.delete,
+    organizationMutationKeys.delete,
+    deleteOrganizationMeta,
+    options
+  )
+}

package/src/mutations/organization/index.ts

@@ -0,0 +1,13 @@
+export * from "./accept-invitation-mutation"
+export * from "./cancel-invitation-mutation"
+export * from "./check-slug-mutation"
+export * from "./create-organization-mutation"
+export * from "./delete-organization-mutation"
+export * from "./invite-member-mutation"
+export * from "./leave-organization-mutation"
+export * from "./metadata"
+export * from "./reject-invitation-mutation"
+export * from "./remove-member-mutation"
+export * from "./set-active-organization-mutation"
+export * from "./update-member-role-mutation"
+export * from "./update-organization-mutation"

package/src/mutations/organization/invite-member-mutation.ts

@@ -0,0 +1,38 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { inviteMemberMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type InviteMemberParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["inviteMember"]>[0]
+
+export type InviteMemberOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["inviteMember"]>
+
+export function inviteMemberOptions<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient
+) {
+  return createOrganizationMutationOptions(
+    authClient.organization.inviteMember,
+    organizationMutationKeys.inviteMember
+  )
+}
+
+export function useInviteMember<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient,
+  options?: InviteMemberOptions<TAuthClient>
+) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.inviteMember,
+    organizationMutationKeys.inviteMember,
+    inviteMemberMeta,
+    options
+  )
+}

package/src/mutations/organization/leave-organization-mutation.ts

@@ -0,0 +1,37 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { leaveOrganizationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type LeaveOrganizationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["leave"]>[0]
+
+export type LeaveOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["leave"]>
+
+export function leaveOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.leave,
+    organizationMutationKeys.leave
+  )
+}
+
+export function useLeaveOrganization<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient, options?: LeaveOrganizationOptions<TAuthClient>) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.leave,
+    organizationMutationKeys.leave,
+    leaveOrganizationMeta,
+    options
+  )
+}

package/src/mutations/organization/metadata.ts

@@ -0,0 +1,103 @@
+import { organizationQueryKeys } from "@better-auth-ui/core/plugins"
+import type { AuthMutationMeta } from "../create-auth-mutation"
+
+export type { AuthMutationMeta }
+
+export const createOrganizationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [organizationQueryKeys.lists(userId)],
+  invalidates: [
+    organizationQueryKeys.fullDetails(userId),
+    organizationQueryKeys.activeOrganizations(userId)
+  ]
+})
+
+export const updateOrganizationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.lists(userId),
+    organizationQueryKeys.fullDetails(userId),
+    organizationQueryKeys.activeOrganizations(userId)
+  ]
+})
+
+export const deleteOrganizationMeta = createOrganizationMeta
+
+export const setActiveOrganizationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [organizationQueryKeys.activeOrganizations(userId)],
+  invalidates: [organizationQueryKeys.lists(userId)]
+})
+
+export const inviteMemberMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.invitations.all(userId),
+    organizationQueryKeys.fullDetails(userId)
+  ]
+})
+
+export const memberRoleMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.members.all(userId),
+    organizationQueryKeys.fullDetails(userId)
+  ],
+  invalidates: [organizationQueryKeys.permissions.all(userId)]
+})
+
+export const removeMemberMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.members.all(userId),
+    organizationQueryKeys.fullDetails(userId)
+  ],
+  invalidates: [organizationQueryKeys.lists(userId)]
+})
+
+export const leaveOrganizationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.members.all(userId),
+    organizationQueryKeys.fullDetails(userId)
+  ],
+  invalidates: [
+    organizationQueryKeys.lists(userId),
+    organizationQueryKeys.activeOrganizations(userId)
+  ]
+})
+
+export const acceptInvitationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.userInvitations.all(userId),
+    organizationQueryKeys.lists(userId)
+  ],
+  invalidates: [
+    organizationQueryKeys.fullDetails(userId),
+    organizationQueryKeys.activeOrganizations(userId)
+  ]
+})
+
+export const cancelInvitationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [
+    organizationQueryKeys.invitations.all(userId),
+    organizationQueryKeys.fullDetails(userId)
+  ]
+})
+
+export const rejectInvitationMeta = (
+  userId: string | undefined
+): AuthMutationMeta => ({
+  awaits: [organizationQueryKeys.userInvitations.all(userId)]
+})

package/src/mutations/organization/reject-invitation-mutation.ts

@@ -0,0 +1,38 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { rejectInvitationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type RejectInvitationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["rejectInvitation"]>[0]
+
+export type RejectInvitationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["rejectInvitation"]>
+
+export function rejectInvitationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.rejectInvitation,
+    organizationMutationKeys.rejectInvitation
+  )
+}
+
+export function useRejectInvitation<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient,
+  options?: RejectInvitationOptions<TAuthClient>
+) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.rejectInvitation,
+    organizationMutationKeys.rejectInvitation,
+    rejectInvitationMeta,
+    options
+  )
+}

package/src/mutations/organization/remove-member-mutation.ts

@@ -0,0 +1,38 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { removeMemberMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type RemoveMemberParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["removeMember"]>[0]
+
+export type RemoveMemberOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["removeMember"]>
+
+export function removeMemberOptions<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient
+) {
+  return createOrganizationMutationOptions(
+    authClient.organization.removeMember,
+    organizationMutationKeys.removeMember
+  )
+}
+
+export function useRemoveMember<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient,
+  options?: RemoveMemberOptions<TAuthClient>
+) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.removeMember,
+    organizationMutationKeys.removeMember,
+    removeMemberMeta,
+    options
+  )
+}

package/src/mutations/organization/set-active-organization-mutation.ts

@@ -0,0 +1,110 @@
+import {
+  organizationMutationKeys,
+  organizationQueryKeys
+} from "@better-auth-ui/core/plugins"
+import { createMutation, useQueryClient } from "@tanstack/solid-query"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { useSession } from "../../queries/auth/session-query"
+import { useListOrganizations } from "../../queries/organization"
+import { setActiveOrganizationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions
+} from "./utils"
+
+export type SetActiveOrganizationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["setActive"]>[0]
+
+export type SetActiveOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["setActive"]>
+
+export function setActiveOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.setActive,
+    organizationMutationKeys.setActive
+  )
+}
+
+export function useSetActiveOrganization<
+  TAuthClient extends OrganizationAuthClient
+>(
+  authClient: TAuthClient,
+  options?: SetActiveOrganizationOptions<TAuthClient>
+) {
+  const session = useSession(authClient)
+  const queryClient = useQueryClient()
+  const userId = () =>
+    (session.data as { user?: { id?: string } } | undefined)?.user?.id
+  const organizationsQuery = useListOrganizations(authClient)
+
+  return createMutation(() => ({
+    ...createOrganizationMutationOptions(
+      authClient.organization.setActive,
+      organizationMutationKeys.setActive
+    ),
+    ...options,
+    meta: setActiveOrganizationMeta(userId()),
+    onMutate: async (variables) => {
+      // Cancel any outgoing refetches across every slug-partitioned
+      // active-organization cache entry so they don't overwrite our
+      // optimistic update.
+      await queryClient.cancelQueries({
+        queryKey: organizationQueryKeys.activeOrganizations(userId())
+      })
+
+      // Snapshot every slug-partitioned variant so the rollback hits
+      // whichever cache entry the UI is actually subscribed to.
+      const previousOrganizations = queryClient.getQueriesData({
+        queryKey: organizationQueryKeys.activeOrganizations(userId())
+      })
+
+      // Optimistically update to the new value
+      if (variables?.organizationId === null) {
+        queryClient.setQueriesData(
+          { queryKey: organizationQueryKeys.activeOrganizations(userId()) },
+          null
+        )
+
+        return { previousOrganizations }
+      }
+
+      const newOrganization = organizationsQuery.data?.find(
+        (org: { id?: string; slug?: string }) =>
+          (variables?.organizationId !== undefined &&
+            org.id === variables.organizationId) ||
+          (variables?.organizationSlug !== undefined &&
+            org.slug === variables.organizationSlug)
+      )
+
+      if (newOrganization) {
+        queryClient.setQueriesData(
+          { queryKey: organizationQueryKeys.activeOrganizations(userId()) },
+          newOrganization
+        )
+      }
+
+      return { previousOrganizations }
+    },
+    // If the mutation fails, use the result returned from onMutate to roll back
+    onError: (_error, _variables, onMutateResult) => {
+      const previousOrganizations = onMutateResult?.previousOrganizations
+
+      if (previousOrganizations?.length) {
+        for (const [queryKey, data] of previousOrganizations) {
+          queryClient.setQueryData(queryKey, data)
+        }
+      }
+    },
+    // Always refetch after error or success — invalidate every
+    // slug-partitioned variant via the broader prefix.
+    onSettled: async () => {
+      await queryClient.invalidateQueries({
+        queryKey: organizationQueryKeys.activeOrganizations(userId())
+      })
+    }
+  }))
+}

package/src/mutations/organization/update-member-role-mutation.ts

@@ -0,0 +1,38 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { memberRoleMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type UpdateMemberRoleParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["updateMemberRole"]>[0]
+
+export type UpdateMemberRoleOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["updateMemberRole"]>
+
+export function updateMemberRoleOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.updateMemberRole,
+    organizationMutationKeys.updateMemberRole
+  )
+}
+
+export function useUpdateMemberRole<TAuthClient extends OrganizationAuthClient>(
+  authClient: TAuthClient,
+  options?: UpdateMemberRoleOptions<TAuthClient>
+) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.updateMemberRole,
+    organizationMutationKeys.updateMemberRole,
+    memberRoleMeta,
+    options
+  )
+}

package/src/mutations/organization/update-organization-mutation.ts

@@ -0,0 +1,37 @@
+import { organizationMutationKeys } from "@better-auth-ui/core/plugins"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { updateOrganizationMeta } from "./metadata"
+import {
+  createOrganizationMutationOptions,
+  type OrganizationMutationOptions,
+  useOrganizationMutation
+} from "./utils"
+
+export type UpdateOrganizationParams<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = Parameters<TAuthClient["organization"]["update"]>[0]
+
+export type UpdateOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient = OrganizationAuthClient
+> = OrganizationMutationOptions<TAuthClient["organization"]["update"]>
+
+export function updateOrganizationOptions<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient) {
+  return createOrganizationMutationOptions(
+    authClient.organization.update,
+    organizationMutationKeys.update
+  )
+}
+
+export function useUpdateOrganization<
+  TAuthClient extends OrganizationAuthClient
+>(authClient: TAuthClient, options?: UpdateOrganizationOptions<TAuthClient>) {
+  return useOrganizationMutation(
+    authClient,
+    authClient.organization.update,
+    organizationMutationKeys.update,
+    updateOrganizationMeta,
+    options
+  )
+}

package/src/mutations/organization/utils.ts

@@ -0,0 +1,51 @@
+import {
+  type CreateMutationOptions,
+  createMutation,
+  type MutationKey
+} from "@tanstack/solid-query"
+import type { BetterFetchError } from "better-auth/client"
+import type { OrganizationAuthClient } from "../../lib/auth-client"
+import { useSession } from "../../queries/auth/session-query"
+import {
+  createAuthMutationOptions,
+  type MutationMethod
+} from "../create-auth-mutation"
+import type { AuthMutationMeta } from "./metadata"
+
+export type OrganizationMutationOptions<TMethod extends MutationMethod> = Omit<
+  CreateMutationOptions<
+    Awaited<ReturnType<TMethod>>,
+    BetterFetchError,
+    Parameters<TMethod>[0]
+  >,
+  "mutationKey" | "mutationFn" | "meta"
+>
+
+export function createOrganizationMutationOptions<
+  TMethod extends MutationMethod,
+  const TMutationKey extends MutationKey
+>(authFn: TMethod, mutationKey: TMutationKey) {
+  return createAuthMutationOptions(authFn, mutationKey)
+}
+
+export function useOrganizationMutation<
+  TAuthClient extends OrganizationAuthClient,
+  TMethod extends MutationMethod,
+  const TMutationKey extends MutationKey
+>(
+  authClient: TAuthClient,
+  authFn: TMethod,
+  mutationKey: TMutationKey,
+  meta: (userId: string | undefined) => AuthMutationMeta,
+  options?: OrganizationMutationOptions<TMethod>
+) {
+  const session = useSession(authClient)
+
+  return createMutation(() => ({
+    ...createOrganizationMutationOptions(authFn, mutationKey),
+    ...options,
+    meta: meta(
+      (session.data as { user?: { id?: string } } | undefined)?.user?.id
+    )
+  }))
+}