@convex-dev/better-auth 0.8.0-alpha.8 → 0.8.0

package/src/component/adapter.ts

@@ -0,0 +1,13 @@
+import { createApi } from "../client";
+import { auth } from "../auth";
+import schema from "./schema";
+
+export const {
+  create,
+  findOne,
+  findMany,
+  updateOne,
+  updateMany,
+  deleteOne,
+  deleteMany,
+} = createApi(schema, () => auth);

package/src/component/adapterTest.ts

@@ -1,49 +1,23 @@
+import { convexAdapter, GenericCtx } from "../client";
+import { api } from "./_generated/api";
+import { mutation, query } from "./_generated/server";
 import {
-  convexAdapter,
-  AuthFunctions,
-  BetterAuth,
-  PublicAuthFunctions,
-} from "../client";
-import { api, internal } from "./_generated/api";
-import { GenericCtx, mutation, query } from "./_generated/server";
-import {
+  GenericDataModel,
   GenericMutationCtx,
   GenericQueryCtx,
   RegisteredMutation,
   RegisteredQuery,
 } from "convex/server";
 
-// @ts-expect-error - this is a test
-const authFunctions: AuthFunctions = internal.adapterTest as any;
-
-const publicAuthFunctions: PublicAuthFunctions = api.adapterTest as any;
-
-export const betterAuthComponent = new BetterAuth(api as any, {
-  authFunctions,
-  publicAuthFunctions,
-  verbose: false,
-}) as any;
-
-export const createAdapter = (ctx: GenericCtx) =>
-  convexAdapter(ctx, betterAuthComponent, {
+export const createAdapter = <DataModel extends GenericDataModel>(
+  ctx: GenericCtx<DataModel>
+) =>
+  convexAdapter(ctx as any, api as any, {
     debugLogs: {
       isRunningAdapterTests: true,
     },
   });
 
-export const {
-  createUser,
-  deleteUser,
-  updateUser,
-  createSession,
-  isAuthenticated,
-} = betterAuthComponent.createAuthFunctions({
-  onCreateUser: async () => {
-    // return a random string as a userId
-    return Math.random().toString(36).substring(2, 15);
-  },
-});
-
 export const deserialize = (data: any) => {
   const dateStringRegex =
     /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/;

package/src/component/schema.ts

@@ -1,11 +1,11 @@
-// This file is auto-generated from auth.ts by generate-schema.ts. Do not edit this file manually.
+// This file is auto-generated. Do not edit this file manually.
 // To regenerate the schema, run:
-// npx tsx generate-schema.ts
+// `npx @better-auth/cli generate --output src/component/schema.ts -y`
 
 import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
 
-const schema = defineSchema({
+export const tables = {
   user: defineTable({
     name: v.string(),
     email: v.string(),
@@ -19,20 +19,13 @@ const schema = defineSchema({
     displayUsername: v.optional(v.union(v.null(), v.string())),
     phoneNumber: v.optional(v.union(v.null(), v.string())),
     phoneNumberVerified: v.optional(v.union(v.null(), v.boolean())),
-    role: v.optional(v.union(v.null(), v.string())),
-    banned: v.optional(v.union(v.null(), v.boolean())),
-    banReason: v.optional(v.union(v.null(), v.string())),
-    banExpires: v.optional(v.union(v.null(), v.number())),
-    stripeCustomerId: v.optional(v.union(v.null(), v.string())),
     userId: v.optional(v.union(v.null(), v.string())),
-    teamId: v.optional(v.union(v.null(), v.string())),
   })
-    .index("email_name", ["email","name"])
+    .index("email_name", ["email", "name"])
     .index("name", ["name"])
     .index("userId", ["userId"])
     .index("username", ["username"])
     .index("phoneNumber", ["phoneNumber"]),
-
   session: defineTable({
     expiresAt: v.number(),
     token: v.string(),
@@ -41,15 +34,11 @@ const schema = defineSchema({
     ipAddress: v.optional(v.union(v.null(), v.string())),
     userAgent: v.optional(v.union(v.null(), v.string())),
     userId: v.string(),
-    impersonatedBy: v.optional(v.union(v.null(), v.string())),
-    activeOrganizationId: v.optional(v.union(v.null(), v.string())),
-    activeTeamId: v.optional(v.union(v.null(), v.string())),
   })
     .index("expiresAt", ["expiresAt"])
-    .index("expiresAt_userId", ["expiresAt","userId"])
+    .index("expiresAt_userId", ["expiresAt", "userId"])
     .index("token", ["token"])
     .index("userId", ["userId"]),
-
   account: defineTable({
     accountId: v.string(),
     providerId: v.string(),
@@ -65,27 +54,23 @@ const schema = defineSchema({
     updatedAt: v.number(),
   })
     .index("accountId", ["accountId"])
-    .index("accountId_providerId", ["accountId","providerId"])
-    .index("providerId_userId", ["providerId","userId"])
+    .index("accountId_providerId", ["accountId", "providerId"])
+    .index("providerId_userId", ["providerId", "userId"])
     .index("userId", ["userId"]),
-
   verification: defineTable({
     identifier: v.string(),
     value: v.string(),
     expiresAt: v.number(),
-    createdAt: v.optional(v.union(v.null(), v.number())),
-    updatedAt: v.optional(v.union(v.null(), v.number())),
+    createdAt: v.number(),
+    updatedAt: v.number(),
   })
     .index("expiresAt", ["expiresAt"])
     .index("identifier", ["identifier"]),
-
   twoFactor: defineTable({
     secret: v.string(),
     backupCodes: v.string(),
     userId: v.string(),
-  })
-    .index("userId", ["userId"]),
-
+  }).index("userId", ["userId"]),
   passkey: defineTable({
     name: v.optional(v.union(v.null(), v.string())),
     publicKey: v.string(),
@@ -100,32 +85,6 @@ const schema = defineSchema({
   })
     .index("credentialID", ["credentialID"])
     .index("userId", ["userId"]),
-
-  apikey: defineTable({
-    name: v.optional(v.union(v.null(), v.string())),
-    start: v.optional(v.union(v.null(), v.string())),
-    prefix: v.optional(v.union(v.null(), v.string())),
-    key: v.string(),
-    userId: v.string(),
-    refillInterval: v.optional(v.union(v.null(), v.number())),
-    refillAmount: v.optional(v.union(v.null(), v.number())),
-    lastRefillAt: v.optional(v.union(v.null(), v.number())),
-    enabled: v.optional(v.union(v.null(), v.boolean())),
-    rateLimitEnabled: v.optional(v.union(v.null(), v.boolean())),
-    rateLimitTimeWindow: v.optional(v.union(v.null(), v.number())),
-    rateLimitMax: v.optional(v.union(v.null(), v.number())),
-    requestCount: v.optional(v.union(v.null(), v.number())),
-    remaining: v.optional(v.union(v.null(), v.number())),
-    lastRequest: v.optional(v.union(v.null(), v.number())),
-    expiresAt: v.optional(v.union(v.null(), v.number())),
-    createdAt: v.number(),
-    updatedAt: v.number(),
-    permissions: v.optional(v.union(v.null(), v.string())),
-    metadata: v.optional(v.union(v.null(), v.string())),
-  })
-    .index("key", ["key"])
-    .index("userId", ["userId"]),
-
   oauthApplication: defineTable({
     name: v.optional(v.union(v.null(), v.string())),
     icon: v.optional(v.union(v.null(), v.string())),
@@ -139,7 +98,8 @@ const schema = defineSchema({
     createdAt: v.optional(v.union(v.null(), v.number())),
     updatedAt: v.optional(v.union(v.null(), v.number())),
   })
-    .index("clientId", ["clientId"]),
+    .index("clientId", ["clientId"])
+    .index("userId", ["userId"]),
 
   oauthAccessToken: defineTable({
     accessToken: v.optional(v.union(v.null(), v.string())),
@@ -153,7 +113,9 @@ const schema = defineSchema({
     updatedAt: v.optional(v.union(v.null(), v.number())),
   })
     .index("accessToken", ["accessToken"])
-    .index("refreshToken", ["refreshToken"]),
+    .index("refreshToken", ["refreshToken"])
+    .index("clientId", ["clientId"])
+    .index("userId", ["userId"]),
 
   oauthConsent: defineTable({
     clientId: v.optional(v.union(v.null(), v.string())),
@@ -163,15 +125,15 @@ const schema = defineSchema({
     updatedAt: v.optional(v.union(v.null(), v.number())),
     consentGiven: v.optional(v.union(v.null(), v.boolean())),
   })
-    .index("clientId_userId", ["clientId","userId"]),
+    .index("clientId_userId", ["clientId", "userId"])
+    .index("userId", ["userId"]),
 
   team: defineTable({
     name: v.string(),
     organizationId: v.string(),
     createdAt: v.number(),
     updatedAt: v.optional(v.union(v.null(), v.number())),
-  })
-    .index("organizationId", ["organizationId"]),
+  }).index("organizationId", ["organizationId"]),
 
   teamMember: defineTable({
     teamId: v.string(),
@@ -197,7 +159,7 @@ const schema = defineSchema({
     role: v.string(),
     createdAt: v.number(),
   })
-    .index("organizationId_userId", ["organizationId","userId"])
+    .index("organizationId_userId", ["organizationId", "userId"])
     .index("userId", ["userId"])
     .index("role", ["role"]),
 
@@ -210,8 +172,8 @@ const schema = defineSchema({
     expiresAt: v.number(),
     inviterId: v.string(),
   })
-    .index("email_organizationId_status", ["email","organizationId","status"])
-    .index("organizationId_status", ["organizationId","status"])
+    .index("email_organizationId_status", ["email", "organizationId", "status"])
+    .index("organizationId_status", ["organizationId", "status"])
     .index("role", ["role"])
     .index("teamId", ["teamId"])
     .index("status", ["status"])
@@ -245,6 +207,8 @@ const schema = defineSchema({
     status: v.optional(v.union(v.null(), v.string())),
     periodStart: v.optional(v.union(v.null(), v.number())),
     periodEnd: v.optional(v.union(v.null(), v.number())),
+    trialStart: v.optional(v.union(v.null(), v.number())),
+    trialEnd: v.optional(v.union(v.null(), v.number())),
     cancelAtPeriodEnd: v.optional(v.union(v.null(), v.boolean())),
     seats: v.optional(v.union(v.null(), v.number())),
   })
@@ -258,187 +222,132 @@ const schema = defineSchema({
     chainId: v.number(),
     isPrimary: v.optional(v.union(v.null(), v.boolean())),
     createdAt: v.number(),
-  })
-    .index("userId", ["userId"]),
+  }).index("userId", ["userId"]),
 
   rateLimit: defineTable({
     key: v.optional(v.union(v.null(), v.string())),
     count: v.optional(v.union(v.null(), v.number())),
     lastRequest: v.optional(v.union(v.null(), v.number())),
-  })
-    .index("key", ["key"]),
+  }).index("key", ["key"]),
+  ratelimit: defineTable({
+    key: v.string(),
+    count: v.number(),
+    lastRequest: v.number(),
+  }).index("key", ["key"]),
+};
 
-});
+const schema = defineSchema(tables);
 
 export default schema;
 
 export const specialFields = {
   user: {
     name: {
-      sortable: true
+      sortable: true,
     },
     email: {
       sortable: true,
-      unique: true
+      unique: true,
     },
     username: {
       sortable: true,
-      unique: true
+      unique: true,
     },
     phoneNumber: {
       sortable: true,
-      unique: true
-    }
+      unique: true,
+    },
   },
   session: {
     token: {
-      unique: true
+      unique: true,
     },
     userId: {
       references: {
         model: "user",
         field: "id",
-        onDelete: "cascade"
-      }
-    }
+        onDelete: "cascade",
+      },
+    },
   },
   account: {
     userId: {
       references: {
         model: "user",
         field: "id",
-        onDelete: "cascade"
-      }
-    }
+        onDelete: "cascade",
+      },
+    },
   },
   twoFactor: {
     userId: {
       references: {
         model: "user",
-        field: "id"
-      }
-    }
+        field: "id",
+      },
+    },
   },
   passkey: {
     userId: {
       references: {
         model: "user",
-        field: "id"
-      }
-    }
+        field: "id",
+      },
+    },
   },
-  apikey: {
+  oauthApplication: {
+    clientId: {
+      unique: true,
+    },
     userId: {
       references: {
         model: "user",
-        field: "id"
-      }
-    }
-  },
-  oauthApplication: {
-    clientId: {
-      unique: true
-    }
+        field: "id",
+        onDelete: "cascade",
+      },
+    },
   },
   oauthAccessToken: {
     accessToken: {
-      unique: true
+      unique: true,
     },
     refreshToken: {
-      unique: true
-    }
-  },
-  team: {
-    organizationId: {
-      references: {
-        model: "organization",
-        field: "id"
-      }
-    }
-  },
-  teamMember: {
-    teamId: {
+      unique: true,
+    },
+    clientId: {
       references: {
-        model: "team",
-        field: "id"
-      }
+        model: "oauthApplication",
+        field: "clientId",
+        onDelete: "cascade",
+      },
     },
     userId: {
       references: {
         model: "user",
-        field: "id"
-      }
-    }
-  },
-  organization: {
-    name: {
-      sortable: true
+        field: "id",
+        onDelete: "cascade",
+      },
     },
-    slug: {
-      sortable: true,
-      unique: true
-    }
   },
