@convex-dev/better-auth 0.10.12 → 0.11.0

package/src/component/schema.ts

@@ -1,6 +1,12 @@
-// This file is auto-generated. Do not edit this file manually.
-// To regenerate the schema, run:
-// `npx @better-auth/cli generate --output src/component/schema.ts -y`
+/**
+ * This file is auto-generated. Do not edit this file manually.
+ * To regenerate the schema, run:
+ * `npx @better-auth/cli generate --output src/component/schema.ts -y`
+ * 
+ * To customize the schema, generate to an alternate file and import
+ * the table definitions to your schema file. See
+ * https://labs.convex.dev/better-auth/features/local-install#adding-custom-indexes.
+ */
 
 import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
@@ -21,7 +27,7 @@ export const tables = {
     phoneNumberVerified: v.optional(v.union(v.null(), v.boolean())),
     userId: 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"])
@@ -36,7 +42,7 @@ export const tables = {
     userId: v.string(),
   })
     .index("expiresAt", ["expiresAt"])
-    .index("expiresAt_userId", ["expiresAt", "userId"])
+    .index("expiresAt_userId", ["expiresAt","userId"])
     .index("token", ["token"])
     .index("userId", ["userId"]),
   account: defineTable({
@@ -54,8 +60,8 @@ export const tables = {
     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(),
@@ -70,20 +76,7 @@ export const tables = {
     secret: v.string(),
     backupCodes: v.string(),
     userId: v.string(),
-  }).index("userId", ["userId"]),
-  passkey: defineTable({
-    name: v.optional(v.union(v.null(), v.string())),
-    publicKey: v.string(),
-    userId: v.string(),
-    credentialID: v.string(),
-    counter: v.number(),
-    deviceType: v.string(),
-    backedUp: v.boolean(),
-    transports: v.optional(v.union(v.null(), v.string())),
-    createdAt: v.optional(v.union(v.null(), v.number())),
-    aaguid: v.optional(v.union(v.null(), v.string())),
   })
-    .index("credentialID", ["credentialID"])
     .index("userId", ["userId"]),
   oauthApplication: defineTable({
     name: v.optional(v.union(v.null(), v.string())),
@@ -91,7 +84,7 @@ export const tables = {
     metadata: v.optional(v.union(v.null(), v.string())),
     clientId: v.optional(v.union(v.null(), v.string())),
     clientSecret: v.optional(v.union(v.null(), v.string())),
-    redirectURLs: v.optional(v.union(v.null(), v.string())),
+    redirectUrls: v.optional(v.union(v.null(), v.string())),
     type: v.optional(v.union(v.null(), v.string())),
     disabled: v.optional(v.union(v.null(), v.boolean())),
     userId: v.optional(v.union(v.null(), v.string())),
@@ -123,18 +116,20 @@ export const tables = {
     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"]),
   jwks: defineTable({
     publicKey: v.string(),
     privateKey: v.string(),
     createdAt: v.number(),
+    expiresAt: v.optional(v.union(v.null(), v.number())),
   }),
   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"]),
+    key: v.string(),
+    count: v.number(),
+    lastRequest: v.number(),
+  })
+    .index("key", ["key"]),
 };
 
 const schema = defineSchema(tables);

package/src/component/testProfiles/adapterAdditionalFields.ts

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

package/src/component/testProfiles/adapterOrganizationJoins.ts

@@ -0,0 +1,13 @@
+import { createApi } from "../../client/index.js";
+import { organizationJoinsProfileOptions } from "./auth-options.profile-rename-joins.js";
+import schema from "./schema.profile-plugin-table.js";
+
+export const {
+  create,
+  findOne,
+  findMany,
+  updateOne,
+  updateMany,
+  deleteOne,
+  deleteMany,
+} = createApi(schema, () => organizationJoinsProfileOptions);

package/src/component/testProfiles/adapterPluginTable.ts

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

package/src/component/testProfiles/adapterRenameField.ts

@@ -0,0 +1,13 @@
+import { createApi } from "../../client/index.js";
+import { renameFieldProfileOptions } from "./auth-options.profile-rename-joins.js";
+import schema from "./schema.profile-plugin-table.js";
+
+export const {
+  create,
+  findOne,
+  findMany,
+  updateOne,
+  updateMany,
+  deleteOne,
+  deleteMany,
+} = createApi(schema, () => renameFieldProfileOptions);

package/src/component/testProfiles/adapterRenameUserCustom.ts

@@ -0,0 +1,13 @@
+import { createApi } from "../../client/index.js";
+import { renameModelUserCustomProfileOptions } from "./auth-options.profile-rename-joins.js";
+import schema from "./schema.profile-plugin-table.js";
+
+export const {
+  create,
+  findOne,
+  findMany,
+  updateOne,
+  updateMany,
+  deleteOne,
+  deleteMany,
+} = createApi(schema, () => renameModelUserCustomProfileOptions);

package/src/component/testProfiles/adapterRenameUserTable.ts

@@ -0,0 +1,13 @@
+import { createApi } from "../../client/index.js";
+import { renameModelUserTableProfileOptions } from "./auth-options.profile-rename-joins.js";
+import schema from "./schema.profile-plugin-table.js";
+
+export const {
+  create,
+  findOne,
+  findMany,
+  updateOne,
+  updateMany,
+  deleteOne,
+  deleteMany,
+} = createApi(schema, () => renameModelUserTableProfileOptions);

package/src/component/testProfiles/auth-options.profile-additional-fields.ts

@@ -0,0 +1,39 @@
+import type { BetterAuthOptions } from "better-auth/minimal";
+import { options } from "../../auth-options.js";
+
+// Test-only options used to build a schema/validator profile that supports
+// additional-fields coverage in adapter tests.
+export const additionalFieldsProfileOptions = {
+	...options,
+	user: {
+		...options.user,
+		additionalFields: {
+			...options.user?.additionalFields,
+			customField: {
+				type: "string",
+				required: false,
+				input: false,
+				defaultValue: "default-value",
+			},
+			numericField: {
+				type: "number",
+				required: false,
+				defaultValue: 0,
+			},
+			testField: {
+				type: "string",
+				required: false,
+				defaultValue: "test-value",
+			},
+			cbDefaultValueField: {
+				type: "string",
+				required: false,
+				defaultValue: () => "advanced-test-value",
+			},
+			dateField: {
+				type: "date",
+				required: false,
+			},
+		},
+	},
+} as BetterAuthOptions;

package/src/component/testProfiles/auth-options.profile-plugin-table.ts

@@ -0,0 +1,93 @@
+import type { BetterAuthOptions } from "better-auth/minimal";
+import { options } from "../../auth-options.js";
+
+// Test-only options used to provide static schema coverage for tests that
+// otherwise mutate plugin tables and user additional fields at runtime.
+export const pluginTableProfileOptions = {
+  ...options,
+  user: {
+    ...options.user,
+    additionalFields: {
+      ...options.user?.additionalFields,
+      testField: {
+        type: "string",
+        required: false,
+        defaultValue: "test-value",
+      },
+      cbDefaultValueField: {
+        type: "string",
+        required: false,
+        defaultValue: () => "advanced-test-value",
+      },
+      customField: {
+        type: "string",
+        required: false,
+        input: false,
+        defaultValue: "default-value",
+      },
+      numericField: {
+        type: "number",
+        required: false,
+        defaultValue: 0,
+      },
+      dateField: {
+        type: "date",
+        required: false,
+      },
+    },
+  },
+  plugins: [
+    ...(options.plugins ?? []),
+    {
+      id: "one-to-one-test",
+      schema: {
+        oneToOneTable: {
+          fields: {
+            oneToOne: {
+              type: "string",
+              required: true,
+              references: { field: "id", model: "user" },
+              unique: true,
+            },
+          },
+        },
+      },
+    },
+    {
+      id: "plugin-table-test-model",
+      schema: {
+        testModel: {
+          fields: {
+            nullableReference: {
+              type: "string",
+              references: { field: "id", model: "user" },
+              required: false,
+            },
+            testField: {
+              type: "string",
+              required: false,
+              defaultValue: "test-value",
+            },
+            cbDefaultValueField: {
+              type: "string",
+              required: false,
+              defaultValue: () => "advanced-test-value",
+            },
+            stringArray: {
+              type: "string[]",
+              required: false,
+            },
+            numberArray: {
+              type: "number[]",
+              required: false,
+            },
+            json: {
+              type: "json",
+              required: false,
+            },
+          },
+        },
+      },
+    },
+  ],
+} as BetterAuthOptions;

package/src/component/testProfiles/auth-options.profile-rename-joins.ts

@@ -0,0 +1,54 @@
+import type { BetterAuthOptions } from "better-auth/minimal";
+import { organization } from "better-auth/plugins";
+import { options } from "../../auth-options.js";
+
+const renamedOneToOnePlugin = {
+  id: "one-to-one-test",
+  schema: {
+    oneToOneTable: {
+      modelName: "one_to_one_table",
+      fields: {
+        oneToOne: {
+          type: "string",
+          required: true,
+          references: { field: "email", model: "user" },
+          unique: true,
+          fieldName: "one_to_one",
+        },
+      },
+    },
+  },
+};
+
+export const renameFieldProfileOptions = {
+  ...options,
+  user: {
+    ...options.user,
+    fields: {
+      ...options.user?.fields,
+      email: "email_address",
+    },
+  },
+  plugins: [...(options.plugins ?? []), renamedOneToOnePlugin],
+} as BetterAuthOptions;
+
+export const renameModelUserCustomProfileOptions = {
+  ...options,
+  user: {
+    ...options.user,
+    modelName: "user_custom",
+  },
+} as BetterAuthOptions;
+
+export const renameModelUserTableProfileOptions = {
+  ...options,
+  user: {
+    ...options.user,
+    modelName: "user_table",
+  },
+} as BetterAuthOptions;
+
+export const organizationJoinsProfileOptions = {
+  ...options,
+  plugins: [...(options.plugins ?? []), organization({ teams: { enabled: true } })],
+} as BetterAuthOptions;

package/src/component/testProfiles/schema.profile-additional-fields.ts

@@ -0,0 +1,39 @@
+import { defineSchema, defineTable } from "convex/server";
+import { v } from "convex/values";
+import { tables as baseTables } from "../schema.js";
+
+const userTableWithAdditionalFields = defineTable({
+	name: v.string(),
+	email: v.string(),
+	emailVerified: v.boolean(),
+	image: v.optional(v.union(v.null(), v.string())),
+	createdAt: v.number(),
+	updatedAt: v.number(),
+	twoFactorEnabled: v.optional(v.union(v.null(), v.boolean())),
+	isAnonymous: v.optional(v.union(v.null(), v.boolean())),
+	username: v.optional(v.union(v.null(), v.string())),
+	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())),
+	userId: v.optional(v.union(v.null(), v.string())),
+	customField: v.optional(v.union(v.null(), v.string())),
+	numericField: v.optional(v.union(v.null(), v.number())),
+	testField: v.optional(v.union(v.null(), v.string())),
+	cbDefaultValueField: v.optional(v.union(v.null(), v.string())),
+	dateField: v.optional(v.union(v.null(), v.number())),
+})
+	.index("email_name", ["email", "name"])
+	.index("name", ["name"])
+	.index("userId", ["userId"])
+	.index("username", ["username"])
+	.index("phoneNumber", ["phoneNumber"])
+	.index("customField", ["customField"])
+	.index("numericField", ["numericField"])
+	.index("dateField", ["dateField"]);
+
+const schema = defineSchema({
+	...baseTables,
+	user: userTableWithAdditionalFields,
+});
+
+export default schema;

package/src/component/testProfiles/schema.profile-plugin-table.ts

@@ -0,0 +1,130 @@
+import { defineSchema, defineTable } from "convex/server";
+import { v } from "convex/values";
+import { tables as baseTables } from "../schema.js";
+
+const makeUserTable = () =>
+  defineTable({
+    name: v.string(),
+    email: v.optional(v.union(v.null(), v.string())),
+    email_address: v.optional(v.union(v.null(), v.string())),
+    emailVerified: v.boolean(),
+    image: v.optional(v.union(v.null(), v.string())),
+    createdAt: v.number(),
+    updatedAt: v.number(),
+    twoFactorEnabled: v.optional(v.union(v.null(), v.boolean())),
+    isAnonymous: v.optional(v.union(v.null(), v.boolean())),
+    username: v.optional(v.union(v.null(), v.string())),
+    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())),
+    userId: v.optional(v.union(v.null(), v.string())),
+    testField: v.optional(v.union(v.null(), v.string())),
+    cbDefaultValueField: v.optional(v.union(v.null(), v.string())),
+    customField: v.optional(v.union(v.null(), v.string())),
+    numericField: v.optional(v.union(v.null(), v.number())),
+    dateField: v.optional(v.union(v.null(), v.number())),
+  })
+    .index("email_name", ["email", "name"])
+    .index("email_address_name", ["email_address", "name"])
+    .index("name", ["name"])
+    .index("userId", ["userId"])
+    .index("username", ["username"])
+    .index("phoneNumber", ["phoneNumber"])
+    .index("customField", ["customField"])
+    .index("numericField", ["numericField"])
+    .index("dateField", ["dateField"]);
+
+const userTableWithProfileFields = makeUserTable();
+
+const userCustomTable = makeUserTable();
+
+const userTableRenamed = makeUserTable();
+
+const oneToOneTable = defineTable({
+  oneToOne: v.string(),
+}).index("oneToOne", ["oneToOne"]);
+
+const oneToOneTableRenamed = defineTable({
+  oneToOne: v.optional(v.union(v.null(), v.string())),
+  one_to_one: v.optional(v.union(v.null(), v.string())),
+})
+  .index("oneToOne", ["oneToOne"])
+  .index("one_to_one", ["one_to_one"]);
+
+const testModelTable = defineTable({
+  nullableReference: v.optional(v.union(v.null(), v.string())),
+  testField: v.optional(v.union(v.null(), v.string())),
+  cbDefaultValueField: v.optional(v.union(v.null(), v.string())),
+  stringArray: v.optional(v.union(v.null(), v.array(v.string()))),
+  numberArray: v.optional(v.union(v.null(), v.array(v.number()))),
+  json: v.optional(v.any()),
+}).index("nullableReference", ["nullableReference"]);
+
+const organizationTable = defineTable({
+  name: v.string(),
+  slug: v.string(),
+  logo: v.optional(v.union(v.null(), v.string())),
+  metadata: v.optional(v.union(v.null(), v.string())),
+  createdAt: v.number(),
+  updatedAt: v.optional(v.union(v.null(), v.number())),
+})
+  .index("slug", ["slug"])
+  .index("name", ["name"]);
+
+const memberTable = defineTable({
+  organizationId: v.string(),
+  userId: v.string(),
+  role: v.string(),
+  createdAt: v.number(),
+  updatedAt: v.optional(v.union(v.null(), v.number())),
+})
+  .index("organizationId", ["organizationId"])
+  .index("userId", ["userId"]);
+
+const teamTable = defineTable({
+  name: v.string(),
+  organizationId: v.string(),
+  createdAt: v.number(),
+  updatedAt: v.optional(v.union(v.null(), v.number())),
+})
+  .index("organizationId", ["organizationId"])
+  .index("name", ["name"]);
+
+const teamMemberTable = defineTable({
+  teamId: v.string(),
+  userId: v.string(),
+  createdAt: v.optional(v.union(v.null(), v.number())),
+})
+  .index("teamId", ["teamId"])
+  .index("userId", ["userId"]);
+
+const invitationTable = defineTable({
+  email: v.optional(v.union(v.null(), v.string())),
+  role: v.optional(v.union(v.null(), v.string())),
+  status: v.optional(v.union(v.null(), v.string())),
+  organizationId: v.optional(v.union(v.null(), v.string())),
+  teamId: v.optional(v.union(v.null(), v.string())),
+  inviterId: v.optional(v.union(v.null(), v.string())),
+  expiresAt: v.optional(v.union(v.null(), v.number())),
+  createdAt: v.optional(v.union(v.null(), v.number())),
+  updatedAt: v.optional(v.union(v.null(), v.number())),
+})
+  .index("organizationId", ["organizationId"])
+  .index("email", ["email"]);
+
+const schema = defineSchema({
+  ...baseTables,
+  user: userTableWithProfileFields,
+  user_custom: userCustomTable,
+  user_table: userTableRenamed,
+  oneToOneTable,
+  one_to_one_table: oneToOneTableRenamed,
+  testModel: testModelTable,
+  organization: organizationTable,
+  member: memberTable,
+  team: teamTable,
+  teamMember: teamMemberTable,
+  invitation: invitationTable,
+});
+
+export default schema;

