create-kofi-stack 1.2.11 → 1.2.13

package/dist/index.js

@@ -1877,47 +1877,74 @@ export default defineSchema({
   await writeFile(path6.join(convexDir, "schema.ts"), content);
 }
 async function generateAuthTs(config, convexDir) {
-  let content = `import { BetterAuth } from '@convex-dev/better-auth'
+  let content = `import { createClient, type GenericCtx } from '@convex-dev/better-auth'
+import { convex } from '@convex-dev/better-auth/plugins'
+import { betterAuth } from 'better-auth'
 import { components } from './_generated/api'
 import type { DataModel } from './_generated/dataModel'
+import { query } from './_generated/server'
+import authConfig from './auth.config'
 
-export const { auth, createAuth } = new BetterAuth<DataModel>(components.betterAuth, {
-  emailAndPassword: {
-    enabled: true,
-  },
-  socialProviders: {
-    google: {
-      clientId: process.env.GOOGLE_CLIENT_ID!,
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
-    },`;
+const siteUrl = process.env.SITE_URL || process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:3000'
+
+// The component client has methods for integrating Convex with Better Auth
+export const authComponent = createClient<DataModel>(components.betterAuth)
+
+// Create the Better Auth instance with Convex adapter
+export const createAuth = (ctx: GenericCtx<DataModel>) => {
+  return betterAuth({
+    baseURL: siteUrl,
+    database: authComponent.adapter(ctx),
+    emailAndPassword: {
+      enabled: true,
+      requireEmailVerification: false,
+    },
+    socialProviders: {
+      google: {
+        clientId: process.env.GOOGLE_CLIENT_ID!,
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+      },`;
   for (const provider of config.auth.providers) {
     const envPrefix = provider.toUpperCase();
     content += `
-    ${provider}: {
-      clientId: process.env.${envPrefix}_CLIENT_ID!,
-      clientSecret: process.env.${envPrefix}_CLIENT_SECRET!,
-    },`;
+      ${provider}: {
+        clientId: process.env.${envPrefix}_CLIENT_ID!,
+        clientSecret: process.env.${envPrefix}_CLIENT_SECRET!,
+      },`;
   }
   content += `
-  },`;
+    },`;
   if (config.auth.organizations) {
     content += `
-  organization: {
-    enabled: true,
-  },`;
+    organization: {
+      enabled: true,
+    },`;
   }
   content += `
+    plugins: [
+      convex({ authConfig }),
+    ],
+  })
+}
+
+// Get the current authenticated user
+export const getCurrentUser = query({
+  args: {},
+  handler: async (ctx) => {
+    return authComponent.getAuthUser(ctx)
+  },
 })
 `;
   await writeFile(path6.join(convexDir, "auth.ts"), content);
 }
 async function generateHttp(convexDir) {
   const content = `import { httpRouter } from 'convex/server'
-import { auth } from './auth'
+import { authComponent } from './auth'
 
 const http = httpRouter()
 
-auth.addHttpRoutes(http)
+// Add Better Auth HTTP routes
+authComponent.addHttpRoutes(http)
 
 export default http
 `;
@@ -1990,7 +2017,8 @@ async function generateConvexPackageJson(convexDir) {
     types: "./convex/index.ts",
     dependencies: {
       convex: "^1.25.0",
-      "@convex-dev/better-auth": "^0.10.10"
+      "@convex-dev/better-auth": "^0.10.10",
+      "better-auth": "^1.4.9"
     },
     devDependencies: {
       typescript: "^5.0.0"
@@ -2768,11 +2796,11 @@ export async function protectRoute(request: Request) {
 }
 `;
   await writeFile(path12.join(appDir, "src/lib/arcjet.ts"), content);
-  const middlewareContent = `import { NextResponse } from 'next/server'
+  const proxyContent = `import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 import { aj } from '@/lib/arcjet'
 
-export async function middleware(request: NextRequest) {
+export async function proxy(request: NextRequest) {
   // Only protect API routes
   if (request.nextUrl.pathname.startsWith('/api')) {
     const decision = await aj.protect(request)
@@ -2792,7 +2820,7 @@ export const config = {
   matcher: '/api/:path*',
 }
 `;
-  await writeFile(path12.join(appDir, "src/middleware.ts"), middlewareContent);
+  await writeFile(path12.join(appDir, "src/proxy.ts"), proxyContent);
 }
 async function generateUpstash(appDir) {
   const content = `import { Ratelimit } from '@upstash/ratelimit'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kofi-stack",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "Scaffold opinionated full-stack projects with Next.js, Convex, Better-Auth, and more",
   "type": "module",
   "bin": {