better-auth 0.2.6 → 0.2.8-beta.10

package/dist/access.d.ts

@@ -1,4 +1,4 @@
-export { A as AccessControl, a as AuthortizeResponse, P as ParsingError, R as Role, S as StatementsPrimitive, b as SubArray, c as Subset, d as adminAc, e as createAccessControl, f as defaultAc, g as defaultRoles, h as defaultStatements, m as memberAc, o as ownerAc } from './statement-BYDTZ_xW.js';
-export { p as permissionFromString } from './index-D1yWsqP4.js';
-import './helper-D-PIAORk.js';
+export { A as AccessControl, a as AuthortizeResponse, P as ParsingError, R as Role, S as StatementsPrimitive, b as SubArray, c as Subset, d as adminAc, e as createAccessControl, f as defaultAc, g as defaultRoles, h as defaultStatements, m as memberAc, o as ownerAc } from './statement-CfnyN34h.js';
+export { p as permissionFromString } from './index-DfAHOgpj.js';
+import './helper-DPDj8Nix.js';
 import 'zod';

package/dist/adapters/drizzle.d.ts

@@ -1,9 +1,9 @@
-import { A as Adapter } from '../index-Ckd9h_O2.js';
+import { A as Adapter } from '../index-DFyIXQyt.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-JM-i6hLs.js';
 import 'arctic';
 import 'zod';
-import '../helper-D-PIAORk.js';
+import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';
 import 'mysql2';
@@ -11,6 +11,12 @@ import 'mysql2';
 interface DrizzleAdapterOptions {
     schema?: Record<string, any>;
     provider: "pg" | "mysql" | "sqlite";
+    /**
+     * If the table names in the schema are plural
+     * set this to true. For example, if the schema
+     * has an object with a key "users" instead of "user"
+     */
+    usePlural?: boolean;
 }
 interface DB {
     [key: string]: any;

package/dist/adapters/drizzle.js

@@ -1,6 +1,12 @@
 import { eq, and, or } from 'drizzle-orm';
 import { existsSync } from 'fs';
 import fs from 'fs/promises';
+import 'oslo';
+import 'nanoid';
+import { createConsola } from 'consola';
+import 'oslo/oauth2';
+import 'zod';
+import 'chalk';
 
 // src/adapters/drizzle-adapter/index.ts
 
@@ -41,11 +47,13 @@ var getAuthTables = (options) => {
     }
   };
   const { user, session, account, ...pluginTables } = pluginSchema || {};
