@convex-dev/better-auth 0.9.5 → 0.9.7-alpha.0

package/dist/esm/react-start/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,UAAU,EAAiB,MAAM,WAAW,CAAC;AAEtD,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,gBAAgB,EAC9D,YAAY,UAAU,CAAC,SAAS,CAAC,WAKlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,SAAS,SAAS,gBAAgB,EACvE,YAAY,UAAU,CAAC,SAAS,CAAC,EACjC,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS;eAa3C,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,EACxC,OAAO,SAAS,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,SAEpC,KAAK,QACN,OAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;kBAInC,QAAQ,SAAS,iBAAiB,CAAC,UAAU,CAAC,oBAC9B,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,YAEjC,QAAQ,QACZ,SAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAItC,MAAM,SAAS,iBAAiB,CAAC,QAAQ,CAAC,oBAC1B,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,UAEnC,MAAM,QACR,SAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;EAIzC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAuBF,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,SAAS,SAAS,gBAAgB,EAC9D,SAAS,OAAO,EAChB,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EAC/C,YAAY,UAAU,CAAC,SAAS,CAAC,EACjC,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE;;;EASlC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAkBrD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,UAAU,EAAiB,MAAM,WAAW,CAAC;AAEtD,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,gBAAgB,EAC9D,YAAY,UAAU,CAAC,SAAS,CAAC,WAKlC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,SAAS,gBAAgB,EAC/D,YAAY,UAAU,CAAC,SAAS,CAAC;;;CAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,SAAS,SAAS,gBAAgB,EACvE,YAAY,UAAU,CAAC,SAAS,CAAC,EACjC,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS;eAa3C,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,EACxC,OAAO,SAAS,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,SAEpC,KAAK,QACN,OAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;kBAInC,QAAQ,SAAS,iBAAiB,CAAC,UAAU,CAAC,oBAC9B,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,YAEjC,QAAQ,QACZ,SAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAItC,MAAM,SAAS,iBAAiB,CAAC,QAAQ,CAAC,oBAC1B,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,UAEnC,MAAM,QACR,SAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;EAIzC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAuBF,CAAC;AAEF,eAAO,MAAM,SAAS,GACpB,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;;cA0BF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,gBAAoB;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO;;;aAahD,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,SAAS,SAAS,gBAAgB,EAC9D,SAAS,OAAO,EAChB,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EAC/C,YAAY,UAAU,CAAC,SAAS,CAAC,EACjC,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE;;;EASlC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAkBrD,CAAC"}

package/dist/esm/react-start/index.js

@@ -1,5 +1,6 @@
 import { createCookieGetter } from "better-auth/cookies";
 import { betterFetch } from "@better-fetch/fetch";
+import * as jose from "jose";
 import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
 import { ConvexHttpClient } from "convex/browser";
 import { getStaticAuth } from "../client/index.js";
@@ -8,6 +9,13 @@ export const getCookieName = (createAuth) => {
     const cookie = createCookie(JWT_COOKIE_NAME);
     return cookie.name;
 };