-  member: {
-    organizationId: {
+  oauthConsent: {
+    clientId: {
       references: {
-        model: "organization",
-        field: "id"
-      }
+        model: "oauthApplication",
+        field: "clientId",
+        onDelete: "cascade",
+      },
     },
     userId: {
       references: {
         model: "user",
-        field: "id"
-      }
-    },
-    role: {
-      sortable: true
-    }
-  },
-  invitation: {
-    organizationId: {
-      references: {
-        model: "organization",
-        field: "id"
-      }
-    },
-    email: {
-      sortable: true
-    },
-    role: {
-      sortable: true
-    },
-    teamId: {
-      sortable: true
-    },
-    status: {
-      sortable: true
+        field: "id",
+        onDelete: "cascade",
+      },
     },
-    inviterId: {
-      references: {
-        model: "user",
-        field: "id"
-      }
-    }
   },
-  ssoProvider: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id"
-      }
+  ratelimit: {
+    key: {
+      unique: true,
     },
-    providerId: {
-      unique: true
-    }
   },
-  walletAddress: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id"
-      }
-    }
-  }
 };

package/src/nextjs/index.ts

@@ -1,15 +1,15 @@
-import { betterAuth } from "better-auth";
 import { createCookieGetter } from "better-auth/cookies";
-import { GenericActionCtx } from "convex/server";
 import { JWT_COOKIE_NAME } from "../plugins/convex";
+import { betterAuth } from "better-auth";
 
 export const getToken = async (
-  createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
+  createAuth: (ctx: any) => ReturnType<typeof betterAuth>
 ) => {
+  const options = createAuth({} as any).options;
   const { cookies } = await import("next/headers");
   const cookieStore = await cookies();
-  const auth = createAuth({} as any);
-  const createCookie = createCookieGetter(auth.options);
+  console.log("options", options);
+  const createCookie = createCookieGetter(options);
   const cookie = createCookie(JWT_COOKIE_NAME);
   const tokenCookie = cookieStore.get(cookie.name);
 

package/src/plugins/convex/client.ts

@@ -1,10 +1,9 @@
 import { BetterAuthClientPlugin } from "better-auth/client";
 import { convex } from ".";
-import { BetterAuthOptions } from "better-auth";
 
-export const convexClient = <O extends { options: BetterAuthOptions }>() => {
+export const convexClient = () => {
   return {
     id: "convex",
-    $InferServerPlugin: {} as ReturnType<typeof convex<O["options"]>>,
+    $InferServerPlugin: {} as ReturnType<typeof convex>,
   } satisfies BetterAuthClientPlugin;
 };