better-auth 0.4.3-beta.1 → 0.4.4-beta.1

package/dist/adapters/drizzle.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-CBfuy92d.js';
+import { A as Adapter } from '../index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/adapters/mongodb.d.ts

@@ -1,5 +1,5 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-CBfuy92d.js';
+import { W as Where } from '../index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/adapters/prisma.d.ts

@@ -1,4 +1,4 @@
-import { A as Adapter } from '../index-CBfuy92d.js';
+import { A as Adapter } from '../index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import '../types-IzAbV4nB.js';

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-export { e as AuthEndpoint, f as AuthMiddleware, v as callbackOAuth, T as changePassword, d as createAuthEndpoint, c as createAuthMiddleware, M as createEmailVerificationToken, $ as csrfMiddleware, V as deleteUser, Y as error, J as forgetPassword, K as forgetPasswordCallback, X as getCSRFToken, r as getEndpoints, w as getSession, x as getSessionFromCtx, z as listSessions, Z as ok, o as optionsMiddleware, L as resetPassword, C as revokeSession, D as revokeSessions, s as router, N as sendVerificationEmail, y as sessionMiddleware, U as setPassword, u as signInEmail, t as signInOAuth, E as signOut, _ as signUpEmail, Q as updateUser, O as verifyEmail } from './index-CBfuy92d.js';
+export { e as AuthEndpoint, f as AuthMiddleware, v as callbackOAuth, T as changePassword, d as createAuthEndpoint, c as createAuthMiddleware, M as createEmailVerificationToken, $ as csrfMiddleware, V as deleteUser, Y as error, J as forgetPassword, K as forgetPasswordCallback, X as getCSRFToken, r as getEndpoints, w as getSession, x as getSessionFromCtx, z as listSessions, Z as ok, o as optionsMiddleware, L as resetPassword, C as revokeSession, D as revokeSessions, s as router, N as sendVerificationEmail, y as sessionMiddleware, U as setPassword, u as signInEmail, t as signInOAuth, E as signOut, _ as signUpEmail, Q as updateUser, O as verifyEmail } from './index-OZLnPypp.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';

package/dist/api.js

