@convex-dev/better-auth 0.8.9 → 0.9.1

package/src/component/adapter.ts

@@ -10,4 +10,5 @@ export const {
   updateMany,
   deleteOne,
   deleteMany,
+  migrationRemoveUserId,
 } = createApi(schema, () => auth);

package/src/component/schema.ts

@@ -21,7 +21,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 +36,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 +54,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,7 +70,8 @@ export const tables = {
     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,7 +101,6 @@ export const tables = {
   })
     .index("clientId", ["clientId"])
     .index("userId", ["userId"]),
-
   oauthAccessToken: defineTable({
     accessToken: v.optional(v.union(v.null(), v.string())),
     refreshToken: v.optional(v.union(v.null(), v.string())),
@@ -116,7 +116,6 @@ export const tables = {
     .index("refreshToken", ["refreshToken"])
     .index("clientId", ["clientId"])
     .index("userId", ["userId"]),
-
   oauthConsent: defineTable({
     clientId: v.optional(v.union(v.null(), v.string())),
     userId: v.optional(v.union(v.null(), v.string())),
@@ -125,229 +124,27 @@ 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("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"]),
-
-  teamMember: defineTable({
-    teamId: v.string(),
-    userId: v.string(),
-    createdAt: v.optional(v.union(v.null(), v.number())),
-  })
-    .index("teamId", ["teamId"])
+    .index("clientId_userId", ["clientId","userId"])
     .index("userId", ["userId"]),
-
-  organization: defineTable({
-    name: v.string(),
-    slug: v.optional(v.union(v.null(), v.string())),
-    logo: v.optional(v.union(v.null(), v.string())),
-    createdAt: v.number(),
-    metadata: v.optional(v.union(v.null(), v.string())),
-  })
-    .index("name", ["name"])
-    .index("slug", ["slug"]),
-
-  member: defineTable({
-    organizationId: v.string(),
-    userId: v.string(),
-    role: v.string(),
-    createdAt: v.number(),
-  })
-    .index("organizationId_userId", ["organizationId", "userId"])
-    .index("userId", ["userId"])
-    .index("role", ["role"]),
-
-  invitation: defineTable({
-    organizationId: v.string(),
-    email: v.string(),
-    role: v.optional(v.union(v.null(), v.string())),
-    teamId: v.optional(v.union(v.null(), v.string())),
-    status: v.string(),
-    expiresAt: v.number(),
-    inviterId: v.string(),
-  })
-    .index("email_organizationId_status", ["email", "organizationId", "status"])
-    .index("organizationId_status", ["organizationId", "status"])
-    .index("role", ["role"])
-    .index("teamId", ["teamId"])
-    .index("status", ["status"])
-    .index("inviterId", ["inviterId"]),
-
-  ssoProvider: defineTable({
-    issuer: v.string(),
-    oidcConfig: v.optional(v.union(v.null(), v.string())),
-    samlConfig: v.optional(v.union(v.null(), v.string())),
-    userId: v.optional(v.union(v.null(), v.string())),
-    providerId: v.string(),
-    organizationId: v.optional(v.union(v.null(), v.string())),
-    domain: v.string(),
-  })
-    .index("organizationId", ["organizationId"])
-    .index("domain", ["domain"])
-    .index("userId", ["userId"])
-    .index("providerId", ["providerId"]),
-
   jwks: defineTable({
     publicKey: v.string(),
     privateKey: v.string(),
     createdAt: v.number(),
   }),
-
-  subscription: defineTable({
-    plan: v.string(),
-    referenceId: v.string(),
-    stripeCustomerId: v.optional(v.union(v.null(), v.string())),
-    stripeSubscriptionId: v.optional(v.union(v.null(), v.string())),
-    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())),
-  })
-    .index("stripeSubscriptionId", ["stripeSubscriptionId"])
-    .index("stripeCustomerId", ["stripeCustomerId"])
-    .index("referenceId", ["referenceId"]),
-
-  walletAddress: defineTable({
-    userId: v.string(),
-    address: v.string(),
-    chainId: v.number(),
-    isPrimary: v.optional(v.union(v.null(), v.boolean())),
-    createdAt: v.number(),
-  }).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"]),
+  })
+    .index("key", ["key"]),
 };
 
 const schema = defineSchema(tables);
 
 export default schema;