package/src/nextjs/index.ts

@@ -77,6 +77,7 @@ export const convexBetterAuthNextJs = (
       const mutableHeaders = new Headers(headers);
       mutableHeaders.delete("content-length");
       mutableHeaders.delete("transfer-encoding");
+      mutableHeaders.set("accept-encoding", "identity");
       return getToken(siteUrl, mutableHeaders, { ...opts, forceRefresh });
     }
   );

package/src/plugins/convex/index.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from "vitest";
+import type { AuthConfig } from "convex/server";
+import { convex } from "./index.js";
+
+const authConfig = {
+  providers: [{ applicationID: "convex", domain: "https://example.com" }],
+} satisfies AuthConfig;
+
+const getJwtSetCookieMatcher = () => {
+  const plugin = convex({ authConfig });
+  const afterHooks = plugin.hooks?.after ?? [];
+  const matcher = afterHooks.find((hook) => {
+    return (
+      hook.matcher({
+        path: "/sign-in/email",
+        context: { session: { id: "s1" } },
+      } as unknown as Parameters<typeof hook.matcher>[0]) &&
+      !hook.matcher({
+        path: "/sign-out",
+        context: { session: null },
+      } as unknown as Parameters<typeof hook.matcher>[0])
+    );
+  })?.matcher;
+  if (!matcher) {
+    throw new Error("Failed to find Convex JWT set-cookie after hook matcher");
+  }
+  return matcher;
+};
+
+describe("convex plugin JWT cookie refresh matcher", () => {
+  it("matches update-session", () => {
+    const matcher = getJwtSetCookieMatcher();
+    type MatcherContext = Parameters<typeof matcher>[0];
+    const ctx = {
+      path: "/update-session",
+      context: { session: { id: "s1" } },
+    };
+    expect(matcher(ctx as unknown as MatcherContext)).toBe(true);
+  });
+
+  it("matches get-session only when a session exists", () => {
+    const matcher = getJwtSetCookieMatcher();
+    type MatcherContext = Parameters<typeof matcher>[0];
+    const withSessionCtx = {
+      path: "/get-session",
+      context: { session: { id: "s1" } },
+    };
+    const withoutSessionCtx = {
+      path: "/get-session",
+      context: { session: null },
+    };
+    expect(matcher(withSessionCtx as unknown as MatcherContext)).toBe(true);
+    expect(matcher(withoutSessionCtx as unknown as MatcherContext)).toBe(false);
+  });
+});