@@ -454,94 +454,45 @@ var github = (options) => {
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  success: 2,
-  warn: 3,
-  error: 4
-};
-var LIBRARY_NAME = "Better Auth";
-var formatDate = (date) => {
-  const pad = (num) => num.toString().padStart(2, "0");
-  const year = date.getFullYear();
-  const month = pad(date.getMonth() + 1);
-  const day = pad(date.getDate());
-  const hours = pad(date.getHours());
-  const minutes = pad(date.getMinutes());
-  const seconds = pad(date.getSeconds());
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-var colorize = (text, color) => {
-  const colors = {
-    reset: "\x1B[0m",
-    green: "\x1B[32m",
-    yellow: "\x1B[33m",
-    red: "\x1B[31m",
-    blue: "\x1B[34m",
-    cyan: "\x1B[36m"
-  };
-  return `${colors[color]}${text}${colors.reset}`;
-};
-var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
-  let formattedLevel = level.toUpperCase();
-  let colorizedMessage = message;
-  switch (level) {
-    case "debug":
-      formattedLevel = colorize(formattedLevel, "cyan");
-      break;
-    case "info":
-      formattedLevel = colorize(formattedLevel, "blue");
-      break;
-    case "success":
-      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
-      colorizedMessage = colorize(message, "green");
-      break;
-    case "warn":
-      formattedLevel = colorize(formattedLevel, "yellow");
-      break;
-    case "error":
-      formattedLevel = colorize(formattedLevel, "red");
-      break;
+import { createConsola } from "consola";
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
   }
-  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
-};
-function createLogger(options = {}) {
-  const {
-    disabled = false,
-    minLevel = "info",
-    customFormat = defaultFormat
-  } = options;
-  const loggerFunction = (level) => {
-    return (message, ...args) => {
-      if (disabled) return;
-      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
-        const timestamp = formatDate(/* @__PURE__ */ new Date());
-        const formattedMessage = customFormat(
-          level,
-          message,
-          timestamp,
-          LIBRARY_NAME,
-          ...args
-        );
-        console.log(formattedMessage);
-      }
-    };
-  };
+});
+var createLogger = (options) => {
   return {
-    debug: loggerFunction("debug"),
-    info: loggerFunction("info"),
-    break: () => {
-      console.log("\n");
+    log: (...args) => {
+      !options?.disabled && consola.log("", ...args);
     },
-    success: loggerFunction("success"),
-    warn: loggerFunction("warn"),
-    error: loggerFunction("error"),
-    setMinLevel: (level) => {
-      options.minLevel = level;
+    error: (...args) => {
+      !options?.disabled && consola.error("", ...args);
+    },
+    warn: (...args) => {
+      !options?.disabled && consola.warn("", ...args);
+    },
+    info: (...args) => {
+      !options?.disabled && consola.info("", ...args);
+    },
+    debug: (...args) => {
+      !options?.disabled && consola.debug("", ...args);
+    },
+    box: (...args) => {
+      !options?.disabled && consola.box("", ...args);
+    },
+    success: (...args) => {
+      !options?.disabled && consola.success("", ...args);
+    },
+    break: (...args) => {
+      !options?.disabled && console.log("\n");
     }
   };
-}
+};
 var logger = createLogger();
 
 // src/social-providers/google.ts
@@ -869,20 +820,22 @@ import { APIError as APIError2 } from "better-call";
 
 // src/utils/date.ts
 var getDate = (span, unit = "ms") => {
-  const date = /* @__PURE__ */ new Date();
-  return new Date(date.getTime() + (unit === "sec" ? span * 1e3 : span));
+  return new Date(Date.now() + (unit === "sec" ? span * 1e3 : span));
 };
 
 // src/cookies/index.ts
 import { TimeSpan } from "oslo";
 async function setSessionCookie(ctx, sessionToken, dontRememberMe, overrides) {
   const options = ctx.context.authCookies.sessionToken.options;
-  options.maxAge = dontRememberMe ? void 0 : options.maxAge;
+  options.maxAge = dontRememberMe ? void 0 : ctx.context.sessionConfig.expiresIn;
   await ctx.setSignedCookie(
     ctx.context.authCookies.sessionToken.name,
     sessionToken,
     ctx.context.secret,
-    options
+    {
+      ...options,
+      ...overrides
+    }
   );
   if (dontRememberMe) {
     await ctx.setSignedCookie(

package/dist/cli.js

@@ -10,94 +10,45 @@ import { Command } from "commander";
 import { loadConfig } from "c12";
 
 // src/utils/logger.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  success: 2,
-  warn: 3,
-  error: 4
-};
-var LIBRARY_NAME = "Better Auth";
-var formatDate = (date) => {
-  const pad = (num) => num.toString().padStart(2, "0");
-  const year = date.getFullYear();
-  const month = pad(date.getMonth() + 1);
-  const day = pad(date.getDate());
-  const hours = pad(date.getHours());
-  const minutes = pad(date.getMinutes());
-  const seconds = pad(date.getSeconds());
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-var colorize = (text, color) => {
-  const colors = {
-    reset: "\x1B[0m",
-    green: "\x1B[32m",
-    yellow: "\x1B[33m",
-    red: "\x1B[31m",
-    blue: "\x1B[34m",
-    cyan: "\x1B[36m"
-  };
-  return `${colors[color]}${text}${colors.reset}`;
-};
-var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
-  let formattedLevel = level.toUpperCase();
-  let colorizedMessage = message;
-  switch (level) {
-    case "debug":
-      formattedLevel = colorize(formattedLevel, "cyan");
-      break;
-    case "info":
-      formattedLevel = colorize(formattedLevel, "blue");
-      break;
-    case "success":
-      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
-      colorizedMessage = colorize(message, "green");
-      break;
-    case "warn":
-      formattedLevel = colorize(formattedLevel, "yellow");
-      break;
-    case "error":
-      formattedLevel = colorize(formattedLevel, "red");
-      break;
+import { createConsola } from "consola";
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
   }
-  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
-};
-function createLogger(options = {}) {
-  const {
-    disabled = false,
-    minLevel = "info",
-    customFormat = defaultFormat
-  } = options;
-  const loggerFunction = (level) => {
-    return (message, ...args) => {
-      if (disabled) return;
-      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
-        const timestamp = formatDate(/* @__PURE__ */ new Date());
-        const formattedMessage = customFormat(
-          level,
-          message,
-          timestamp,
-          LIBRARY_NAME,
-          ...args
-        );
-        console.log(formattedMessage);
-      }
-    };
-  };
+});
+var createLogger = (options) => {
   return {
-    debug: loggerFunction("debug"),
-    info: loggerFunction("info"),
-    break: () => {
-      console.log("\n");
+    log: (...args) => {
+      !options?.disabled && consola.log("", ...args);
+    },
+    error: (...args) => {
+      !options?.disabled && consola.error("", ...args);
+    },
+    warn: (...args) => {
+      !options?.disabled && consola.warn("", ...args);
+    },
+    info: (...args) => {
+      !options?.disabled && consola.info("", ...args);
+    },
+    debug: (...args) => {
+      !options?.disabled && consola.debug("", ...args);
     },
-    success: loggerFunction("success"),
-    warn: loggerFunction("warn"),
-    error: loggerFunction("error"),
-    setMinLevel: (level) => {
-      options.minLevel = level;
+    box: (...args) => {
+      !options?.disabled && consola.box("", ...args);
+    },
+    success: (...args) => {
+      !options?.disabled && consola.success("", ...args);
+    },
+    break: (...args) => {
+      !options?.disabled && console.log("\n");
     }
   };
-}
+};
 var logger = createLogger();
 
 // src/cli/get-config.ts
@@ -155,6 +106,7 @@ function getPathAliases(cwd) {
     }
     return result;
   } catch (error) {
+    console.error(error);
     throw new BetterAuthError("Error parsing tsconfig.json");
   }
 }
