@convex-dev/better-auth 0.9.10 → 0.10.0

package/dist/nextjs/index.js

@@ -1,45 +1,99 @@
-import { createCookieGetter } from "better-auth/cookies";
-import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
-import { getStaticAuth } from "../client/index.js";
-export const getToken = async (createAuth) => {
-    const options = getStaticAuth(createAuth).options;
-    const { cookies } = await import("next/headers.js");
-    const cookieStore = await cookies();
-    const createCookie = createCookieGetter(options);
-    const cookie = createCookie(JWT_COOKIE_NAME);
-    const tokenCookie = cookieStore.get(cookie.name);
-    // Warn if there's a secure cookie mismatch between Convex and Next.js
-    if (!tokenCookie?.value) {
-        const isSecure = cookie.name.startsWith("__Secure-");
-        const insecureCookieName = cookie.name.replace("__Secure-", "");
-        const insecureCookie = cookieStore.get(insecureCookieName);
-        const secureCookieName = isSecure
-            ? cookie.name
-            : `__Secure-${insecureCookieName}`;
-        const secureCookie = cookieStore.get(secureCookieName);
-        if (isSecure && insecureCookie) {
-            console.warn(`Looking for secure cookie ${cookie.name} but found insecure cookie ${insecureCookie.name}`);
-        }
-        if (!isSecure && secureCookie) {
-            console.warn(`Looking for insecure cookie ${cookie.name} but found secure cookie ${secureCookie.name}`);
-        }
+import { stripIndent } from "common-tags";
+import { fetchAction, fetchMutation, fetchQuery, preloadQuery, } from "convex/nextjs";
+import {} from "convex/server";
+import React from "react";
+import { getToken } from "../utils/index.js";
+// Caching supported for React 19+ only
+const cache = React.cache ||
+    ((fn) => {
+        return (...args) => fn(...args);
+    });
+const parseConvexSiteUrl = (url) => {
+    if (!url) {
+        throw new Error(stripIndent `
+      CONVEX_SITE_URL is not set.
+      This is automatically set in the Convex backend, but must be set in the Next.js environment.
+      For local development, this can be set in the .env.local file.
+    `);
     }
-    return tokenCookie?.value;
+    if (url.endsWith(".convex.cloud")) {
+        throw new Error(stripIndent `
+      CONVEX_SITE_URL should be set to your Convex Site URL, which ends in .convex.site.
+      Currently set to ${url}.
+    `);
+    }
+    return url;
 };
-const handler = (request, opts) => {
+const handler = (request, siteUrl) => {
     const requestUrl = new URL(request.url);
-    const convexSiteUrl = opts?.convexSiteUrl ?? process.env.NEXT_PUBLIC_CONVEX_SITE_URL;
-    if (!convexSiteUrl) {
-        throw new Error("NEXT_PUBLIC_CONVEX_SITE_URL is not set");
-    }
-    const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
+    const nextUrl = `${siteUrl}${requestUrl.pathname}${requestUrl.search}`;
     const newRequest = new Request(nextUrl, request);
     newRequest.headers.set("accept-encoding", "application/json");
-    newRequest.headers.set("host", convexSiteUrl);
+    newRequest.headers.set("host", siteUrl);
     return fetch(newRequest, { method: request.method, redirect: "manual" });
 };
-export const nextJsHandler = (opts) => ({
-    GET: (request) => handler(request, opts),
-    POST: (request) => handler(request, opts),
+const nextJsHandler = (siteUrl) => ({
+    GET: (request) => handler(request, siteUrl),
+    POST: (request) => handler(request, siteUrl),
 });
+const getArgsAndOptions = (args, token) => {
+    return [args[0], { token }];
+};
+export const convexBetterAuthNextJs = (opts) => {
+    const siteUrl = parseConvexSiteUrl(opts.convexSiteUrl);
+    const cachedGetToken = cache(async ({ forceRefresh } = {}) => {
+        const headers = await (await import("next/headers.js")).headers();
+        return getToken(siteUrl, headers, { ...opts, forceRefresh });
+    });
+    const callWithToken = async (fn) => {
+        const token = await cachedGetToken();
+        try {
+            return await fn(token?.token);
+        }
+        catch (error) {
+            if (!opts?.jwtCache?.enabled ||
+                token.isFresh ||
+                opts.jwtCache.isAuthError(error)) {
+                throw error;
+            }
+            const newToken = await cachedGetToken({ forceRefresh: true });
+            return await fn(newToken.token);
+        }
+    };
+    return {
+        getToken: async () => {
+            const token = await cachedGetToken();
+            return token.token;
+        },
+        handler: nextJsHandler(siteUrl),
+        isAuthenticated: async () => {
+            const token = await cachedGetToken();
+            return !!token.token;
+        },
+        preloadAuthQuery: async (query, ...args) => {
+            return callWithToken((token) => {
+                const argsAndOptions = getArgsAndOptions(args, token);
+                return preloadQuery(query, ...argsAndOptions);
+            });
+        },
+        fetchAuthQuery: async (query, ...args) => {
+            return callWithToken((token) => {
+                const argsAndOptions = getArgsAndOptions(args, token);
+                return fetchQuery(query, ...argsAndOptions);
+            });
+        },
+        fetchAuthMutation: async (mutation, ...args) => {
+            return callWithToken((token) => {
+                const argsAndOptions = getArgsAndOptions(args, token);
+                return fetchMutation(mutation, ...argsAndOptions);
+            });
+        },
+        fetchAuthAction: async (action, ...args) => {
+            return callWithToken((token) => {
+                const argsAndOptions = getArgsAndOptions(args, token);
+                return fetchAction(action, ...argsAndOptions);
+            });
+        },
+    };
+};
 //# sourceMappingURL=index.js.map

package/dist/nextjs/index.js.map

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

package/dist/plugins/convex/client.d.ts

@@ -1,4 +1,4 @@
-import { convex } from "./index.js";
+import type { convex } from "./index.js";
 export declare const convexClient: () => {
     id: "convex";
     $InferServerPlugin: ReturnType<typeof convex>;

package/dist/plugins/convex/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,eAAO,MAAM,YAAY;;wBAGK,UAAU,CAAC,OAAO,MAAM,CAAC;CAEtD,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,YAAY;;wBAGK,UAAU,CAAC,OAAO,MAAM,CAAC;CAEtD,CAAC"}

package/dist/plugins/convex/client.js

@@ -1,4 +1,3 @@
-import { convex } from "./index.js";
 export const convexClient = () => {
     return {
         id: "convex",

package/dist/plugins/convex/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,kBAAkB,EAAE,EAA+B;KACnB,CAAC;AACrC,CAAC,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,kBAAkB,EAAE,EAA+B;KACnB,CAAC;AACrC,CAAC,CAAC"}