+export const getCookieNames = (createAuth) => {
+    const createCookie = createCookieGetter(getStaticAuth(createAuth).options);
+    return {
+        convexJwt: createCookie(JWT_COOKIE_NAME).name,
+        sessionToken: createCookie("session_token").name,
+    };
+};
 export const setupFetchClient = async (createAuth, getCookie) => {
     const createClient = () => {
         const sessionCookieName = getCookieName(createAuth);
@@ -48,6 +56,42 @@ export const fetchSession = async (request, opts) => {
         session,
     };
 };
+export const fetchAuth = async (request, opts) => {
+    if (!request) {
+        throw new Error("No request found");
+    }
+    const convexSiteUrl = opts?.convexSiteUrl ?? process.env.VITE_CONVEX_SITE_URL;
+    if (!convexSiteUrl) {
+        throw new Error("VITE_CONVEX_SITE_URL is not set");
+    }
+    const { data } = await betterFetch("/api/auth/convex/token", {
+        baseURL: convexSiteUrl,
+        headers: {
+            cookie: request.headers.get("cookie") ?? "",
+        },
+    });
+    if (!data?.token) {
+        return;
+    }
+    const claims = jose.decodeJwt(data.token);
+    return {
+        token: data.token,
+        userId: claims.sub,
+    };
+};
+export const getAuthFromCookie = (cookie, { tolerance = 10 } = {}) => {
+    if (!cookie) {
+        return;
+    }
+    const claims = jose.decodeJwt(cookie);
+    const exp = claims?.exp;
+    const now = Math.floor(new Date().getTime() / 1000);
+    const isExpired = exp ? now > exp + tolerance : true;
+    if (isExpired) {
+        return;
+    }
+    return { userId: claims?.sub, token: cookie };
+};
 export const getAuth = async (request, getCookie, createAuth, opts) => {
     const sessionCookieName = getCookieName(createAuth);
     const token = getCookie(sessionCookieName);

package/dist/esm/react-start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -6,7 +6,7 @@
   "bugs": {
     "url": "https://github.com/get-convex/better-auth/issues"
   },
-  "version": "0.9.5",
+  "version": "0.9.7-alpha.0",
   "license": "Apache-2.0",
   "keywords": [
     "convex",
@@ -154,7 +154,7 @@
   },
   "peerDependencies": {
     "better-auth": "1.3.27",
-    "convex": "^1.26.2",
+    "convex": "^1.28.0",
     "react": "^18.3.1 || ^19.0.0",
     "react-dom": "^18.3.1 || ^19.0.0"
   },
@@ -186,6 +186,7 @@
   "dependencies": {
     "common-tags": "^1.8.2",
     "convex-helpers": "^0.1.95",
+    "jose": "^6.1.0",
     "remeda": "^2.32.0",
     "semver": "^7.7.3",
     "type-fest": "^4.39.1",

package/src/client/adapter.ts

@@ -122,6 +122,7 @@ export const convexAdapter = <
       disableIdGeneration: true,
       transaction: false,
       supportsNumericIds: false,
+      supportsJSON: false,
       usePlural: false,
       mapKeysTransformInput: {
         id: "_id",

package/src/client/createSchema.ts

@@ -1,4 +1,4 @@
-import { BetterAuthDbSchema, type FieldAttribute } from "better-auth/db";
+import type { BetterAuthDBSchema, DBFieldAttribute } from "better-auth/db";
 
 // Manually add fields to index on for schema generation,
 // all fields in the schema specialFields are automatically indexed
@@ -13,14 +13,14 @@ export const indexFields = {
 };
 
 // Return map of unique, sortable, and reference fields
-const specialFields = (tables: BetterAuthDbSchema) =>
+const specialFields = (tables: BetterAuthDBSchema) =>
   Object.fromEntries(
     Object.entries(tables)
       .map(([key, table]) => {
         const fields = Object.fromEntries(
           Object.entries(table.fields)
             .map(([fieldKey, field]) => [
-              fieldKey,
+              field.fieldName ?? fieldKey,
               {
                 ...(field.sortable ? { sortable: true } : {}),
                 ...(field.unique ? { unique: true } : {}),
@@ -38,10 +38,15 @@ const specialFields = (tables: BetterAuthDbSchema) =>
       )
   );
 
-const mergedIndexFields = (tables: BetterAuthDbSchema) =>
+const mergedIndexFields = (tables: BetterAuthDBSchema) =>
   Object.fromEntries(
-    Object.entries(tables).map(([key]) => {
-      const manualIndexes = indexFields[key as keyof typeof indexFields] || [];
+    Object.entries(tables).map(([key, table]) => {
+      const manualIndexes =
+        indexFields[key as keyof typeof indexFields]?.map((index) => {
+          return typeof index === "string"
+            ? table.fields[index]?.fieldName ?? index
+            : index.map((i) => table.fields[i]?.fieldName ?? i);
+        }) || [];
       const specialFieldIndexes = Object.keys(
         specialFields(tables)[key as keyof ReturnType<typeof specialFields>] ||
           {}
@@ -59,7 +64,7 @@ export const createSchema = async ({
   file,
   tables,
 }: {
-  tables: BetterAuthDbSchema;
+  tables: BetterAuthDBSchema;
   file?: string;
 }) => {
   // stop convex esbuild from throwing over this import, only runs
@@ -94,12 +99,13 @@ export const tables = {
       Object.entries(table.fields).filter(([key]) => key !== "id")
     );
 
-    function getType(name: string, field: FieldAttribute) {
+    function getType(name: string, field: DBFieldAttribute) {
       const type = field.type as
         | "string"
         | "number"
         | "boolean"
         | "date"
+        | "json"
         | `${"string" | "number"}[]`;
 
       const typeMap: Record<typeof type, string> = {
@@ -107,6 +113,7 @@ export const tables = {
         boolean: `v.boolean()`,
         number: `v.number()`,
         date: `v.number()`,
+        json: `v.string()`,
         "number[]": `v.array(v.number())`,
         "string[]": `v.array(v.string())`,
       } as const;
@@ -115,7 +122,7 @@ export const tables = {
 
     const indexes =
       mergedIndexFields(tables)[
-        modelName as keyof typeof mergedIndexFields
+        tableKey as keyof typeof mergedIndexFields
       ]?.map((index) => {
         const indexArray = Array.isArray(index) ? index.sort() : [index];
         const indexName = indexArray.join("_");
@@ -126,12 +133,12 @@ export const tables = {
 ${Object.keys(fields)
   .map((field) => {
     const attr = fields[field]!;
-    const type = getType(field, attr as FieldAttribute);
+    const type = getType(field, attr as DBFieldAttribute);
     const optional = (fieldSchema: string) =>
       attr.required
         ? fieldSchema
         : `v.optional(v.union(v.null(), ${fieldSchema}))`;
-    return `    ${field}: ${optional(type)},`;
+    return `    ${attr.fieldName ?? field}: ${optional(type)},`;
   })
   .join("\n")}
   })${indexes.length > 0 ? `\n    ${indexes.join("\n    ")}` : ""},\n`;

package/src/client/index.ts

@@ -19,7 +19,7 @@ import {
 } from "convex/server";
 import { type GenericId, Infer, v } from "convex/values";
 import { convexAdapter } from "./adapter";
-import { AdapterInstance, betterAuth } from "better-auth";
+import { AdapterInstance, Auth, betterAuth } from "better-auth";
 import { asyncMap } from "convex-helpers";
 import { partial } from "convex-helpers/validators";
 import {
@@ -44,16 +44,19 @@ export type CreateAdapter = <Ctx extends GenericCtx<GenericDataModel>>(
   ctx: Ctx
 ) => AdapterInstance;
 
-export type CreateAuth<DataModel extends GenericDataModel> =
-  | ((ctx: GenericCtx<DataModel>) => ReturnType<typeof betterAuth>)
-  | ((
-      ctx: GenericCtx<DataModel>,
-      opts?: { optionsOnly?: boolean }
-    ) => ReturnType<typeof betterAuth>);
+export type CreateAuth<
+  DataModel extends GenericDataModel,
+  A extends ReturnType<typeof betterAuth> = Auth,
+> =
+  | ((ctx: GenericCtx<DataModel>) => A)
+  | ((ctx: GenericCtx<DataModel>, opts?: { optionsOnly?: boolean }) => A);
 
-export const getStaticAuth = <DataModel extends GenericDataModel>(
-  createAuth: CreateAuth<DataModel>
-) => {
+export const getStaticAuth = <
+  DataModel extends GenericDataModel,
+  Auth extends ReturnType<typeof betterAuth>,
+>(
+  createAuth: CreateAuth<DataModel, Auth>
+): Auth => {
   return createAuth({} as any, { optionsOnly: true });
 };
 
@@ -417,11 +420,11 @@ export type Triggers<
     ) => Promise<void>;
     onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
       ctx: Ctx,
-      oldDoc: Infer<Schema["tables"][K]["validator"]> & {
+      newDoc: Infer<Schema["tables"][K]["validator"]> & {
         _id: string;
         _creationTime: number;
       },
-      newDoc: Infer<Schema["tables"][K]["validator"]> & {
+      oldDoc: Infer<Schema["tables"][K]["validator"]> & {
         _id: string;
         _creationTime: number;
       }
@@ -451,10 +454,14 @@ export const createClient = <
     local?: {
       schema?: Schema;
     };
-    authFunctions?: AuthFunctions;
     verbose?: boolean;
-    triggers?: Triggers<DataModel, Schema>;
-  }
+  } & (
+    | {
+        triggers: Triggers<DataModel, Schema>;
+        authFunctions: AuthFunctions;
+      }
+    | { triggers?: undefined }
+  )
 ) => {
   type BetterAuthDataModel = DataModelFromSchemaDefinition<Schema>;
 

package/src/react-start/index.ts

@@ -1,6 +1,7 @@
 import { betterAuth } from "better-auth";
 import { createCookieGetter } from "better-auth/cookies";
 import { betterFetch } from "@better-fetch/fetch";
+import * as jose from "jose";
 import {
   FunctionReference,
   FunctionReturnType,
@@ -19,6 +20,16 @@ export const getCookieName = <DataModel extends GenericDataModel>(
   return cookie.name;
 };
 
+export const getCookieNames = <DataModel extends GenericDataModel>(
+  createAuth: CreateAuth<DataModel>
+) => {
+  const createCookie = createCookieGetter(getStaticAuth(createAuth).options);
+  return {
+    convexJwt: createCookie(JWT_COOKIE_NAME).name,
+    sessionToken: createCookie("session_token").name,
+  };
+};
+
 export const setupFetchClient = async <DataModel extends GenericDataModel>(
   createAuth: CreateAuth<DataModel>,
   getCookie: (name: string) => string | undefined
@@ -95,6 +106,56 @@ export const fetchSession = async <
   };
 };
 
+export const fetchAuth = async (
+  request: Request,
+  opts?: {
+    convexSiteUrl?: string;
+    verbose?: boolean;
+  }
+) => {
+  if (!request) {
+    throw new Error("No request found");
+  }
+  const convexSiteUrl = opts?.convexSiteUrl ?? process.env.VITE_CONVEX_SITE_URL;
+  if (!convexSiteUrl) {
+    throw new Error("VITE_CONVEX_SITE_URL is not set");
+  }
+  const { data } = await betterFetch<{ token: string }>(
+    "/api/auth/convex/token",
+    {
+      baseURL: convexSiteUrl,
+      headers: {
+        cookie: request.headers.get("cookie") ?? "",
+      },
+    }
+  );
+  if (!data?.token) {
+    return;
+  }
+  const claims = jose.decodeJwt(data.token);
+  return {
+    token: data.token,
+    userId: claims.sub,
+  };
+};
+
+export const getAuthFromCookie = (
+  cookie?: string,
+  { tolerance = 10 }: { tolerance?: number } = {}
+) => {
+  if (!cookie) {
+    return;
+  }
+  const claims = jose.decodeJwt(cookie);
+  const exp = claims?.exp;
+  const now = Math.floor(new Date().getTime() / 1000);
+  const isExpired = exp ? now > exp + tolerance : true;
+  if (isExpired) {
+    return;
+  }
+  return { userId: claims?.sub, token: cookie };
+};
+
 export const getAuth = async <DataModel extends GenericDataModel>(
   request: Request,
   getCookie: (name: string) => string | undefined,