better-auth 0.0.8-beta.22 → 0.0.8-beta.23

package/dist/client/plugins.d.ts

@@ -2,14 +2,14 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-D6SPoYOh.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, M as Member, I as Invitation, u as username } from '../index-Dwhjsk4l.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-Dwhjsk4l.js';
+import { o as organization, M as Member, I as Invitation, u as username } from '../index-DoXcqf3v.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DoXcqf3v.js';
 import '../helper-D8dhRz72.js';
 import '../index-CcxejJTH.js';
 import 'arctic';
 import 'zod';
 import 'better-call';
-import '../internal-adapter-CVKQ4XR9.js';
+import '../internal-adapter-B6xQsmUU.js';
 import 'kysely';
 import '@simplewebauthn/types';
 

package/dist/client.d.ts

@@ -1,10 +1,10 @@
 import * as zod from 'zod';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import * as nanostores from 'nanostores';
-import { B as BetterAuthOptions, F as FieldAttribute, I as InferFieldOutput } from './internal-adapter-CVKQ4XR9.js';
+import { B as BetterAuthOptions, F as FieldAttribute, I as InferFieldOutput } from './internal-adapter-B6xQsmUU.js';
 import { Auth } from './index.js';
 import { U as UnionToIntersection } from './helper-D8dhRz72.js';
-import { C as ClientOptions, I as InferClientAPI, a as InferActions, A as AuthClientPlugin, b as IsSignal } from './types-D4WrjKeJ.js';
+import { C as ClientOptions, I as InferClientAPI, a as InferActions, A as AuthClientPlugin, b as IsSignal } from './types-B-mnB1YO.js';
 import 'kysely';
 import './index-CcxejJTH.js';
 import 'arctic';

package/dist/{index-Dwhjsk4l.d.ts → index-DoXcqf3v.d.ts}

@@ -4,7 +4,7 @@ import { A as AccessControl, R as Role, S as StatementsPrimitive, g as defaultRo
 import { z, ZodObject, ZodOptional, ZodArray, ZodLiteral } from 'zod';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetch } from '@better-fetch/fetch';
-import { H as HookEndpointContext } from './internal-adapter-CVKQ4XR9.js';
+import { H as HookEndpointContext } from './internal-adapter-B6xQsmUU.js';
 import * as _simplewebauthn_types from '@simplewebauthn/types';
 import { CredentialDeviceType, PublicKeyCredentialCreationOptionsJSON } from '@simplewebauthn/types';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { U as UnionToIntersection } from './helper-D8dhRz72.js';
-import { A as AuthContext, B as BetterAuthOptions, F as FieldAttribute, I as InferFieldOutput } from './internal-adapter-CVKQ4XR9.js';
-export { g as FieldAttributeConfig, e as FieldType, f as InferValueType, b as InternalAdapter, d as createFieldAttribute, c as createInternalAdapter } from './internal-adapter-CVKQ4XR9.js';
+import { A as AuthContext, B as BetterAuthOptions, F as FieldAttribute, I as InferFieldOutput } from './internal-adapter-B6xQsmUU.js';
+export { g as FieldAttributeConfig, e as FieldType, f as InferValueType, b as InternalAdapter, d as createFieldAttribute, c as createInternalAdapter } from './internal-adapter-B6xQsmUU.js';
 import * as zod from 'zod';
 import * as better_call from 'better-call';
 import { Context } from 'better-call';

package/dist/index.js

@@ -11,12 +11,13 @@ import { betterFetch } from '@better-fetch/fetch';
 import { createOAuth2Request, sendTokenRequest } from 'arctic/dist/request';
 import { createConsola } from 'consola';
 import { TimeSpan } from 'oslo';
-import { generateRandomString, alphabet } from 'oslo/crypto';
+import { generateRandomString, alphabet, constantTimeEqual } from 'oslo/crypto';
 import Database from 'better-sqlite3';
 import { Kysely, MysqlDialect, PostgresDialect, SqliteDialect } from 'kysely';
 import { createPool } from 'mysql2';
 import pg from 'pg';
