@convex-dev/better-auth 0.8.6 → 0.8.7

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

@@ -1,3 +1,4 @@
+import { HookEndpointContext } from "better-auth";
 import { setSessionCookie } from "better-auth/cookies";
 import { generateRandomString } from "better-auth/crypto";
 import {
@@ -19,6 +20,10 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
     return new URL(relativeCallbackURL, siteUrl).toString();
   };
 
+  const isExpoNative = (ctx: HookEndpointContext) => {
+    return ctx.headers?.has("expo-origin");
+  };
+
   return {
     id: "cross-domain",
     // TODO: remove this in the next minor release, it doesn't
@@ -35,15 +40,17 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
     hooks: {
       before: [
         {
-          matcher(context) {
-            return Boolean(
-              context.request?.headers.get("better-auth-cookie") ||
-                context.headers?.get("better-auth-cookie")
+          matcher(ctx) {
+            return (
+              Boolean(
+                ctx.request?.headers.get("better-auth-cookie") ||
+                  ctx.headers?.get("better-auth-cookie")
+              ) && !isExpoNative(ctx)
             );
           },
-          handler: createAuthMiddleware(async (c) => {
-            const existingHeaders = (c.request?.headers ||
-              c.headers) as Headers;
+          handler: createAuthMiddleware(async (ctx) => {
+            const existingHeaders = (ctx.request?.headers ||
+              ctx.headers) as Headers;
             const headers = new Headers({
               ...Object.fromEntries(existingHeaders?.entries()),
             });
@@ -65,7 +72,11 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         },
         {
           matcher: (ctx) => {
-            return ctx.method === "GET" && ctx.path.startsWith("/verify-email");
+            return (
+              ctx.method === "GET" &&
+              ctx.path.startsWith("/verify-email") &&
+              !isExpoNative(ctx)
+            );
           },
           handler: createAuthMiddleware(async (ctx) => {
             if (ctx.query?.callbackURL) {
@@ -77,13 +88,14 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         {
           matcher: (ctx) => {
             return (
-              (ctx.method === "POST" && ctx.path.startsWith("/link-social")) ||
-              ctx.path.startsWith("/send-verification-email") ||
-              ctx.path.startsWith("/sign-in/email") ||
-              ctx.path.startsWith("/sign-in/social") ||
-              ctx.path.startsWith("/sign-in/magic-link") ||
-              ctx.path.startsWith("/delete-user") ||
-              ctx.path.startsWith("/change-email")
+              ((ctx.method === "POST" && ctx.path.startsWith("/link-social")) ||
+                ctx.path.startsWith("/send-verification-email") ||
+                ctx.path.startsWith("/sign-in/email") ||
+                ctx.path.startsWith("/sign-in/social") ||
+                ctx.path.startsWith("/sign-in/magic-link") ||
+                ctx.path.startsWith("/delete-user") ||
+                ctx.path.startsWith("/change-email")) &&
+              !isExpoNative(ctx)
             );
           },
           handler: createAuthMiddleware(async (ctx) => {
@@ -105,8 +117,8 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
       ],
       after: [
         {
-          matcher() {
-            return true;
+          matcher(ctx) {
+            return !isExpoNative(ctx);
           },
           handler: createAuthMiddleware(async (ctx) => {
             const setCookie = ctx.context.responseHeaders?.get("set-cookie");
@@ -120,9 +132,10 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         {
           matcher: (ctx) => {
             return (
-              ctx.path?.startsWith("/callback") ||
-              ctx.path?.startsWith("/oauth2/callback") ||
-              ctx.path?.startsWith("/magic-link/verify")
+              (ctx.path?.startsWith("/callback") ||
+                ctx.path?.startsWith("/oauth2/callback") ||
+                ctx.path?.startsWith("/magic-link/verify")) &&
+              !isExpoNative(ctx)
             );
           },
           handler: createAuthMiddleware(async (ctx) => {

package/src/react/index.tsx

@@ -1,38 +1,120 @@
-"use client";
+import { useEffect } from "react";
 
-import { ConvexProviderWithAuth, ConvexReactClient } from "convex/react";
-import { PropsWithChildren, useMemo } from "react";
-import {
-  AuthClient,
-  AuthProvider,
-  useAuth,
-  type ConvexAuthClient,
-} from "./client";
+import { ReactNode, useCallback, useMemo } from "react";
+import { AuthTokenFetcher } from "convex/browser";
+import { ConvexProviderWithAuth } from "convex/react";
+import { BetterAuthClientPlugin, ClientOptions } from "better-auth";
+import { createAuthClient } from "better-auth/react";
+import { convexClient, crossDomainClient } from "../client/plugins";
 
+type CrossDomainClient = ReturnType<typeof crossDomainClient>;
+type ConvexClient = ReturnType<typeof convexClient>;
+type PluginsWithCrossDomain = (
+  | CrossDomainClient
+  | ConvexClient
+  | BetterAuthClientPlugin
+)[];
+type PluginsWithoutCrossDomain = (ConvexClient | BetterAuthClientPlugin)[];
+type AuthClientWithPlugins<
+  Plugins extends PluginsWithCrossDomain | PluginsWithoutCrossDomain,
+> = ReturnType<
+  typeof createAuthClient<
+    ClientOptions & {
+      plugins: Plugins;
+    }
+  >
+>;
+export type AuthClient =
+  | AuthClientWithPlugins<PluginsWithCrossDomain>
+  | AuthClientWithPlugins<PluginsWithoutCrossDomain>;
+
+// Until we can import from our own entry points (requires TypeScript 4.7),
+// just describe the interface enough to help users pass the right type.
+type IConvexReactClient = {
+  setAuth(fetchToken: AuthTokenFetcher): void;
+  clearAuth(): void;
+};
+
+/**
+ * A wrapper React component which provides a {@link react.ConvexReactClient}
+ * authenticated with Better Auth.
+ *
+ * @public
+ */
 export function ConvexBetterAuthProvider({
+  children,
   client,
   authClient,
-  children,
-}: PropsWithChildren<{
-  client: ConvexReactClient;
+}: {
+  children: ReactNode;
+  client: IConvexReactClient;
   authClient: AuthClient;
-}>) {
-  const convexAuthClient = useMemo(
-    () =>
-      ({
-        verbose: (client as any).options?.verbose,
-        logger: client.logger,
-      }) satisfies ConvexAuthClient,
-    [client]
-  );
+}) {
+  const useBetterAuth = useUseAuthFromBetterAuth(authClient);
+
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    (async () => {
+      const url = new URL(window.location?.href);
+      const token = url.searchParams.get("ott");
+      if (token) {
+        const authClientWithCrossDomain =
+          authClient as AuthClientWithPlugins<PluginsWithCrossDomain>;
+        url.searchParams.delete("ott");
+        const result =
+          await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({
+            token,
+          });
+        const session = result.data?.session;
+        if (session) {
+          await authClient.getSession({
+            fetchOptions: {
+              headers: {
+                Authorization: `Bearer ${session.token}`,
+              },
+            },
+          });
+          authClientWithCrossDomain.updateSession();
+        }
+        window.history.replaceState({}, "", url);
+      }
+    })();
+  }, [authClient]);
   return (
-    <AuthProvider client={convexAuthClient} authClient={authClient}>
-      <ConvexProviderWithAuth client={client} useAuth={useAuth}>
-        {children}
-      </ConvexProviderWithAuth>
-    </AuthProvider>
+    <ConvexProviderWithAuth client={client} useAuth={useBetterAuth}>
+      {children}
+    </ConvexProviderWithAuth>
   );
 }
 
-// TODO: Remove, short-lived alias
-export { ConvexBetterAuthProvider as ConvexProviderWithBetterAuth };
+function useUseAuthFromBetterAuth(authClient: AuthClient) {
+  return useMemo(
+    () =>
+      function useAuthFromBetterAuth() {
+        const { data: session, isPending: isSessionPending } =
+          authClient.useSession();
+        const fetchAccessToken = useCallback(
+          async () => {
+            try {
+              const { data } = await authClient.convex.token();
+              return data?.token || null;
+            } catch {
+              return null;
+            }
+          },
+          // Build a new fetchAccessToken to trigger setAuth() whenever the
+          // session changes.
+          [session]
+        );
+        return useMemo(
+          () => ({
+            isLoading: isSessionPending,
+            isAuthenticated: session !== null,
+            fetchAccessToken,
+          }),
+          [isSessionPending, session, fetchAccessToken]
+        );
+      },
+    [authClient]
+  );
+}

package/dist/commonjs/client/createSchemaInternal.d.ts

@@ -1,24 +0,0 @@
-import { BetterAuthDbSchema } from "better-auth/db";
-export declare const indexFields: {
-    account: (string | string[])[];
-    rateLimit: string[];
-    session: (string | string[])[];
-    verification: string[];
-    user: (string | string[])[];
-    passkey: string[];
-    apikey: string[];
-    member: string[][];
-    invitation: string[][];
-    oauthConsent: string[][];
-    ssoProvider: string[];
-    subscription: string[];
-};
-export declare const createSchema: ({ file, tables, }: {
-    tables: BetterAuthDbSchema;
-    file?: string;
-}) => Promise<{
-    code: string;
-    path: string;
-    overwrite: boolean;
-}>;
-//# sourceMappingURL=createSchemaInternal.d.ts.map

package/dist/commonjs/client/createSchemaInternal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createSchemaInternal.d.ts","sourceRoot":"","sources":["../../../src/client/createSchemaInternal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuB,MAAM,gBAAgB,CAAC;AAIzE,eAAO,MAAM,WAAW;;;;;;;;;;;;;CAgBvB,CAAC;AA6CF,eAAO,MAAM,YAAY,GAAU,mBAGhC;IACD,MAAM,EAAE,kBAAkB,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;;EAmFA,CAAC"}

package/dist/commonjs/client/createSchemaInternal.js

@@ -1,105 +0,0 @@
-// Manually add fields to index on for schema generation,
-// all fields in the schema specialFields are automatically indexed
-export const indexFields = {
-    account: ["accountId", ["accountId", "providerId"], ["providerId", "userId"]],
-    rateLimit: ["key"],
-    session: ["expiresAt", ["expiresAt", "userId"]],
-    verification: ["expiresAt", "identifier"],
-    user: [["email", "name"], "name", "userId"],
-    passkey: ["credentialID"],
-    apikey: ["key"],
-    member: [["organizationId", "userId"]],
-    invitation: [
-        ["email", "organizationId", "status"],
-        ["organizationId", "status"],
-    ],
-    oauthConsent: [["clientId", "userId"]],
-    ssoProvider: ["organizationId", "domain"],
-    subscription: ["stripeSubscriptionId", "stripeCustomerId", "referenceId"],
-};
-// Return map of unique, sortable, and reference fields
-const specialFields = (tables) => Object.fromEntries(Object.entries(tables)
-    .map(([key, table]) => {
-    const fields = Object.fromEntries(Object.entries(table.fields)
-        .map(([fieldKey, field]) => [
-        fieldKey,
-        {
-            ...(field.sortable ? { sortable: true } : {}),
-            ...(field.unique ? { unique: true } : {}),
-            ...(field.references ? { references: field.references } : {}),
-        },
-    ])
-        .filter(([_key, value]) => typeof value === "object" ? Object.keys(value).length > 0 : true));
-    return [key, fields];
-})
-    .filter(([_key, value]) => typeof value === "object" ? Object.keys(value).length > 0 : true));
-const mergedIndexFields = (tables) => Object.fromEntries(Object.entries(tables).map(([key]) => {
-    const manualIndexes = indexFields[key] || [];
-    const specialFieldIndexes = Object.keys(specialFields(tables)[key] ||
-        {}).filter((index) => !manualIndexes.some((m) => Array.isArray(m) ? m[0] === index : m === index));
-    return [key, manualIndexes.concat(specialFieldIndexes)];
-}));
-export const createSchema = async ({ file, tables, }) => {
-    const path = await import("path");
-    const baseName = path.basename(process.cwd());
-    if (baseName === "convex") {
-        throw new Error("Better Auth schema must be generated in the Better Auth component directory.");
-    }
-    let code = `// This file is auto-generated. Do not edit this file manually.
-// To regenerate the schema, run:
-// \`npx @better-auth/cli generate --output ${file} -y\`
-
-import { defineSchema, defineTable } from "convex/server";
-import { v } from "convex/values";
-
-export const tables = {
-`;
-    for (const tableKey in tables) {
-        const table = tables[tableKey];
-        const modelName = table.modelName;
-        // No id fields in Convex schema
-        const fields = Object.fromEntries(Object.entries(table.fields).filter(([key]) => key !== "id"));
-        function getType(name, field) {
-            const type = field.type;
-            const typeMap = {
-                string: `v.string()`,
-                boolean: `v.boolean()`,
-                number: `v.number()`,
-                date: `v.number()`,
-                "number[]": `v.array(v.number())`,
-                "string[]": `v.array(v.string())`,
-            };
-            return typeMap[type];
-        }
-        const indexes = mergedIndexFields(tables)[modelName]?.map((index) => {
-            const indexArray = Array.isArray(index) ? index.sort() : [index];
-            const indexName = indexArray.join("_");
-            return `.index("${indexName}", ${JSON.stringify(indexArray)})`;
-        }) || [];
-        const schema = `${modelName}: defineTable({
-${Object.keys(fields)
-            .map((field) => {
-            const attr = fields[field];
-            const type = getType(field, attr);
-            const optional = (fieldSchema) => attr.required
-                ? fieldSchema
-                : `v.optional(v.union(v.null(), ${fieldSchema}))`;
-            return `    ${field}: ${optional(type)},`;
-        })
-            .join("\n")}
-  })${indexes.length > 0 ? `\n    ${indexes.join("\n    ")}` : ""},\n`;
-        code += `  ${schema}`;
-    }
-    code += `};
-
-const schema = defineSchema(tables);
-
-export default schema;
-`;
-    return {
-        code,
-        path: file ?? "./schema.ts",
-        overwrite: true,
-    };
-};
-//# sourceMappingURL=createSchemaInternal.js.map

package/dist/commonjs/client/createSchemaInternal.js.map

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