+  const accountFields = options.account?.fields;
+  const userFields = options.user?.fields;
   return {
     user: {
       tableName: options.user?.modelName || "user",
       fields: {
-        name: {
+        [userFields?.name || "name"]: {
           type: "string",
           required: true
         },
@@ -108,7 +116,7 @@ var getAuthTables = (options) => {
     account: {
       tableName: options.account?.modelName || "account",
       fields: {
-        accountId: {
+        [accountFields?.accountId || "accountId"]: {
           type: "string",
           required: true
         },
@@ -149,14 +157,41 @@ var getAuthTables = (options) => {
       },
       order: 2
     },
+    verification: {
+      tableName: options.verification?.modelName || "verification",
+      fields: {
+        identifier: {
+          type: "string",
+          required: true
+        },
+        value: {
+          type: "string",
+          required: true
+        },
+        expiresAt: {
+          type: "date",
+          required: true
+        }
+      }
+    },
     ...pluginTables,
     ...shouldAddRateLimitTable ? rateLimitTable : {}
   };
 };
+createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
+  }
+});
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
-  constructor(message, cause, docsLink) {
+  constructor(message, cause) {
     super(message);
     this.name = "BetterAuthError";
     this.message = message;
@@ -164,15 +199,21 @@ var BetterAuthError = class extends Error {
     this.stack = "";
   }
 };
-
-// src/adapters/drizzle-adapter/index.ts
-function getSchema(modelName, schema) {
+function getSchema(modelName, options) {
+  const schema = options.schema;
   if (!schema) {
     throw new BetterAuthError(
       "Drizzle adapter failed to initialize. Schema not found. Please provide a schema object in the adapter options object."
     );
   }
-  return schema[modelName];
+  const model = options.usePlural ? `${modelName}s` : modelName;
+  const schemaModel = schema[model];
+  if (!schemaModel) {
+    throw new BetterAuthError(
+      `[# Drizzle Adapter]: The model "${modelName}" was not found in the schema object. Please pass the schema directly to the adapter options.`
+    );
+  }
+  return schemaModel;
 }
 function whereConvertor(where, schemaModel) {
   if (!where) return [];
@@ -207,13 +248,19 @@ var drizzleAdapter = (db, options) => {
     id: "drizzle",
     async create(data) {
       const { model, data: val } = data;
-      const schemaModel = getSchema(model, schema);
+      const schemaModel = getSchema(model, {
+        schema,
+        usePlural: options.usePlural
+      });
       const res = await db.insert(schemaModel).values(val).returning();
       return res[0];
     },
     async findOne(data) {
       const { model, where, select: included } = data;
-      const schemaModel = getSchema(model, schema);
+      const schemaModel = getSchema(model, {
+        schema,
+        usePlural: options.usePlural
+      });
       const wheres = whereConvertor(where, schemaModel);
       let res = null;
       if (!!included?.length) {
@@ -232,23 +279,33 @@ var drizzleAdapter = (db, options) => {
     },
     async findMany(data) {
       const { model, where } = data;
-      const schemaModel = getSchema(model, schema);
+      const schemaModel = getSchema(model, {
+        schema,
+        usePlural: options.usePlural
+      });
       const wheres = where ? whereConvertor(where, schemaModel) : [];
       if (!wheres.length) {
         return await db.select().from(schemaModel);
       }
-      return await db.select().from(schemaModel).where(...wheres);
+      const res = await db.select().from(schemaModel).where(...wheres);
+      return res;
     },
     async update(data) {
       const { model, where, update } = data;
-      const schemaModel = getSchema(model, schema);
+      const schemaModel = getSchema(model, {
+        schema,
+        usePlural: options.usePlural
+      });
       const wheres = whereConvertor(where, schemaModel);
       const res = await db.update(schemaModel).set(update).where(...wheres).returning();
       return res[0];
     },
     async delete(data) {
       const { model, where } = data;
-      const schemaModel = getSchema(model, schema);
+      const schemaModel = getSchema(model, {
+        schema,
+        usePlural: options.usePlural
+      });
       const wheres = whereConvertor(where, schemaModel);
       const res = await db.delete(schemaModel).where(...wheres);
       return res[0];

package/dist/adapters/mongodb.d.ts

@@ -1,9 +1,9 @@
-import { W as Where } from '../index-Ckd9h_O2.js';
+import { W as Where } from '../index-DFyIXQyt.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-JM-i6hLs.js';
 import 'arctic';
 import 'zod';
-import '../helper-D-PIAORk.js';
+import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/adapters/prisma.d.ts

@@ -1,9 +1,9 @@
-import { A as Adapter } from '../index-Ckd9h_O2.js';
+import { A as Adapter } from '../index-DFyIXQyt.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-JM-i6hLs.js';
 import 'arctic';
 import 'zod';
-import '../helper-D-PIAORk.js';
+import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/adapters/prisma.js

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { produceSchema } from '@mrleebo/prisma-ast';
 import 'oslo';
-import 'oslo/crypto';
+import 'nanoid';
 import { createConsola } from 'consola';
 import 'oslo/oauth2';
 import 'zod';
@@ -47,11 +47,13 @@ var getAuthTables = (options) => {
     }
   };
   const { user, session, account, ...pluginTables } = pluginSchema || {};
+  const accountFields = options.account?.fields;
+  const userFields = options.user?.fields;
   return {
     user: {
       tableName: options.user?.modelName || "user",
       fields: {
-        name: {
+        [userFields?.name || "name"]: {
           type: "string",
           required: true
         },
@@ -114,7 +116,7 @@ var getAuthTables = (options) => {
     account: {
       tableName: options.account?.modelName || "account",
       fields: {
-        accountId: {
+        [accountFields?.accountId || "accountId"]: {
           type: "string",
           required: true
         },
@@ -155,6 +157,23 @@ var getAuthTables = (options) => {
       },
       order: 2
     },
+    verification: {
+      tableName: options.verification?.modelName || "verification",
+      fields: {
+        identifier: {
+          type: "string",
+          required: true
+        },
+        value: {
+          type: "string",
+          required: true
+        },
+        expiresAt: {
+          type: "date",
+          required: true
+        }
+      }
+    },
     ...pluginTables,
     ...shouldAddRateLimitTable ? rateLimitTable : {}
   };

package/dist/api.d.ts

@@ -1,9 +1,9 @@
-export { b as AuthEndpoint, d as AuthMiddleware, y as callbackOAuth, X as changePassword, a as createAuthEndpoint, c as createAuthMiddleware, Q as createEmailVerificationToken, a1 as csrfMiddleware, _ as error, M as forgetPassword, N as forgetPasswordCallback, Z as getCSRFToken, u as getEndpoints, z as getSession, C as getSessionFromCtx, E as listSessions, $ as ok, o as optionsMiddleware, O as resetPassword, J as revokeSession, K as revokeSessions, v as router, T as sendVerificationEmail, D as sessionMiddleware, Y as setPassword, x as signInEmail, w as signInOAuth, L as signOut, a0 as signUpEmail, V as updateUser, U as verifyEmail } from './index-Ckd9h_O2.js';
+export { b as AuthEndpoint, d as AuthMiddleware, y as callbackOAuth, X as changePassword, a as createAuthEndpoint, c as createAuthMiddleware, Q as createEmailVerificationToken, a2 as csrfMiddleware, Z as deleteUser, $ as error, M as forgetPassword, N as forgetPasswordCallback, _ as getCSRFToken, u as getEndpoints, z as getSession, C as getSessionFromCtx, E as listSessions, a0 as ok, o as optionsMiddleware, O as resetPassword, J as revokeSession, K as revokeSessions, v as router, T as sendVerificationEmail, D as sessionMiddleware, Y as setPassword, x as signInEmail, w as signInOAuth, L as signOut, a1 as signUpEmail, V as updateUser, U as verifyEmail } from './index-DFyIXQyt.js';
 import 'zod';
-import './helper-D-PIAORk.js';
+import './helper-DPDj8Nix.js';
 import 'better-call';
 import 'kysely';
-import './index-37csVPVw.js';
+import './index-JM-i6hLs.js';
 import 'arctic';
 import 'better-sqlite3';
 import 'mysql2';