-import { Argon2id } from 'oslo/password';
+import { scrypt } from 'node:crypto';
+import { encodeHex, decodeHex } from 'oslo/encoding';
 
 // src/api/index.ts
 async function hs256(secretKey, message) {
@@ -1904,17 +1905,17 @@ function transformFrom(val, transform) {
   }
   return val;
 }
-var kyselyAdapter = (db, config) => {
+var kyselyAdapter = (db, config2) => {
   return {
     async create(data) {
       let { model, data: val, select } = data;
-      if (config?.transform) {
-        val = transformFrom(val, config.transform);
+      if (config2?.transform) {
+        val = transformFrom(val, config2.transform);
       }
       let res = await db.insertInto(model).values(val).returningAll().executeTakeFirst();
-      if (config?.transform) {
-        const schema = config.transform.schema[model];
-        res = schema ? transformTo(val, schema, config.transform) : res;
+      if (config2?.transform) {
+        const schema = config2.transform.schema[model];
+        res = schema ? transformTo(val, schema, config2.transform) : res;
       }
       if (select?.length) {
         const data2 = res ? select.reduce((acc, cur) => {
@@ -1953,9 +1954,9 @@ var kyselyAdapter = (db, config) => {
         }, {}) : null;
         res = data2;
       }
-      if (config?.transform) {
-        const schema = config.transform.schema[model];
-        res = res && schema ? transformTo(res, schema, config.transform) : res;
+      if (config2?.transform) {
+        const schema = config2.transform.schema[model];
+        res = res && schema ? transformTo(res, schema, config2.transform) : res;
         return res || null;
       }
       return res || null;
@@ -1971,17 +1972,17 @@ var kyselyAdapter = (db, config) => {
         query = query.where((eb) => eb.or(or));
       }
       const res = await query.selectAll().execute();
-      if (config?.transform) {
-        const schema = config.transform.schema[model];
-        return schema ? res.map((v) => transformTo(v, schema, config.transform)) : res;
+      if (config2?.transform) {
+        const schema = config2.transform.schema[model];
+        return schema ? res.map((v) => transformTo(v, schema, config2.transform)) : res;
       }
       return res;
     },
     async update(data) {
       let { model, where, update: val } = data;
       const { and, or } = convertWhere(where);
-      if (config?.transform) {
-        val = transformFrom(val, config.transform);
+      if (config2?.transform) {
+        val = transformFrom(val, config2.transform);
       }
       let query = db.updateTable(model).set(val);
       if (and) {
@@ -1991,9 +1992,9 @@ var kyselyAdapter = (db, config) => {
         query = query.where((eb) => eb.or(or));
       }
       const res = await query.returningAll().executeTakeFirst() || null;
-      if (config?.transform) {
-        const schema = config.transform.schema[model];
-        return schema ? transformTo(res, schema, config.transform) : res;
+      if (config2?.transform) {
+        const schema = config2.transform.schema[model];
+        return schema ? transformTo(res, schema, config2.transform) : res;
       }
       return res;
     },
@@ -2011,17 +2012,17 @@ var kyselyAdapter = (db, config) => {
     }
   };
 };
-var getDialect = (config) => {
-  if (!config.database) {
+var getDialect = (config2) => {
+  if (!config2.database) {
     return null;
   }
-  if (config.database instanceof MysqlDialect || config.database instanceof PostgresDialect || config.database instanceof SqliteDialect) {
-    return config.database;
+  if (config2.database instanceof MysqlDialect || config2.database instanceof PostgresDialect || config2.database instanceof SqliteDialect) {
+    return config2.database;
   }
   let dialect = null;
-  if ("provider" in config.database) {
-    const provider = config.database.provider;
-    const connectionString = config.database?.url?.trim();
+  if ("provider" in config2.database) {
+    const provider = config2.database.provider;
+    const connectionString = config2.database?.url?.trim();
     if (provider === "postgres") {
       const pool = new Pool({
         connectionString
@@ -2050,8 +2051,8 @@ var getDialect = (config) => {
   }
   return dialect;
 };
-var createKyselyAdapter = (config) => {
-  const dialect = getDialect(config);
+var createKyselyAdapter = (config2) => {
+  const dialect = getDialect(config2);
   if (!dialect) {
     return null;
   }
@@ -2060,18 +2061,18 @@ var createKyselyAdapter = (config) => {
   });
   return db;
 };
-var getDatabaseType = (config) => {
-  if ("provider" in config.database) {
-    return config.database.provider;
+var getDatabaseType = (config2) => {
+  if ("provider" in config2.database) {
+    return config2.database.provider;
   }
-  if ("dialect" in config.database) {
-    if (config.database.dialect instanceof PostgresDialect) {
+  if ("dialect" in config2.database) {
+    if (config2.database.dialect instanceof PostgresDialect) {
       return "postgres";
     }
-    if (config.database.dialect instanceof MysqlDialect) {
+    if (config2.database.dialect instanceof MysqlDialect) {
       return "mysql";
     }
-    if (config.database.dialect instanceof SqliteDialect) {
+    if (config2.database.dialect instanceof SqliteDialect) {
       return "sqlite";
     }
   }
@@ -2208,9 +2209,45 @@ function getAdapter(options) {
     }
   });
 }
-var bcrypt = new Argon2id();
-var hashPassword = bcrypt.hash;
-var verifyPassword = bcrypt.verify;
+var config = {
+  N: 16384,
+  r: 16,
+  p: 1,
+  dkLen: 64
+};
+async function generateKey(password, salt) {
+  return await new Promise((resolve, reject) => {
+    scrypt(
+      password.normalize("NFKC"),
+      salt,
+      config.dkLen,
+      {
+        N: config.N,
+        p: config.p,
+        r: config.r,
+        // errors when 128 * N * r > `maxmem` (approximately)
+        maxmem: 128 * config.N * config.r * 2
+      },
+      (err, buff) => {
+        if (err) return reject(err);
+        return resolve(buff);
+      }
+    );
+  });
+}
+function getPasswordHasher(secret) {
+  const hashPassword = async (password) => {
+    const salt = encodeHex(crypto.getRandomValues(new Uint8Array(16)));
+    const key = await generateKey(password, salt);
+    return `${salt}:${encodeHex(key)}`;
+  };
+  const verifyPassword = async (password, hash) => {
+    const [salt, key] = hash.split(":");
+    const targetKey = await generateKey(password, salt);
+    return constantTimeEqual(targetKey, decodeHex(key));
+  };
+  return { hashPassword, verifyPassword };
+}
 var createInternalAdapter = (adapter, options) => {
   const sessionExpiration = options.session?.expiresIn || 60 * 60 * 24 * 7;
   const tables = getAuthTables(options);
@@ -2395,10 +2432,10 @@ var createInternalAdapter = (adapter, options) => {
 };
 
 // src/db/field.ts
-var createFieldAttribute = (type, config) => {
+var createFieldAttribute = (type, config2) => {
   return {
     type,
-    ...config
+    ...config2
   };
 };
 
@@ -2410,6 +2447,8 @@ var init = (options) => {
   const adapter = getAdapter(options);
   const db = createKyselyAdapter(options);
   const baseURL = getBaseURL(options.baseURL, options.basePath);
+  const secret = options.secret || process.env.BETTER_AUTH_SECRET || process.env.AUTH_SECRET || DEFAULT_SECRET;
+  const { hashPassword, verifyPassword } = getPasswordHasher();
   return {
     options: {
       ...options,
@@ -2423,7 +2462,7 @@ var init = (options) => {
       expiresIn: options.session?.expiresIn || 60 * 60 * 24 * 7
       // 7 days
     },
-    secret: options.secret || process.env.BETTER_AUTH_SECRET || process.env.AUTH_SECRET || DEFAULT_SECRET,
+    secret,
     authCookies: getCookies(options),
     logger: createLogger({
       disabled: options.disableLog