@@ -186,7 +138,6 @@ async function getConfig({
   try {
     let configFile = null;
     if (configPath) {
-      const alias = getPathAliases(cwd);
       const { config } = await loadConfig({
         configFile: path.join(cwd, configPath),
         dotenv: true,
@@ -784,7 +735,7 @@ var migrate = new Command("migrate").option(
   spinner.stop();
   logger.info(`\u{1F511} The migration will affect the following:`);
   for (const table of [...toBeCreated, ...toBeAdded]) {
-    logger.info(
+    console.log(
       "->",
       chalk.magenta(Object.keys(table.fields).join(", ")),
       chalk.white("fields on"),

package/dist/client/plugins.d.ts

@@ -2,10 +2,10 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-CmVVvxZr.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-CmVVvxZr.js';
+import { o as organization, j as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous, i as admin } from '../index-ClXwCXhZ.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-ClXwCXhZ.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-CBfuy92d.js';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-OZLnPypp.js';
 import * as better_call from 'better-call';
 import { z } from 'zod';
 import { O as OAuth2Tokens, U as User } from '../types-IzAbV4nB.js';

package/dist/client.d.ts

@@ -6,7 +6,7 @@ import { BetterFetch, BetterFetchError, BetterFetchOption } from '@better-fetch/
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-CBfuy92d.js';
+import './index-OZLnPypp.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/{index-CmVVvxZr.d.ts → index-ClXwCXhZ.d.ts}

@@ -5,7 +5,7 @@ import { P as Prettify } from './helper-DPDj8Nix.js';
 import { A as AccessControl, R as Role, S as StatementsPrimitive, g as defaultRoles } from './statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetch, BetterFetchOption } from '@better-fetch/fetch';
-import { H as HookEndpointContext, g as AuthContext } from './index-CBfuy92d.js';
+import { H as HookEndpointContext, g as AuthContext } from './index-OZLnPypp.js';
 import * as nanostores from 'nanostores';
 import { atom } from 'nanostores';
 import * as _simplewebauthn_types from '@simplewebauthn/types';

package/dist/{index-CBfuy92d.d.ts → index-OZLnPypp.d.ts}

@@ -118,21 +118,17 @@ declare function createCookieGetter(options: BetterAuthOptions): (cookieName: st
 };
 type BetterAuthCookies = ReturnType<typeof getCookies>;
 
-type LogLevel = "debug" | "info" | "success" | "warn" | "error";
-type LogFunction = (message: any, ...args: any[]) => void;
-type LoggerOptions = {
+declare const createLogger: (options?: {
     disabled?: boolean;
-    minLevel?: LogLevel;
-    customFormat?: (level: LogLevel, message: any, timestamp: string, libraryName: string, ...args: any[]) => string;
-};
-declare function createLogger(options?: LoggerOptions): {
-    debug: LogFunction;
-    info: LogFunction;
-    break: () => void;
-    success: LogFunction;
-    warn: LogFunction;
-    error: LogFunction;
-    setMinLevel: (level: LogLevel) => void;
+}) => {
+    log: (...args: any[]) => void;
+    error: (...args: any[]) => void;
+    warn: (...args: any[]) => void;
+    info: (...args: any[]) => void;
+    debug: (...args: any[]) => void;
+    box: (...args: any[]) => void;
+    success: (...args: any[]) => void;
+    break: (...args: any[]) => void;
 };
 
 declare const init: (options: BetterAuthOptions) => Promise<AuthContext>;
@@ -1016,22 +1012,8 @@ declare const createInternalAdapter: (adapter: Adapter, ctx: {
         userAgent?: string | undefined;
     } | null>;
     findSession: (sessionId: string) => Promise<{
-        session: {
-            id: string;
-            userId: string;
-            expiresAt: Date;
-            ipAddress?: string | undefined;
-            userAgent?: string | undefined;
-        };
-        user: {
-            id: string;
-            email: string;
-            emailVerified: boolean;
-            name: string;
-            createdAt: Date;
-            updatedAt: Date;
-            image?: string | undefined;
-        };
+        session: Session;
+        user: User;
     } | null>;
     updateSession: (sessionId: string, session: Partial<Session>) => Promise<{
         id: string;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { a as Auth, a0 as betterAuth } from './index-CBfuy92d.js';
+export { a as Auth, a0 as betterAuth } from './index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/index.js

@@ -454,94 +454,45 @@ var github = (options) => {
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  success: 2,
-  warn: 3,
-  error: 4
-};
-var LIBRARY_NAME = "Better Auth";
-var formatDate = (date) => {
-  const pad = (num) => num.toString().padStart(2, "0");
-  const year = date.getFullYear();
-  const month = pad(date.getMonth() + 1);
-  const day = pad(date.getDate());
-  const hours = pad(date.getHours());
-  const minutes = pad(date.getMinutes());
-  const seconds = pad(date.getSeconds());
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-var colorize = (text, color) => {
-  const colors = {
-    reset: "\x1B[0m",
-    green: "\x1B[32m",
-    yellow: "\x1B[33m",
-    red: "\x1B[31m",
-    blue: "\x1B[34m",
-    cyan: "\x1B[36m"
-  };
-  return `${colors[color]}${text}${colors.reset}`;
-};
-var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
-  let formattedLevel = level.toUpperCase();
-  let colorizedMessage = message;
-  switch (level) {
-    case "debug":
-      formattedLevel = colorize(formattedLevel, "cyan");
-      break;
-    case "info":
-      formattedLevel = colorize(formattedLevel, "blue");
-      break;
-    case "success":
-      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
-      colorizedMessage = colorize(message, "green");
-      break;
-    case "warn":
-      formattedLevel = colorize(formattedLevel, "yellow");
-      break;
-    case "error":
-      formattedLevel = colorize(formattedLevel, "red");
-      break;
+import { createConsola } from "consola";
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
   }
-  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
-};
-function createLogger(options = {}) {
-  const {
-    disabled = false,
-    minLevel = "info",
-    customFormat = defaultFormat
-  } = options;
-  const loggerFunction = (level) => {
-    return (message, ...args) => {
-      if (disabled) return;
-      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
-        const timestamp = formatDate(/* @__PURE__ */ new Date());
-        const formattedMessage = customFormat(
-          level,
-          message,
-          timestamp,
-          LIBRARY_NAME,
-          ...args
-        );
-        console.log(formattedMessage);
-      }
-    };
-  };
+});
+var createLogger = (options) => {
   return {
-    debug: loggerFunction("debug"),
-    info: loggerFunction("info"),
-    break: () => {
-      console.log("\n");
+    log: (...args) => {
+      !options?.disabled && consola.log("", ...args);
+    },
+    error: (...args) => {
+      !options?.disabled && consola.error("", ...args);
+    },
+    warn: (...args) => {
+      !options?.disabled && consola.warn("", ...args);
+    },
+    info: (...args) => {
+      !options?.disabled && consola.info("", ...args);
+    },
+    debug: (...args) => {
+      !options?.disabled && consola.debug("", ...args);
     },
-    success: loggerFunction("success"),
-    warn: loggerFunction("warn"),
-    error: loggerFunction("error"),
-    setMinLevel: (level) => {
-      options.minLevel = level;
+    box: (...args) => {
+      !options?.disabled && consola.box("", ...args);
+    },
+    success: (...args) => {
+      !options?.disabled && consola.success("", ...args);
+    },
+    break: (...args) => {
+      !options?.disabled && console.log("\n");
     }
   };
-}
+};
 var logger = createLogger();
 
 // src/social-providers/google.ts
@@ -869,8 +820,7 @@ import { APIError as APIError2 } from "better-call";
 
 // src/utils/date.ts
 var getDate = (span, unit = "ms") => {
-  const date = /* @__PURE__ */ new Date();
-  return new Date(date.getTime() + (unit === "sec" ? span * 1e3 : span));
+  return new Date(Date.now() + (unit === "sec" ? span * 1e3 : span));
 };
 
 // src/cookies/index.ts
@@ -879,7 +829,7 @@ function getCookies(options) {
   const secure = options.advanced?.useSecureCookies !== void 0 ? options.advanced?.useSecureCookies : options.baseURL?.startsWith("https://") || process.env.NODE_ENV === "production";
   const secureCookiePrefix = secure ? "__Secure-" : "";
   const cookiePrefix = "better-auth";
-  const sessionMaxAge = new TimeSpan(7, "d").seconds();
+  const sessionMaxAge = options.session?.expiresIn || new TimeSpan(7, "d").seconds();
   const crossSubdomainEnabled = !!options.advanced?.crossSubDomainCookies?.enabled;
   const domain = crossSubdomainEnabled ? options.advanced?.crossSubDomainCookies?.domain || (options.baseURL ? new URL(options.baseURL).hostname : void 0) : void 0;
   if (crossSubdomainEnabled && !domain) {
@@ -983,12 +933,15 @@ function createCookieGetter(options) {
 }
 async function setSessionCookie(ctx, sessionToken, dontRememberMe, overrides) {
   const options = ctx.context.authCookies.sessionToken.options;
-  options.maxAge = dontRememberMe ? void 0 : options.maxAge;
+  options.maxAge = dontRememberMe ? void 0 : ctx.context.sessionConfig.expiresIn;
   await ctx.setSignedCookie(
     ctx.context.authCookies.sessionToken.name,
     sessionToken,
     ctx.context.secret,
-    options
+    {
+      ...options,
+      ...overrides
+    }
   );
   if (dontRememberMe) {
     await ctx.setSignedCookie(
@@ -3805,42 +3758,54 @@ var createInternalAdapter = (adapter, ctx) => {
          * set the session to expire in 1 day.
          * The cookie will be set to expire at the end of the session
          */
-        expiresAt: dontRememberMe ? getDate(1e3 * 60 * 60 * 24) : getDate(sessionExpiration, "sec"),
+        expiresAt: dontRememberMe ? getDate(60 * 60 * 24, "sec") : getDate(sessionExpiration, "sec"),
         ipAddress: headers?.get("x-forwarded-for") || "",
         userAgent: headers?.get("user-agent") || ""
       };
       const session = await createWithHooks(data, "session");
       if (secondaryStorage && session) {
+        const user = await adapter.findOne({
+          model: tables.user.tableName,
+          where: [{ field: "id", value: userId }]
+        });
         secondaryStorage.set(
           session.id,
-          JSON.stringify(session),
+          JSON.stringify({
+            session,
+            user
+          }),
           sessionExpiration
         );
       }
       return session;
     },
     findSession: async (sessionId) => {
-      let session = null;
       if (secondaryStorage) {
         const sessionStringified = await secondaryStorage.get(sessionId);
         if (sessionStringified) {
           const s = JSON.parse(sessionStringified);
-          session = {
-            ...s,
-            expiresAt: new Date(s.expiresAt)
+          return {
+            session: {
+              ...s.session,
+              expiresAt: new Date(s.session.expiresAt)
+            },
+            user: {
+              ...s.user,
+              createdAt: new Date(s.user.createdAt),
+              updatedAt: new Date(s.user.updatedAt)
+            }
           };
         }
-      } else {
-        session = await adapter.findOne({
-          model: tables.session.tableName,
-          where: [
-            {
-              value: sessionId,
-              field: "id"
-            }
-          ]
-        });
       }
+      const session = await adapter.findOne({
+        model: tables.session.tableName,
+        where: [
+          {
+            value: sessionId,
+            field: "id"
+          }
+        ]
+      });
       if (!session) {
         return null;
       }

package/dist/next-js.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-CBfuy92d.js';
+import { a as Auth } from './index-OZLnPypp.js';
 import { U as User, S as Session } from './types-IzAbV4nB.js';
 import { NextRequest } from 'next/server';
 import 'zod';

package/dist/node.d.ts

@@ -1,5 +1,5 @@
 import * as http from 'http';
-import { a as Auth } from './index-CBfuy92d.js';
+import { a as Auth } from './index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/plugins.d.ts

@@ -1,7 +1,7 @@
-export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-CmVVvxZr.js';
+export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, f as UserWithRole, i as admin, h as adminMiddleware, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-ClXwCXhZ.js';
 export { i as ac } from './index-DfAHOgpj.js';
-import { H as HookEndpointContext } from './index-CBfuy92d.js';
-export { e as AuthEndpoint, f as AuthMiddleware, b as BetterAuthPlugin, P as PluginSchema, d as createAuthEndpoint, c as createAuthMiddleware, o as optionsMiddleware } from './index-CBfuy92d.js';
+import { H as HookEndpointContext } from './index-OZLnPypp.js';
+export { e as AuthEndpoint, f as AuthMiddleware, b as BetterAuthPlugin, P as PluginSchema, d as createAuthEndpoint, c as createAuthMiddleware, o as optionsMiddleware } from './index-OZLnPypp.js';
 import './types-IzAbV4nB.js';
 import 'zod';
 import './helper-DPDj8Nix.js';

package/dist/plugins.js

@@ -394,94 +394,45 @@ var github = (options) => {
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  success: 2,
-  warn: 3,
-  error: 4
-};
-var LIBRARY_NAME = "Better Auth";
-var formatDate = (date) => {
-  const pad = (num) => num.toString().padStart(2, "0");
-  const year = date.getFullYear();
-  const month = pad(date.getMonth() + 1);
-  const day = pad(date.getDate());
-  const hours = pad(date.getHours());
-  const minutes = pad(date.getMinutes());
-  const seconds = pad(date.getSeconds());
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-var colorize = (text, color) => {
-  const colors = {
-    reset: "\x1B[0m",
-    green: "\x1B[32m",
-    yellow: "\x1B[33m",
-    red: "\x1B[31m",
-    blue: "\x1B[34m",
-    cyan: "\x1B[36m"
-  };
-  return `${colors[color]}${text}${colors.reset}`;
-};
-var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
-  let formattedLevel = level.toUpperCase();
-  let colorizedMessage = message;
-  switch (level) {
-    case "debug":
-      formattedLevel = colorize(formattedLevel, "cyan");
-      break;
-    case "info":
-      formattedLevel = colorize(formattedLevel, "blue");
-      break;
-    case "success":
-      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
-      colorizedMessage = colorize(message, "green");
-      break;
-    case "warn":
-      formattedLevel = colorize(formattedLevel, "yellow");
-      break;
-    case "error":
-      formattedLevel = colorize(formattedLevel, "red");
-      break;
+import { createConsola } from "consola";
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
   }
-  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
-};
-function createLogger(options = {}) {
-  const {
-    disabled = false,
-    minLevel = "info",
-    customFormat = defaultFormat
-  } = options;
-  const loggerFunction = (level) => {
-    return (message, ...args) => {
-      if (disabled) return;
-      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
-        const timestamp = formatDate(/* @__PURE__ */ new Date());
-        const formattedMessage = customFormat(
-          level,
-          message,
-          timestamp,
-          LIBRARY_NAME,
-          ...args
-        );
-        console.log(formattedMessage);
-      }
-    };
-  };
+});
+var createLogger = (options) => {
   return {
-    debug: loggerFunction("debug"),
-    info: loggerFunction("info"),
-    break: () => {
-      console.log("\n");
+    log: (...args) => {
+      !options?.disabled && consola.log("", ...args);
     },
-    success: loggerFunction("success"),
-    warn: loggerFunction("warn"),
-    error: loggerFunction("error"),
-    setMinLevel: (level) => {
-      options.minLevel = level;
+    error: (...args) => {
+      !options?.disabled && consola.error("", ...args);
+    },
+    warn: (...args) => {
+      !options?.disabled && consola.warn("", ...args);
+    },
+    info: (...args) => {
+      !options?.disabled && consola.info("", ...args);
+    },
+    debug: (...args) => {
+      !options?.disabled && consola.debug("", ...args);
+    },
+    box: (...args) => {
+      !options?.disabled && consola.box("", ...args);
+    },
+    success: (...args) => {
+      !options?.disabled && consola.success("", ...args);
+    },
+    break: (...args) => {
+      !options?.disabled && console.log("\n");
     }
   };
-}
+};
 var logger = createLogger();
 
 // src/social-providers/google.ts
@@ -809,20 +760,22 @@ import { APIError } from "better-call";
 
 // src/utils/date.ts
 var getDate = (span, unit = "ms") => {
-  const date = /* @__PURE__ */ new Date();
-  return new Date(date.getTime() + (unit === "sec" ? span * 1e3 : span));
+  return new Date(Date.now() + (unit === "sec" ? span * 1e3 : span));
 };
 
 // src/cookies/index.ts
 import { TimeSpan } from "oslo";
 async function setSessionCookie(ctx, sessionToken, dontRememberMe, overrides) {
   const options = ctx.context.authCookies.sessionToken.options;
-  options.maxAge = dontRememberMe ? void 0 : options.maxAge;
+  options.maxAge = dontRememberMe ? void 0 : ctx.context.sessionConfig.expiresIn;
   await ctx.setSignedCookie(
     ctx.context.authCookies.sessionToken.name,
     sessionToken,
     ctx.context.secret,
-    options
+    {
+      ...options,
+      ...overrides
+    }
   );
   if (dontRememberMe) {
     await ctx.setSignedCookie(

package/dist/react.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { useStore } from '@nanostores/react';
-import './index-CBfuy92d.js';
+import './index-OZLnPypp.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/social.js

@@ -349,94 +349,45 @@ var github = (options) => {
 import { parseJWT as parseJWT2 } from "oslo/jwt";
 
 // src/utils/logger.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  success: 2,
-  warn: 3,
-  error: 4
-};
-var LIBRARY_NAME = "Better Auth";
-var formatDate = (date) => {
-  const pad = (num) => num.toString().padStart(2, "0");
-  const year = date.getFullYear();
-  const month = pad(date.getMonth() + 1);
-  const day = pad(date.getDate());
-  const hours = pad(date.getHours());
-  const minutes = pad(date.getMinutes());
-  const seconds = pad(date.getSeconds());
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-var colorize = (text, color) => {
-  const colors = {
-    reset: "\x1B[0m",
-    green: "\x1B[32m",
-    yellow: "\x1B[33m",
-    red: "\x1B[31m",
-    blue: "\x1B[34m",
-    cyan: "\x1B[36m"
-  };
-  return `${colors[color]}${text}${colors.reset}`;
-};
-var defaultFormat = (level, message, timestamp, libraryName, ...args) => {
-  let formattedLevel = level.toUpperCase();
-  let colorizedMessage = message;
-  switch (level) {
-    case "debug":
-      formattedLevel = colorize(formattedLevel, "cyan");
-      break;
-    case "info":
-      formattedLevel = colorize(formattedLevel, "blue");
-      break;
-    case "success":
-      formattedLevel = colorize(`\u2713 ${formattedLevel}`, "green");
-      colorizedMessage = colorize(message, "green");
-      break;
-    case "warn":
-      formattedLevel = colorize(formattedLevel, "yellow");
-      break;
-    case "error":
-      formattedLevel = colorize(formattedLevel, "red");
-      break;
+import { createConsola } from "consola";
+var consola = createConsola({
+  formatOptions: {
+    date: false,
+    colors: true,
+    compact: true
+  },
+  defaults: {
+    tag: "Better Auth"
   }
-  return `[${timestamp}] [${libraryName}] ${formattedLevel}: ${colorizedMessage} ${args.length ? JSON.stringify(args) : ""}`;
-};
-function createLogger(options = {}) {
-  const {
-    disabled = false,
-    minLevel = "info",
-    customFormat = defaultFormat
-  } = options;
-  const loggerFunction = (level) => {
-    return (message, ...args) => {
-      if (disabled) return;
-      if (LOG_LEVELS[level] >= LOG_LEVELS[minLevel]) {
-        const timestamp = formatDate(/* @__PURE__ */ new Date());
-        const formattedMessage = customFormat(
-          level,
-          message,
-          timestamp,
-          LIBRARY_NAME,
-          ...args
-        );
-        console.log(formattedMessage);
-      }
-    };
-  };
+});
+var createLogger = (options) => {
   return {
-    debug: loggerFunction("debug"),
-    info: loggerFunction("info"),
-    break: () => {
-      console.log("\n");
+    log: (...args) => {
+      !options?.disabled && consola.log("", ...args);
     },
-    success: loggerFunction("success"),
-    warn: loggerFunction("warn"),
-    error: loggerFunction("error"),
-    setMinLevel: (level) => {
-      options.minLevel = level;
+    error: (...args) => {
+      !options?.disabled && consola.error("", ...args);
+    },
+    warn: (...args) => {
+      !options?.disabled && consola.warn("", ...args);
+    },
+    info: (...args) => {
+      !options?.disabled && consola.info("", ...args);
+    },
+    debug: (...args) => {
+      !options?.disabled && consola.debug("", ...args);
+    },
+    box: (...args) => {
+      !options?.disabled && consola.box("", ...args);
+    },
+    success: (...args) => {
+      !options?.disabled && consola.success("", ...args);
+    },
+    break: (...args) => {
+      !options?.disabled && console.log("\n");
     }
   };
-}
+};
 var logger = createLogger();
 
 // src/social-providers/google.ts

package/dist/solid-start.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth } from './index-CBfuy92d.js';
+import { a as Auth } from './index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/solid.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { Accessor } from 'solid-js';
-import './index-CBfuy92d.js';
+import './index-OZLnPypp.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/svelte-kit.d.ts

@@ -1,4 +1,4 @@
-import { a as Auth, B as BetterAuthOptions } from './index-CBfuy92d.js';
+import { a as Auth, B as BetterAuthOptions } from './index-OZLnPypp.js';
 import 'zod';
 import 'kysely';
 import './types-IzAbV4nB.js';

package/dist/svelte.d.ts

@@ -3,7 +3,7 @@ import * as nanostores from 'nanostores';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
-import './index-CBfuy92d.js';
+import './index-OZLnPypp.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { b as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, h as InferFieldsOutput } from './index-CBfuy92d.js';
-export { A as Adapter, k as AdditionalSessionFieldsInput, l as AdditionalSessionFieldsOutput, i as AdditionalUserFieldsInput, j as AdditionalUserFieldsOutput, g as AuthContext, B as BetterAuthOptions, G as GenericEndpointContext, H as HookEndpointContext, p as InferPluginTypes, n as InferSession, m as InferUser, P as PluginSchema, R as RateLimit, S as SecondaryStorage, W as Where, q as init } from './index-CBfuy92d.js';
+import { b as BetterAuthPlugin, a as Auth, I as InferFieldsInputClient, h as InferFieldsOutput } from './index-OZLnPypp.js';
+export { A as Adapter, k as AdditionalSessionFieldsInput, l as AdditionalSessionFieldsOutput, i as AdditionalUserFieldsInput, j as AdditionalUserFieldsOutput, g as AuthContext, B as BetterAuthOptions, G as GenericEndpointContext, H as HookEndpointContext, p as InferPluginTypes, n as InferSession, m as InferUser, P as PluginSchema, R as RateLimit, S as SecondaryStorage, W as Where, q as init } from './index-OZLnPypp.js';
 import { U as UnionToIntersection, H as HasRequiredKeys, P as Prettify, S as StripEmptyObjects, L as LiteralString } from './helper-DPDj8Nix.js';
 export { D as DeepPartial, a as LiteralUnion, R as RequiredKeysOf, W as WithoutEmpty } from './helper-DPDj8Nix.js';
 import { S as Session, U as User } from './types-IzAbV4nB.js';

package/dist/vue.d.ts

@@ -3,7 +3,7 @@ import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 import { Ref, DeepReadonly } from 'vue';
-import './index-CBfuy92d.js';
+import './index-OZLnPypp.js';
 import 'kysely';
 import './types-IzAbV4nB.js';
 import 'better-call';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.4.3-beta.1",
+  "version": "0.4.4-beta.1",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "main": "./dist/index.js",
@@ -81,6 +81,7 @@
     "c12": "^1.11.2",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
+    "consola": "^3.2.3",
     "defu": "^6.1.4",
     "kysely": "^0.27.4",
     "nanoid": "^5.0.7",