better-auth 0.2.8-beta.1 → 0.2.8-beta.3

package/dist/adapters/drizzle.d.ts

@@ -1,6 +1,6 @@
-import { A as Adapter } from '../index-BC-04Tu0.js';
+import { A as Adapter } from '../index-CVYpdIik.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-XxjbEPqj.js';
 import 'arctic';
 import 'zod';
 import '../helper-D-PIAORk.js';

package/dist/adapters/drizzle.js

@@ -41,11 +41,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 +110,7 @@ var getAuthTables = (options) => {
     account: {
       tableName: options.account?.modelName || "account",
       fields: {
-        accountId: {
+        [accountFields?.accountId || "accountId"]: {
           type: "string",
           required: true
         },
@@ -149,6 +151,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/adapters/mongodb.d.ts

@@ -1,6 +1,6 @@
-import { W as Where } from '../index-BC-04Tu0.js';
+import { W as Where } from '../index-CVYpdIik.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-XxjbEPqj.js';
 import 'arctic';
 import 'zod';
 import '../helper-D-PIAORk.js';

package/dist/adapters/prisma.d.ts

@@ -1,6 +1,6 @@
-import { A as Adapter } from '../index-BC-04Tu0.js';
+import { A as Adapter } from '../index-CVYpdIik.js';
 import 'kysely';
-import '../index-37csVPVw.js';
+import '../index-XxjbEPqj.js';
 import 'arctic';
 import 'zod';
 import '../helper-D-PIAORk.js';

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-BC-04Tu0.js';
+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-CVYpdIik.js';
 import 'zod';
 import './helper-D-PIAORk.js';
 import 'better-call';
 import 'kysely';
-import './index-37csVPVw.js';
+import './index-XxjbEPqj.js';
 import 'arctic';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/api.js

@@ -10,6 +10,7 @@ import { createJWT, validateJWT, parseJWT } from 'oslo/jwt';
 import { betterFetch } from '@better-fetch/fetch';
 import { createConsola } from 'consola';
 import { TimeSpan } from 'oslo';
+import { nanoid } from 'nanoid';
 import { generateRandomString, alphabet } from 'oslo/crypto';
 import chalk from 'chalk';
 
@@ -643,9 +644,9 @@ function parseState(state) {
 }
 
 // src/utils/date.ts
-var getDate = (span, isSeconds = false) => {
+var getDate = (span, unit = "ms") => {
   const date = /* @__PURE__ */ new Date();
-  return new Date(date.getTime() + (isSeconds ? span * 1e3 : span));
+  return new Date(date.getTime() + (unit === "sec" ? span * 1e3 : span));
 };
 async function setSessionCookie(ctx, sessionToken, dontRememberMe, overrides) {
   const options = ctx.context.authCookies.sessionToken.options;
@@ -702,7 +703,6 @@ function getIp(req) {
 }
 
 // src/api/routes/session.ts
-var sessionCache = /* @__PURE__ */ new Map();
 function getRequestUniqueKey(ctx, token) {
   if (!ctx.request) {
     return "";
@@ -732,15 +732,6 @@ var getSession = () => createAuthEndpoint(
         });
       }
       const key = getRequestUniqueKey(ctx, sessionCookieToken);
-      const cachedSession = sessionCache.get(key);
-      if (cachedSession) {
-        if (cachedSession.expiresAt > Date.now()) {
-          return ctx.json(
-            cachedSession.data
-          );
-        }
-        sessionCache.delete(key);
-      }
       const session = await ctx.context.internalAdapter.findSession(sessionCookieToken);
       if (!session || session.session.expiresAt < /* @__PURE__ */ new Date()) {
         deleteSessionCookie(ctx);
@@ -768,7 +759,7 @@ var getSession = () => createAuthEndpoint(
         const updatedSession = await ctx.context.internalAdapter.updateSession(
           session.session.id,
           {
-            expiresAt: getDate(ctx.context.sessionConfig.expiresIn, true)
+            expiresAt: getDate(ctx.context.sessionConfig.expiresIn, "sec")
           }
         );
         if (!updatedSession) {
@@ -784,10 +775,6 @@ var getSession = () => createAuthEndpoint(
           user: session.user
         });
       }
-      sessionCache.set(key, {
-        data: session,
-        expiresAt: Date.now() + 5e3
-      });
       return ctx.json(
         session
       );
@@ -1096,8 +1083,14 @@ z.object({
   ipAddress: z.string().optional(),
   userAgent: z.string().optional()
 });
-var generateId = () => {
-  return generateRandomString(36, alphabet("a-z", "0-9"));
+z.object({
+  id: z.string(),
+  value: z.string(),
+  expiresAt: z.date(),
+  identifier: z.string()
+});
+var generateId = (size) => {
+  return nanoid(size);
 };
 
 // src/utils/hide-metadata.ts

package/dist/cli.js

@@ -15,7 +15,7 @@ import prompts3 from 'prompts';
 import '@antfu/ni';
 import 'execa';
 import 'oslo';
-import 'oslo/crypto';
+import 'nanoid';
 import 'oslo/oauth2';
 import fs from 'fs/promises';
 
@@ -206,11 +206,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
         },
@@ -273,7 +275,7 @@ var getAuthTables = (options) => {
     account: {
       tableName: options.account?.modelName || "account",
       fields: {
-        accountId: {
+        [accountFields?.accountId || "accountId"]: {
           type: "string",
           required: true
         },
@@ -314,45 +316,46 @@ 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 : {}
   };
 };
 
 // src/cli/utils/get-schema.ts
-function getPluginTable(config) {
-  const pluginsMigrations = config.plugins?.flatMap(
-    (plugin) => Object.keys(plugin.schema || {}).map((key) => {
-      const schema = plugin.schema || {};
-      const table = schema[key];
-      if (table?.disableMigration) {
-        return;
-      }
-      return {
-        tableName: key,
-        fields: table?.fields
-      };
-    }).filter((value) => value !== void 0)
-  ) || [];
-  return pluginsMigrations;
-}
 function getSchema(config) {
-  const baseSchema = getAuthTables(config);
-  const pluginSchema = getPluginTable(config);
-  const schema = [
-    baseSchema.user,
-    baseSchema.session,
-    baseSchema.account,
-    ...pluginSchema
-  ].reduce((acc, curr) => {
-    acc[curr.tableName] = {
-      fields: {
-        ...acc[curr.tableName]?.fields,
-        ...curr.fields
-      }
+  const tables = getAuthTables(config);
+  let schema = {};
+  for (const key in tables) {
+    const table = tables[key];
+    if (schema[table.tableName]) {
+      schema[table.tableName].fields = {
+        ...schema[table.tableName].fields,
+        ...table.fields
+      };
+      continue;
+    }
+    schema[table.tableName] = {
+      fields: table.fields,
+      order: table.order || Infinity
     };
-    return acc;
-  }, {});
+  }
   return schema;
 }
 

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-BYDTZ_xW.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, d as Organization, M as Member, I as Invitation, u as username, m as magicLink } from '../index-DKbdF1U-.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DKbdF1U-.js';
+import { o as organization, e as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber } from '../index-CKRA1pd0.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-CKRA1pd0.js';
 import { P as Prettify } from '../helper-D-PIAORk.js';
-import '../index-37csVPVw.js';
+import '../index-XxjbEPqj.js';
 import 'arctic';
 import 'zod';
 import 'better-call';
-import '../index-BC-04Tu0.js';
+import '../index-CVYpdIik.js';
 import 'kysely';
 import 'better-sqlite3';
 import 'mysql2';
@@ -123,10 +123,13 @@ declare const organizationClient: <O extends OrganizationClientOptions>(options?
             isPending: boolean;
         }>;
     };
-    atomListeners: {
+    atomListeners: ({
+        matcher(path: string): path is "/organization/create" | "/organization/delete";
+        signal: "_listOrg";
+    } | {
         matcher(path: string): boolean;
-        signal: string;
-    }[];
+        signal: "_activeOrgSignal";
+    })[];
 };
 
 declare const usernameClient: () => {
@@ -139,4 +142,13 @@ declare const magicLinkClient: () => {
     $InferServerPlugin: ReturnType<typeof magicLink>;
 };
 
-export { magicLinkClient, organizationClient, usernameClient };
+declare const phoneNumberClient: () => {
+    id: "phoneNumber";
+    $InferServerPlugin: ReturnType<typeof phoneNumber>;
+    atomListeners: {
+        matcher(path: string): path is "/phone-number/verify" | "/phone-number/update";
+        signal: "_sessionSignal";
+    }[];
+};
+
+export { magicLinkClient, organizationClient, phoneNumberClient, usernameClient };

package/dist/client/plugins.js

@@ -466,4 +466,20 @@ var magicLinkClient = () => {
   };
 };
 
-export { getPasskeyActions, magicLinkClient, organizationClient, passkeyClient, twoFactorClient, usernameClient };
+// src/plugins/phone-number/client.ts
+var phoneNumberClient = () => {
+  return {
+    id: "phoneNumber",
+    $InferServerPlugin: {},
+    atomListeners: [
+      {
+        matcher(path) {
+          return path === "/phone-number/update" || path === "/phone-number/verify";
+        },
+        signal: "_sessionSignal"
+      }
+    ]
+  };
+};
+
+export { getPasskeyActions, magicLinkClient, organizationClient, passkeyClient, phoneNumberClient, twoFactorClient, usernameClient };

package/dist/client.d.ts

@@ -6,9 +6,9 @@ import { BetterFetch, BetterFetchError, BetterFetchOption } from '@better-fetch/
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-D-PIAORk.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-BC-04Tu0.js';
+import './index-CVYpdIik.js';
 import 'kysely';
-import './index-37csVPVw.js';
+import './index-XxjbEPqj.js';
 import 'arctic';
 import 'better-call';
 import 'better-sqlite3';