@convex-dev/better-auth 0.7.0-alpha.10 → 0.7.0-alpha.12

package/dist/commonjs/plugins/cross-domain/client.d.ts

@@ -61,12 +61,12 @@ export declare const crossDomainClient: (opts?: {
             onSuccess(context: import("@better-fetch/fetch").SuccessContext<any>): Promise<void>;
         };
         init(url: string, options: {
+            method?: string | undefined;
             headers?: (HeadersInit & (HeadersInit | {
                 accept: "application/json" | "text/plain" | "application/octet-stream";
                 "content-type": "application/json" | "text/plain" | "application/x-www-form-urlencoded" | "multipart/form-data" | "application/octet-stream";
                 authorization: "Bearer" | "Basic";
             })) | undefined;
-            method?: string | undefined;
             cache?: RequestCache | undefined;
             credentials?: RequestCredentials | undefined;
             integrity?: string | undefined;

package/dist/commonjs/plugins/cross-domain/index.d.ts

@@ -3,6 +3,11 @@ export declare const crossDomain: ({ siteUrl }: {
     siteUrl: string;
 }) => {
     id: "cross-domain";
+    init(ctx: import("better-auth").AuthContext): {
+        options: {
+            trustedOrigins: string[];
+        };
+    };
     hooks: {
         before: ({
             matcher(context: import("better-auth").HookEndpointContext): boolean;
@@ -74,8 +79,5 @@ export declare const crossDomain: ({ siteUrl }: {
             path: "/cross-domain/one-time-token/verify";
         };
     };
-    options: {
-        trustedOrigins: string[];
-    };
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/commonjs/plugins/cross-domain/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,WAAW,GAAI,aAAa;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiJ3D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,WAAW,GAAI,aAAa;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+J3D,CAAC"}

package/dist/commonjs/plugins/cross-domain/index.js

@@ -13,6 +13,13 @@ export const crossDomain = ({ siteUrl }) => {
     };
     return {
         id: "cross-domain",
+        init(ctx) {
+            return {
+                options: {
+                    trustedOrigins: [siteUrl],
+                },
+            };
+        },
         hooks: {
             before: [
                 {
@@ -44,9 +51,19 @@ export const crossDomain = ({ siteUrl }) => {
                 },
                 {
                     matcher: (ctx) => {
-                        return (ctx.path.startsWith("/link-social") ||
+                        return ctx.method === "GET" && ctx.path.startsWith("/verify-email");
+                    },
+                    handler: createAuthMiddleware(async (ctx) => {
+                        if (ctx.query?.callbackURL) {
+                            ctx.query.callbackURL = rewriteCallbackURL(ctx.query.callbackURL);
+                        }
+                        return { context: ctx };
+                    }),
+                },
+                {
+                    matcher: (ctx) => {
+                        return ((ctx.method === "POST" && ctx.path.startsWith("/link-social")) ||
                             ctx.path.startsWith("/send-verification-email") ||
-                            ctx.path.startsWith("/verify-email") ||
                             ctx.path.startsWith("/sign-in/email") ||
                             ctx.path.startsWith("/sign-in/social") ||
                             ctx.path.startsWith("/sign-in/magic-link") ||
@@ -127,9 +144,6 @@ export const crossDomain = ({ siteUrl }) => {
                 return response;
             }),
         },
-        options: {
-            trustedOrigins: [siteUrl],
-        },
     };
 };
 //# sourceMappingURL=index.js.map

package/dist/commonjs/plugins/cross-domain/index.js.map

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

package/dist/commonjs/react-start/index.d.ts

@@ -19,19 +19,19 @@ export declare const reactStartHelpers: (createAuth: (ctx: GenericActionCtx<any>
         session: {
             session: {
                 id: string;
-                createdAt: Date;
-                updatedAt: Date;
+                token: string;
                 userId: string;
                 expiresAt: Date;
-                token: string;
+                createdAt: Date;
+                updatedAt: Date;
                 ipAddress?: string | null | undefined | undefined;
                 userAgent?: string | null | undefined | undefined;
             };
             user: {
                 id: string;
                 name: string;
-                email: string;
                 emailVerified: boolean;
+                email: string;
                 createdAt: Date;
                 updatedAt: Date;
                 image?: string | null | undefined | undefined;

package/dist/commonjs/utils/index.d.ts

@@ -0,0 +1,2 @@
+export declare const requireEnv: (name: string) => string;
+//# sourceMappingURL=index.d.ts.map

package/dist/commonjs/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAMtC,CAAC"}

package/dist/commonjs/utils/index.js

@@ -0,0 +1,8 @@
+export const requireEnv = (name) => {
+    const value = process.env[name];
+    if (value === undefined) {
+        throw new Error(`Missing environment variable \`${name}\``);
+    }
+    return value;
+};
+//# sourceMappingURL=index.js.map

package/dist/commonjs/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;IACzC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/dist/esm/client/adapter.d.ts

@@ -1,4 +1,13 @@
 import { BetterAuth } from "./index.js";
+import { AdapterDebugLogs } from "better-auth/adapters";
 import { GenericActionCtx, GenericMutationCtx, GenericQueryCtx } from "convex/server";
-export declare const convexAdapter: <Ctx extends GenericQueryCtx<any> | GenericMutationCtx<any> | GenericActionCtx<any>>(ctx: Ctx, component: BetterAuth) => (options: import("better-auth").BetterAuthOptions) => import("better-auth").Adapter;
+type GenericCtx = GenericQueryCtx<any> | GenericMutationCtx<any> | GenericActionCtx<any>;
+interface ConvexAdapterConfig {
+    /**
+     * Helps you debug issues with the adapter.
+     */
+    debugLogs?: AdapterDebugLogs;
+}
+export declare const convexAdapter: (ctx: GenericCtx, component: BetterAuth, config?: ConvexAdapterConfig) => (options: import("better-auth").BetterAuthOptions) => import("better-auth").Adapter;
+export {};
 //# sourceMappingURL=adapter.d.ts.map

package/dist/esm/client/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/client/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,aAAa,GACxB,GAAG,SACC,eAAe,CAAC,GAAG,CAAC,GACpB,kBAAkB,CAAC,GAAG,CAAC,GACvB,gBAAgB,CAAC,GAAG,CAAC,EAEzB,KAAK,GAAG,EACR,WAAW,UAAU,wFAoPnB,CAAC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/client/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAGhB,MAAM,eAAe,CAAC;AAyEvB,KAAK,UAAU,GACX,eAAe,CAAC,GAAG,CAAC,GACpB,kBAAkB,CAAC,GAAG,CAAC,GACvB,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAE1B,UAAU,mBAAmB;IAC3B;;OAEG;IACH,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B;AACD,eAAO,MAAM,aAAa,GACxB,KAAK,UAAU,EACf,WAAW,UAAU,EACrB,SAAQ,mBAAwB,wFA6JjC,CAAC"}

package/dist/esm/client/adapter.js

@@ -1,207 +1,198 @@
-import { transformInput } from "../component/lib.js";
-import { createAdapter } from "better-auth/adapters";
-export const convexAdapter = (ctx, component) => createAdapter({
-    config: {
-        adapterId: "convex",
-        adapterName: "Convex Adapter",
-        debugLogs: component.config.verbose ?? false,
-        disableIdGeneration: true,
-    },
-    adapter: ({ schema }) => {
-        return {
-            id: "convex",
-            create: async ({ model, data, select }) => {
-                if (!("runMutation" in ctx)) {
-                    throw new Error("ctx is not an action ctx");
-                }
-                if (select) {
-                    throw new Error("select is not supported");
-                }
-                const createFn = model === "user"
-                    ? component.config.authFunctions.createUser
-                    : model === "session"
-                        ? component.config.authFunctions.createSession
-                        : component.component.lib.create;
-                return ctx.runMutation(createFn, {
-                    input: { table: model, ...transformInput(model, data) },
-                });
+import { createAdapter, } from "better-auth/adapters";
+const paginate = async (next, { limit, numItems } = {}) => {
+    const state = {
+        isDone: false,
+        cursor: null,
+        docs: [],
+        count: 0,
+    };
+    const onResult = (result) => {
+        state.cursor =
+            result.pageStatus === "SplitRecommended" ||
+                result.pageStatus === "SplitRequired"
+                ? result.splitCursor ?? result.continueCursor
+                : result.continueCursor;
+        if (result.page) {
+            state.docs.push(...result.page);
+            state.isDone = (limit && state.docs.length >= limit) || result.isDone;
+            return;
+        }
+        if (result.count) {
+            state.count += result.count;
+            state.isDone = (limit && state.count >= limit) || result.isDone;
+            return;
+        }
+        state.isDone = result.isDone;
+    };
+    do {
+        const result = await next({
+            paginationOpts: {
+                numItems: Math.min(numItems ?? 200, limit ?? 200, 200),
+                cursor: state.cursor,
             },
-            findOne: async ({ model, where }) => {
-                if (where.length === 1 && where[0].operator === "eq") {
-                    const { value, field } = where[0];
-                    const result = await ctx.runQuery(component.component.lib.getBy, {
-                        table: model,
-                        field,
-                        unique: field === "id" ? true : schema[model].fields[field].unique,
-                        value: value instanceof Date ? value.getTime() : value,
-                    });
+        });
+        onResult(result);
+    } while (!state.isDone);
+    return state;
+};
+const parseWhere = (where) => {
+    return where?.map((where) => {
+        if (where.value instanceof Date) {
+            return {
+                ...where,
+                value: where.value.getTime(),
+            };
+        }
+        return where;
+    });
+};
+export const convexAdapter = (ctx, component, config = {}) => {
+    const { debugLogs } = config;
+    return createAdapter({
+        config: {
+            adapterId: "convex",
+            adapterName: "Convex Adapter",
+            debugLogs: component.config.verbose ?? debugLogs ?? false,
+            disableIdGeneration: true,
+            supportsNumericIds: false,
+            usePlural: false,
+            mapKeysTransformOutput: {
+                _id: "id",
+            },
+            customTransformInput: ({ data, fieldAttributes, field }) => {
+                if (data && fieldAttributes.type === "date") {
+                    const result = data.getTime();
+                    console.log("transformed input", field, result);
                     return result;
                 }
-                if (model === "account" &&
-                    where.length === 2 &&
-                    where[0].field === "accountId" &&
-                    where[1].field === "providerId" &&
-                    where[0].connector === "AND") {
-                    return ctx.runQuery(component.component.lib.getAccountByAccountIdAndProviderId, {
-                        accountId: where[0].value,
-                        providerId: where[1].value,
-                    });
-                }
-                throw new Error("where clause not supported");
+                return data;
             },
-            findMany: async ({ model, where, sortBy, offset, limit, }) => {
-                if (offset) {
-                    throw new Error("offset not supported");
-                }
-                if (model === "jwks" &&
-                    !where &&
-                    (!sortBy ||
-                        (sortBy?.field === "createdAt" && sortBy?.direction === "desc"))) {
-                    return ctx.runQuery(component.component.lib.getJwks, { limit });
-                }
-                if (where?.length !== 1 ||
-                    (where[0].operator && where[0].operator !== "eq")) {
-                    throw new Error("where clause not supported");
-                }
-                if (model === "verification" && where[0].field === "identifier") {
-                    return ctx.runQuery(component.component.lib.listVerificationsByIdentifier, {
-                        identifier: where[0].value,
-                        sortBy,
-                        limit,
-                    });
+            customTransformOutput: ({ data, fieldAttributes, field }) => {
+                if (data && fieldAttributes.type === "date") {
+                    const result = new Date(data);
+                    console.log("transformed output", field, result);
+                    return result;
                 }
-                if (model === "account" && where[0].field === "userId" && !sortBy) {
-                    return ctx.runQuery(component.component.lib.getAccountsByUserId, {
-                        userId: where[0].value,
-                        limit,
+                return data;
+            },
+        },
+        adapter: ({ schema }) => {
+            return {
+                id: "convex",
+                create: async ({ model, data, select }) => {
+                    if (!("runMutation" in ctx)) {
+                        throw new Error("ctx is not a mutation ctx");
+                    }
+                    if (select) {
+                        throw new Error("select is not supported");
+                    }
+                    const createFn = model === "user"
+                        ? component.config.authFunctions.createUser
+                        : model === "session"
+                            ? component.config.authFunctions.createSession
+                            : component.component.lib.create;
+                    return await ctx.runMutation(createFn, {
+                        input: { model, data },
                     });
-                }
-                if (model === "session" && where[0].field === "userId" && !sortBy) {
-                    return ctx.runQuery(component.component.lib.getSessionsByUserId, {
-                        userId: where[0].value,
-                        limit,
+                },
+                findOne: async (data) => {
+                    return await ctx.runQuery(component.component.lib.findOne, {
+                        ...data,
+                        where: parseWhere(data.where),
                     });
-                }
-                throw new Error("where clause not supported");
-            },
-            count: async ({ where }) => {
-                throw new Error("count not implemented");
-                // return 0;
-            },
-            update: async ({ model, where, update }) => {
-                if (!("runMutation" in ctx)) {
-                    throw new Error("ctx is not an action ctx");
-                }
-                if (where?.length === 1 && where[0].operator === "eq") {
-                    const { value, field } = where[0];
-                    const updateFn = model === "user"
-                        ? component.config.authFunctions.updateUser
-                        : component.component.lib.update;
-                    return ctx.runMutation(updateFn, {
-                        input: {
-                            table: model,
-                            where: {
-                                field,
-                                value: value instanceof Date ? value.getTime() : value,
+                },
+                findMany: async (data) => {
+                    if (data.offset) {
+                        throw new Error("offset not supported");
+                    }
+                    if (data.where?.length === 1 && data.where[0].operator === "in") {
+                        return ctx.runQuery(component.component.lib.getIn, {
+                            ...data,
+                            where: parseWhere(data.where),
+                        });
+                    }
+                    const result = await paginate(async ({ paginationOpts }) => {
+                        return await ctx.runQuery(component.component.lib.findMany, {
+                            ...data,
+                            where: parseWhere(data.where),
+                            paginationOpts,
+                        });
+                    }, { limit: data.limit });
+                    return result.docs;
+                },
+                count: async () => {
+                    throw new Error("count not implemented");
+                },
+                update: async (data) => {
+                    if (!("runMutation" in ctx)) {
+                        throw new Error("ctx is not a mutation ctx");
+                    }
+                    if (data.where?.length === 1 && data.where[0].operator === "eq") {
+                        const updateFn = data.model === "user"
+                            ? component.config.authFunctions.updateUser
+                            : component.component.lib.updateOne;
+                        return ctx.runMutation(updateFn, {
+                            input: {
+                                model: data.model,
+                                where: parseWhere(data.where),
+                                update: data.update,
                             },
-                            value: transformInput(model, update),
-                        },
-                    });
-                }
-                throw new Error("where clause not supported");
-            },
-            delete: async ({ model, where }) => {
-                if (!("runMutation" in ctx)) {
-                    throw new Error("ctx is not an action ctx");
-                }
-                if (where?.length === 1 && where[0].operator === "eq") {
-                    const { field, value } = where[0];
-                    const deleteFn = model === "user"
+                        });
+                    }
+                    throw new Error("where clause not supported");
+                },
+                delete: async (data) => {
+                    if (!("runMutation" in ctx)) {
+                        throw new Error("ctx is not a mutation ctx");
+                    }
+                    const deleteFn = data.model === "user"
                         ? component.config.authFunctions.deleteUser
-                        : component.component.lib.deleteBy;
+                        : component.component.lib.deleteOne;
                     await ctx.runMutation(deleteFn, {
-                        table: model,
-                        field,
-                        value: value instanceof Date ? value.getTime() : value,
+                        model: data.model,
+                        where: parseWhere(data.where),
                     });
                     return;
-                }
-                throw new Error("where clause not supported");
-                // return null
-            },
-            deleteMany: async ({ model, where }) => {
-                if (!("runAction" in ctx)) {
-                    throw new Error("ctx is not an action ctx");
-                }
-                if (model === "verification" &&
-                    where?.length === 1 &&
-                    where[0].operator === "lt" &&
-                    where[0].field === "expiresAt") {
-                    return ctx.runAction(component.component.lib.deleteOldVerifications, {
-                        currentTimestamp: Date.now(),
-                    });
-                }
-                if (where?.length === 1 && where[0].field === "userId") {
-                    return ctx.runAction(component.component.lib.deleteAllForUser, {
-                        table: model,
-                        userId: where[0].value,
-                    });
-                }
-                if (model === "session" &&
-                    where?.length === 2 &&
-                    where[0].operator === "eq" &&
-                    where[0].connector === "AND" &&
-                    where[0].field === "userId" &&
-                    where[1].operator === "lte" &&
-                    where[1].field === "expiresAt" &&
-                    typeof where[1].value === "number") {
-                    return ctx.runMutation(component.component.lib.deleteExpiredSessions, {
-                        userId: where[0].value,
-                        expiresAt: where[1].value,
-                    });
-                }
-                throw new Error("where clause not supported");
-                // return count;
-            },
-            updateMany: async ({ model, where, update }) => {
-                if (!("runMutation" in ctx)) {
-                    throw new Error("ctx is not an action ctx");
-                }
-                if (model === "twoFactor" &&
-                    where?.length === 1 &&
-                    where[0].operator === "eq" &&
-                    where[0].field === "userId") {
-                    return ctx.runMutation(component.component.lib.updateTwoFactor, {
-                        userId: where[0].value,
-                        update: transformInput(model, update),
+                },
+                deleteMany: async (data) => {
+                    if (!("runMutation" in ctx)) {
+                        throw new Error("ctx is not a mutation ctx");
+                    }
+                    if (data.model === "session" &&
+                        data.where?.length === 1 &&
+                        data.where[0].operator === "in") {
+                        return ctx.runMutation(component.component.lib.deleteIn, {
+                            input: {
+                                table: data.model,
+                                field: data.where[0].field,
+                                values: data.where[0].value,
+                            },
+                        });
+                    }
+                    const result = await paginate(async ({ paginationOpts }) => {
+                        return await ctx.runMutation(component.component.lib.deleteMany, {
+                            ...data,
+                            where: parseWhere(data.where),
+                            paginationOpts,
+                        });
                     });
-                }
-                if (model === "account" &&
-                    where?.length === 2 &&
-                    where[0].operator === "eq" &&
-                    where[0].connector === "AND" &&
-                    where[0].field === "userId" &&
-                    where[1].operator === "eq" &&
-                    where[1].field === "providerId") {
-                    return ctx.runMutation(component.component.lib.updateUserProviderAccounts, {
-                        userId: where[0].value,
-                        providerId: where[1].value,
-                        update: transformInput(model, update),
+                    return result.count;
+                },
+                updateMany: async (data) => {
+                    if (!("runMutation" in ctx)) {
+                        throw new Error("ctx is not an action ctx");
+                    }
+                    const result = await paginate(async ({ paginationOpts }) => {
+                        return await ctx.runMutation(component.component.lib.updateMany, {
+                            ...data,
+                            where: parseWhere(data.where),
+                            paginationOpts,
+                        });
                     });
-                }
-                throw new Error("updateMany not implemented");
-                //return 0;
-                /*
-                const { model, where, update } = data;
-                const table = db[model];
-                const res = convertWhereClause(where, table, model);
-                res.forEach((record) => {
-                  Object.assign(record, update);
-                });
-                return res[0] || null;
-                */
-            },
-        };
-    },
-});
+                    return result.count;
+                },
+            };
+        },
+    });
+};
 //# sourceMappingURL=adapter.js.map