migrate to @convex-dev/better-auth 0.8

Author: erquhart

convex/_generated/api.d.ts

@@ -1,64 +1,84 @@
-import {
-  BetterAuth,
-  type AuthFunctions,
-  type PublicAuthFunctions,
-} from '@convex-dev/better-auth'
-import { api, components, internal } from './_generated/api'
+import { components, internal } from './_generated/api'
 import { query, QueryCtx } from './_generated/server'
 import type { Id, DataModel } from './_generated/dataModel'
 import schema from './schema'
-
-import { Infer } from 'convex/values'
+import type { Infer } from 'convex/values'
+import { betterAuth } from 'better-auth'
+import {
+  type AuthFunctions,
+  type GenericCtx,
+  createClient,
+} from '@convex-dev/better-auth'
+import { convex } from '@convex-dev/better-auth/plugins'
 
 // Typesafe way to pass Convex functions defined in this file
 const authFunctions: AuthFunctions = internal.auth
-const publicAuthFunctions: PublicAuthFunctions = api.auth
 
 // Initialize the component
-export const betterAuthComponent = new BetterAuth(components.betterAuth, {
+export const authComponent = createClient<DataModel>(components.betterAuth, {
   authFunctions,
-  publicAuthFunctions,
+  triggers: {
+    user: {
+      onCreate: async (ctx, authUser) => {
+        const userId = await ctx.db.insert('users', {
+          createdAt: authUser.createdAt,
+          email: authUser.email,
+          updatedAt: authUser.updatedAt,
+          displayUsername: authUser.displayUsername ?? '',
+          image: authUser.image ?? '',
+          name: authUser.name,
+          capabilities: [],
+        })
+        await authComponent.setUserId(ctx, authUser._id, userId)
+      },
+      onUpdate: async (ctx, _, authUser) => {
+        await ctx.db.patch(authUser.userId as Id<'users'>, {
+          email: authUser.email,
+          updatedAt: authUser.updatedAt,
+          displayUsername: authUser.displayUsername ?? '',
+          image: authUser.image ?? '',
+          name: authUser.name,
+        })
+      },
+      onDelete: async (ctx, authUser) => {
+        await ctx.db.delete(authUser.userId as Id<'users'>)
+      },
+    },
+  },
 })
 
-// These are required named exports
-export const {
-  createUser,
-  updateUser,
-  deleteUser,
-  createSession,
-  isAuthenticated,
-} = betterAuthComponent.createAuthFunctions<DataModel>({
-  // Must create a user and return the user id
-  onCreateUser: async (ctx, user) => {
-    return ctx.db.insert('users', {
-      createdAt: user.createdAt,
-      email: user.email,
-      updatedAt: user.updatedAt,
-      displayUsername: user.displayUsername ?? '',
-      image: user.image ?? '',
-      name: user.name,
-      capabilities: [],
-    })
-  },
+export const { onCreate, onUpdate, onDelete } = authComponent.triggersApi()
 
-  // Delete the user when they are deleted from Better Auth
-  onDeleteUser: async (ctx, userId) => {
-    await ctx.db.delete(userId as Id<'users'>)
-  },
+export const createAuth = (
+  ctx: GenericCtx<DataModel>,
+  { optionsOnly } = { optionsOnly: false }
+) =>
+  betterAuth({
+    // All auth requests will be proxied through your TanStack Start server
+    baseURL: process.env.URL,
+    database: authComponent.adapter(ctx),
 
-  onUpdateUser: async (ctx, user) => {
-    await ctx.db.patch(user.userId as Id<'users'>, {
-      email: user.email,
-      updatedAt: user.updatedAt,
-      displayUsername: user.displayUsername ?? '',
-      image: user.image ?? '',
-      name: user.name,
-    })
-  },
-})
+    logger: {
+      disabled: optionsOnly,
+    },
+
+    // Simple non-verified email/password to get started
+    socialProviders: {
+      github: {
+        clientId: process.env.GITHUB_OAUTH_CLIENT_ID as string,
+        clientSecret: process.env.GITHUB_OAUTH_CLIENT_SECRET as string,
+      },
+      google: {
+        clientId: process.env.GOOGLE_OAUTH_CLIENT_ID as string,
+        clientSecret: process.env.GOOGLE_OAUTH_CLIENT_SECRET as string,
+      },
+    },
+    plugins: [
+      // The Convex plugin is required
+      convex(),
+    ],
+  })
 
-// Example function for getting the current user
-// Feel free to edit, omit, etc.
 export const getCurrentUser = query({
   args: {},
   handler: async (ctx) => {
@@ -86,5 +106,5 @@ export type TanStackUser = Awaited<ReturnType<typeof getBetterAuthUser>> &
   Infer<typeof schema.tables.users.validator>
 
 function getBetterAuthUser(ctx: QueryCtx) {
-  return betterAuthComponent.getAuthUser(ctx)
+  return authComponent.safeGetAuthUser(ctx)
 }

convex/auth.ts

@@ -1,11 +1,10 @@
 import { ossStats } from './stats'
 import { httpRouter } from 'convex/server'
-import { betterAuthComponent } from './auth'
-import { createAuth } from '../src/server/auth.server'
+import { authComponent, createAuth } from './auth'
 
 const http = httpRouter()
 
 ossStats.registerRoutes(http)
-betterAuthComponent.registerRoutes(http, createAuth)
+authComponent.registerRoutes(http, createAuth)
 
 export default http

convex/http.ts

@@ -1,5 +1,4 @@
 import { defineSchema, defineTable } from 'convex/server'
-import { authTables } from '@convex-dev/auth/server'
 import { v } from 'convex/values'
 import { z } from 'zod'
 
@@ -20,7 +19,6 @@ export function validateCapability(
 const validCapabilities = VALID_CAPABILITIES
 
 const schema = defineSchema({
-  ...authTables,
   users: defineTable({
     displayUsername: v.optional(v.string()),
     createdAt: v.number(),

convex/schema.ts

@@ -19,8 +19,7 @@
   "dependencies": {
     "@auth/core": "0.37.0",
     "@clerk/tanstack-react-start": "^0.21.5",
-    "@convex-dev/auth": "^0.0.88",
-    "@convex-dev/better-auth": "^0.7.15",
+    "@convex-dev/better-auth": "^0.8.3",
     "@convex-dev/react-query": "0.0.0-alpha.11",
     "@erquhart/convex-oss-stats": "^0.8.1",
     "@floating-ui/react": "^0.27.8",
@@ -31,8 +30,8 @@
     "@octokit/rest": "^20.0.2",
     "@orama/react-components": "^0.1.23",
     "@radix-ui/react-dropdown-menu": "^2.1.12",
-    "@radix-ui/react-toast": "^1.2.2",
     "@radix-ui/react-select": "^2.2.2",
+    "@radix-ui/react-toast": "^1.2.2",
     "@remix-run/node": "^2.8.1",
     "@sentry/react": "^8.35.0",
     "@sentry/vite-plugin": "^2.22.6",
@@ -54,7 +53,7 @@
     "@vitejs/plugin-react": "^4.3.3",
     "algoliasearch": "^5.23.4",
     "axios": "^1.6.7",
-    "better-auth": "^1.3.7",
+    "better-auth": "^1.3.8",
     "cmdk": "^1.1.1",
     "convex": "^1.25.4",
     "convex-oss-stats": "link:../../../erquhart/convex-oss-stats",

package.json

@@ -1,4 +1,4 @@
-import { reactStartHandler } from "~/server/auth.server"
+import { reactStartHandler } from '@convex-dev/better-auth/react-start'
 
 export const ServerRoute = createServerFileRoute().methods({
   GET: ({ request }) => {