@convex-dev/better-auth 0.6.1 → 0.7.0-alpha.0

package/src/plugins/convex/index.ts

@@ -1,8 +1,4 @@
-import {
-  createAuthMiddleware,
-  getSession,
-  sessionMiddleware,
-} from "better-auth/api";
+import { createAuthMiddleware, sessionMiddleware } from "better-auth/api";
 import {
   BetterAuthPlugin,
   createAuthEndpoint,
@@ -14,10 +10,18 @@ import {
 import { omit } from "convex-helpers";
 import { z } from "zod";
 
-const JWT_COOKIE_NAME = "convex_jwt";
+export const JWT_COOKIE_NAME = "convex_jwt";
 
-export const convex = (opts: { jwtExpirationSeconds?: number } = {}) => {
-  const { jwtExpirationSeconds = 60 * 15 } = opts;
+export const convex = (
+  opts: {
+    jwtExpirationSeconds?: number;
+    deleteExpiredSessionsOnLogin?: boolean;
+  } = {}
+) => {
+  const {
+    jwtExpirationSeconds = 60 * 15,
+    deleteExpiredSessionsOnLogin = false,
+  } = opts;
   const customSession = customSessionPlugin(async ({ user, session }) => {
     const { userId, ...userData } = omit(user, ["id"]) as typeof user & {
       userId: string;
@@ -54,8 +58,8 @@ export const convex = (opts: { jwtExpirationSeconds?: number } = {}) => {
     },
   });
   // Bearer plugin converts the session token to a cookie
-  // for cross domain social login after code verification, and is required for
-  // the headers() helper to work.
+  // for cross domain social login after code verification,
+  // and is required for the headers() helper to work.
   const bearer = bearerPlugin();
   const schema = {
     user: {
@@ -69,6 +73,70 @@ export const convex = (opts: { jwtExpirationSeconds?: number } = {}) => {
       before: [...bearer.hooks.before],
       after: [
         ...oidcProvider.hooks.after,
+        {
+          matcher: (ctx) => {
+            return (
+              deleteExpiredSessionsOnLogin &&
+              (ctx.path?.startsWith("/sign-in") ||
+                ctx.path?.startsWith("/callback"))
+            );
+          },
+          handler: createAuthMiddleware(async (ctx) => {
+            // Delete expired sessions at login
+            const userId = ctx.context.newSession?.user.id;
+            if (!userId) {
+              return;
+            }
+            await ctx.context.adapter.deleteMany({
+              model: "session",
+              where: [
+                {
+                  field: "userId",
+                  operator: "eq",
+                  value: userId,
+                  connector: "AND",
+                },
+                {
+                  operator: "lte",
+                  field: "expiresAt",
+                  value: new Date().getTime(),
+                },
+              ],
+            });
+          }),
+        },
+        {
+          matcher: (ctx) => {
+            return (
+              ctx.path?.startsWith("/sign-in") ||
+              ctx.path?.startsWith("/callback")
+            );
+          },
+          handler: createAuthMiddleware(async (ctx) => {
+            // Set jwt cookie at login for ssa
+            const cookie = ctx.context.responseHeaders?.get("set-cookie") ?? "";
+            if (!cookie) {
+              return;
+            }
+            try {
+              const { token } = await jwt.endpoints.getToken({
+                ...ctx,
+                method: "GET",
+                headers: {
+                  cookie,
+                },
+                returnHeaders: false,
+              });
+              const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, {
+                maxAge: jwtExpirationSeconds,
+              });
+              ctx.setCookie(jwtCookie.name, token, jwtCookie.attributes);
+            } catch (err) {
+              // no-op, some sign-in calls (eg., when redirecting to 2fa)
+              // 401 here
+            }
+          }),
+        },
         {
           matcher: (ctx) => {
             return ctx.path?.startsWith("/sign-out");
@@ -137,7 +205,7 @@ export const convex = (opts: { jwtExpirationSeconds?: number } = {}) => {
           });
           return response;
         }
-      ) as unknown as ReturnType<typeof getSession>,
+      ),
       getOpenIdConfig: createAuthEndpoint(
         "/convex/.well-known/openid-configuration",
         {

package/src/react-router/index.ts

@@ -0,0 +1,31 @@
+import { betterAuth } from "better-auth";
+import { createCookieGetter } from "better-auth/cookies";
+import { GenericActionCtx } from "convex/server";
+import { JWT_COOKIE_NAME } from "../plugins/convex";
+
+export const getToken = async (
+  createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
+) => {
+  const { cookies } = await import("next/headers");
+  const cookieStore = await cookies();
+  const auth = createAuth({} as any);
+  const createCookie = createCookieGetter(auth.options);
+  const cookie = createCookie(JWT_COOKIE_NAME);
+  const token = cookieStore.get(cookie.name);
+  return token?.value;
+};
+
+const handler = (request: Request, opts?: { convexSiteUrl?: string }) => {
+  const requestUrl = new URL(request.url);
+  const convexSiteUrl =
+    opts?.convexSiteUrl ?? process.env.NEXT_PUBLIC_CONVEX_SITE_URL;
+  const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
+  const newRequest = new Request(nextUrl, request);
+  newRequest.headers.set("accept-encoding", "application/json");
+  return fetch(newRequest, { method: request.method, redirect: "manual" });
+};
+
+export const nextJsHandler = (opts?: { convexSiteUrl?: string }) => ({
+  GET: (request: Request) => handler(request, opts),
+  POST: (request: Request) => handler(request, opts),
+});

package/src/react-start/index.ts

@@ -2,13 +2,14 @@ import { betterAuth } from "better-auth";
 import { createCookieGetter } from "better-auth/cookies";
 import { betterFetch } from "@better-fetch/fetch";
 import { GenericActionCtx } from "convex/server";
+import { JWT_COOKIE_NAME } from "../plugins/convex";
 
 export const getCookieName = async (
   createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
 ) => {
   const auth = createAuth({} as any);
   const createCookie = createCookieGetter(auth.options);
-  const cookie = createCookie("convex_jwt");
+  const cookie = createCookie(JWT_COOKIE_NAME);
   return cookie.name;
 };
 
@@ -30,7 +31,6 @@ export const fetchSession = async <
       baseURL,
       headers: {
         cookie: request.headers.get("cookie") ?? "",
-        origin: baseURL,
       },
     }
   );

package/src/util.ts

@@ -0,0 +1,7 @@
+export const requireEnv = (name: string) => {
+  const value = process.env[name];
+  if (value === undefined) {
+    throw new Error(`Missing environment variable \`${name}\``);
+  }
+  return value;
+};