Fixing issues with Better Auth

src/lib/auth-config.ts

@@ -3,13 +3,6 @@ import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { sso, oidcProvider } from "better-auth/plugins";
 import type { BunSQLiteDatabase } from "drizzle-orm/bun-sqlite";
 
-// Generate or use existing JWT secret
-const JWT_SECRET = process.env.JWT_SECRET || process.env.BETTER_AUTH_SECRET;
-
-if (!JWT_SECRET) {
-  throw new Error("JWT_SECRET or BETTER_AUTH_SECRET environment variable is required");
-}
-
 // This function will be called with the actual database instance
 export function createAuth(db: BunSQLiteDatabase) {
   return betterAuth({

src/lib/auth.ts

@@ -1,23 +1,22 @@
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-import { db } from "./db";
-
-// Generate or use existing JWT secret
-const JWT_SECRET = process.env.JWT_SECRET || process.env.BETTER_AUTH_SECRET;
-
-if (!JWT_SECRET) {
-  throw new Error("JWT_SECRET or BETTER_AUTH_SECRET environment variable is required");
-}
+import { db, users } from "./db";
+import * as schema from "./db/schema";
+import { eq } from "drizzle-orm";
 
 export const auth = betterAuth({
   // Database configuration
   database: drizzleAdapter(db, {
     provider: "sqlite",
     usePlural: true, // Our tables use plural names (users, not user)
+    schema, // Pass the schema explicitly
   }),
 
+  // Secret for signing tokens
+  secret: process.env.BETTER_AUTH_SECRET,
+
   // Base URL configuration
-  baseURL: process.env.BETTER_AUTH_URL || "http://localhost:3000",
+  baseURL: process.env.BETTER_AUTH_URL || "http://localhost:4321",
   basePath: "/api/auth", // Specify the base path for auth endpoints
 
   // Authentication methods
@@ -30,6 +29,7 @@ export const auth = betterAuth({
       console.log("Reset URL:", url);
     },
   },
+  
 
   // Session configuration
   session: {
@@ -44,9 +44,8 @@ export const auth = betterAuth({
       // Keep the username field from our existing schema
       username: {
         type: "string",
-        required: true,
-        defaultValue: "user", // Default for migration
-        input: true, // Allow in signup form
+        required: false,
+        input: false, // Don't show in signup form - we'll derive from email
       }
     },
   },
@@ -56,7 +55,7 @@ export const auth = betterAuth({
 
   // Trusted origins for CORS
   trustedOrigins: [
-    process.env.BETTER_AUTH_URL || "http://localhost:3000",
+    process.env.BETTER_AUTH_URL || "http://localhost:4321",
   ],
 });
 

src/lib/config.ts

@@ -18,9 +18,9 @@ export const ENV = {
     return "sqlite://data/gitea-mirror.db";
   },
 
-  // JWT secret for authentication
-  JWT_SECRET:
-    process.env.JWT_SECRET || "your-secret-key-change-this-in-production",
+  // Better Auth secret for authentication
+  BETTER_AUTH_SECRET:
+    process.env.BETTER_AUTH_SECRET || "your-secret-key-change-this-in-production",
 
   // Server host and port
   HOST: process.env.HOST || "localhost",

src/lib/db/schema.ts

@@ -213,16 +213,18 @@ export const eventSchema = z.object({
 
 export const users = sqliteTable("users", {
   id: text("id").primaryKey(),
-  username: text("username").notNull(),
-  password: text("password").notNull(),
-  email: text("email").notNull(),
+  name: text("name"),
+  email: text("email").notNull().unique(),
   emailVerified: integer("email_verified", { mode: "boolean" }).notNull().default(false),
+  image: text("image"),
   createdAt: integer("created_at", { mode: "timestamp" })
     .notNull()
     .default(sql`(unixepoch())`),
   updatedAt: integer("updated_at", { mode: "timestamp" })
     .notNull()
     .default(sql`(unixepoch())`),
+  // Custom fields
+  username: text("username"),
 });
 
 export const events = sqliteTable("events", {
@@ -463,9 +465,10 @@ export const sessions = sqliteTable("sessions", {
 // Accounts table (for OAuth providers and credentials)
 export const accounts = sqliteTable("accounts", {
   id: text("id").primaryKey(),
+  accountId: text("account_id").notNull(), 
   userId: text("user_id").notNull().references(() => users.id),
   providerId: text("provider_id").notNull(),
-  providerUserId: text("provider_user_id").notNull(),
+  providerUserId: text("provider_user_id"), // Make nullable for email/password auth
   accessToken: text("access_token"),
   refreshToken: text("refresh_token"),
   expiresAt: integer("expires_at", { mode: "timestamp" }),
@@ -478,6 +481,7 @@ export const accounts = sqliteTable("accounts", {
     .default(sql`(unixepoch())`),
 }, (table) => {
   return {
+    accountIdIdx: index("idx_accounts_account_id").on(table.accountId),
     userIdIdx: index("idx_accounts_user_id").on(table.userId),
     providerIdx: index("idx_accounts_provider").on(table.providerId, table.providerUserId),
   };