-
-export const specialFields = {
-  user: {
-    name: {
-      sortable: true,
-    },
-    email: {
-      sortable: true,
-      unique: true,
-    },
-    username: {
-      sortable: true,
-      unique: true,
-    },
-    phoneNumber: {
-      sortable: true,
-      unique: true,
-    },
-  },
-  session: {
-    token: {
-      unique: true,
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  account: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  twoFactor: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-      },
-    },
-  },
-  passkey: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-      },
-    },
-  },
-  oauthApplication: {
-    clientId: {
-      unique: true,
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  oauthAccessToken: {
-    accessToken: {
-      unique: true,
-    },
-    refreshToken: {
-      unique: true,
-    },
-    clientId: {
-      references: {
-        model: "oauthApplication",
-        field: "clientId",
-        onDelete: "cascade",
-      },
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  oauthConsent: {
-    clientId: {
-      references: {
-        model: "oauthApplication",
-        field: "clientId",
-        onDelete: "cascade",
-      },
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  ratelimit: {
-    key: {
-      unique: true,
-    },
-  },
-};

package/src/plugins/convex/index.ts

@@ -47,6 +47,17 @@ export const convex = (
     } as const,
     ...jwt.schema,
   };
+
+  const parseSetCookie = (setCookieHeader: string) => {
+    return setCookieHeader
+      .split(", ")
+      .map((cookie) => {
+        const semiIdx = cookie.indexOf(";");
+        const endIdx = semiIdx === -1 ? cookie.length + 1 : semiIdx;
+        return cookie.slice(0, endIdx);
+      })
+      .join("; ");
+  };
   return {
     id: "convex",
     init: ({ logger, options }) => {
@@ -60,11 +71,32 @@ export const convex = (
       }
     },
     hooks: {
-      before: [...bearer.hooks.before],
+      before: [
+        ...bearer.hooks.before,
+        // Don't attempt to refresh the session with a query ctx
+        {
+          matcher: (ctx) => {
+            return (
+              !ctx.context.adapter.options?.isRunMutationCtx &&
+              ctx.path === "/get-session"
+            );
+          },
+          handler: createAuthMiddleware(async (ctx) => {
+            ctx.query = { ...ctx.query, disableRefresh: true };
+            ctx.context.internalAdapter.deleteSession = async (
+              ..._args: any[]
+            ) => {
+              //skip
+            };
+            return { context: ctx };
+          }),
+        },
+      ],
       after: [
         ...oidcProvider.hooks.after,
         {
           matcher: (ctx) => {
+            console.log("ctx.path", ctx.path);
             return (
               ctx.path.startsWith("/sign-in") ||
               ctx.path.startsWith("/sign-up") ||
@@ -76,9 +108,10 @@ export const convex = (
             );
           },
           handler: createAuthMiddleware(async (ctx) => {
-            // Set jwt cookie at login for ssa
-            const cookie = ctx.context.responseHeaders?.get("set-cookie") ?? "";
-            if (!cookie) {
+            // Set jwt cookie at login for ssa using set-cookie header
+            const setCookie =
+              ctx.context.responseHeaders?.get("set-cookie") ?? "";
+            if (!setCookie) {
               return;
             }
             try {
@@ -86,7 +119,7 @@ export const convex = (
                 ...ctx,
                 method: "GET",
                 headers: {
-                  cookie,
+                  cookie: parseSetCookie(setCookie),
                 },
                 returnHeaders: false,
               });

package/src/plugins/cross-domain/index.ts

@@ -35,12 +35,19 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         options: {
           trustedOrigins: [siteUrl],
         },
+        context: {
+          oauthConfig: {
+            skipStateCookieCheck: true,
+          },
+        },
       };
     },
     hooks: {
       before: [
         {
           matcher(ctx) {
+            console.log("ctx.request?.headers", ctx.request?.headers);
+            console.log("ctx.headers", ctx.headers);
             return (
               Boolean(
                 ctx.request?.headers.get("better-auth-cookie") ||
@@ -122,6 +129,7 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
           },
           handler: createAuthMiddleware(async (ctx) => {
             const setCookie = ctx.context.responseHeaders?.get("set-cookie");
+            console.log("setCookie", setCookie);
             if (!setCookie) {
               return;
             }

package/src/react-start/index.ts

@@ -120,6 +120,14 @@ export const reactStartHandler = (
     throw new Error("VITE_CONVEX_SITE_URL is not set");
   }
   const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
-  request.headers.set("accept-encoding", "application/json");
-  return fetch(nextUrl, new Request(request, { redirect: "manual" }));
+  const headers = new Headers(request.headers);
+  headers.set("accept-encoding", "application/json");
+  return fetch(nextUrl, {
+    method: request.method,
+    headers,
+    redirect: "manual",
+    body: request.body,
+    // @ts-expect-error - duplex is required for streaming request bodies in modern fetch
+    duplex: "half",
+  });
 };

package/src/utils/index.ts

@@ -6,16 +6,11 @@ import {
 } from "convex/server";
 import { GenericCtx } from "../client";
 
-/**
- * @deprecated Just reference variables direct, the component will
- * use other ways to make sure the appropriate variables are available
- */
-export const requireEnv = (name: string) => {
-  const value = process.env[name];
-  if (value === undefined) {
-    throw new Error(`Missing environment variable \`${name}\``);
-  }
-  return value;
+export type RunMutationCtx<DataModel extends GenericDataModel> = (
+  | GenericMutationCtx<DataModel>
+  | GenericActionCtx<DataModel>
+) & {
+  runMutation: GenericMutationCtx<DataModel>["runMutation"];
 };
 
 export const isQueryCtx = <DataModel extends GenericDataModel>(
@@ -36,6 +31,12 @@ export const isActionCtx = <DataModel extends GenericDataModel>(
   return "runAction" in ctx;
 };
 
+export const isRunMutationCtx = <DataModel extends GenericDataModel>(
+  ctx: GenericCtx<DataModel>
+): ctx is RunMutationCtx<DataModel> => {
+  return "runMutation" in ctx;
+};
+
 export const requireQueryCtx = <DataModel extends GenericDataModel>(
   ctx: GenericCtx<DataModel>
 ): GenericQueryCtx<DataModel> => {
@@ -62,3 +63,12 @@ export const requireActionCtx = <DataModel extends GenericDataModel>(
   }
   return ctx;
 };
+
+export const requireRunMutationCtx = <DataModel extends GenericDataModel>(
+  ctx: GenericCtx<DataModel>
+): RunMutationCtx<DataModel> => {
+  if (!isRunMutationCtx(ctx)) {
+    throw new Error("Mutation or action context required");
+  }
+  return ctx;
+};