better-auth 0.3.5-beta.8 → 0.3.6

package/dist/adapters/drizzle.d.ts

@@ -1,7 +1,7 @@
-import { A as Adapter } from '../index-Bkb3x6r0.js';
+import { A as Adapter } from '../index-Bh0h0nFa.js';
 import 'zod';
 import 'kysely';
-import '../index-QaO4zgiz.js';
+import '../types-Bs23H3QM.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';

package/dist/adapters/drizzle.js

@@ -1,5 +1,5 @@
 // src/adapters/drizzle-adapter/index.ts
-import { and, eq, or } from "drizzle-orm";
+import { and, asc, desc, eq, or } from "drizzle-orm";
 
 // src/db/get-tables.ts
 var getAuthTables = (options) => {
@@ -295,16 +295,14 @@ var drizzleAdapter = (db, options) => {
       else return null;
     },
     async findMany(data) {
-      const { model, where } = data;
+      const { model, where, limit, offset, sortBy } = data;
       const schemaModel = getSchema(model, {
         schema,
         usePlural: options.usePlural
       });
       const wheres = where ? whereConvertor(where, schemaModel) : [];
-      if (!wheres.length) {
-        return await db.select().from(schemaModel);
-      }
-      const res = await db.select().from(schemaModel).where(...wheres);
+      const fn = sortBy?.direction === "desc" ? desc : asc;
+      const res = await db.select().from(schemaModel).limit(limit || 100).offset(offset || 0).orderBy(fn(schemaModel[sortBy?.field || "id"])).where(...wheres.length ? wheres : []);
       return res;
     },
     async update(data) {

package/dist/adapters/mongodb.d.ts

@@ -1,8 +1,8 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-Bkb3x6r0.js';
+import { W as Where } from '../index-Bh0h0nFa.js';
 import 'zod';
 import 'kysely';
-import '../index-QaO4zgiz.js';
+import '../types-Bs23H3QM.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';
@@ -24,6 +24,12 @@ declare const mongodbAdapter: (mongo: Db) => {
     findMany<T>(data: {
         model: string;
         where?: Where[];
+        limit?: number;
+        sortBy?: {
+            field: string;
+            direction: "asc" | "desc";
+        };
+        offset?: number;
     }): Promise<any[]>;
     update<T>(data: {
         model: string;

package/dist/adapters/mongodb.js

@@ -72,9 +72,9 @@ var mongodbAdapter = (mongo) => {
       return removeMongoId(result);
     },
     async findMany(data) {
-      const { model, where } = data;
+      const { model, where, limit, offset, sortBy } = data;
       const wheres = whereConvertor(where);
-      const toReturn = await db.collection(model).find().filter(wheres).toArray();
+      const toReturn = await db.collection(model).find().filter(wheres).skip(offset || 0).limit(limit || 100).sort(sortBy?.field || "id", sortBy?.direction === "desc" ? -1 : 1).toArray();
       return toReturn.map(removeMongoId);
     },
     async update(data) {

package/dist/adapters/prisma.d.ts

@@ -1,7 +1,7 @@
-import { A as Adapter } from '../index-Bkb3x6r0.js';
+import { A as Adapter } from '../index-Bh0h0nFa.js';
 import 'zod';
 import 'kysely';
-import '../index-QaO4zgiz.js';
+import '../types-Bs23H3QM.js';
 import 'arctic';
 import '../helper-DPDj8Nix.js';
 import 'better-call';

package/dist/adapters/prisma.js

@@ -67,9 +67,16 @@ var prismaAdapter = (prisma, {
       });
     },
     async findMany(data) {
-      const { model, where } = data;
+      const { model, where, limit, offset, sortBy } = data;
       const whereClause = whereConvertor(where);
-      return await db[model].findMany({ where: whereClause });
+      return await db[model].findMany({
+        where: whereClause,
+        take: limit || 100,
+        skip: offset || 0,
+        orderBy: sortBy?.field ? {
+          [sortBy.field]: sortBy.direction === "desc" ? "desc" : "asc"
+        } : void 0
+      });
     },
     async update(data) {
       const { model, where, update } = data;

package/dist/api.d.ts

@@ -1,9 +1,9 @@
-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-Bkb3x6r0.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-Bh0h0nFa.js';
 import './helper-DPDj8Nix.js';
 import 'zod';
 export { APIError } from 'better-call';
 import 'kysely';
-import './index-QaO4zgiz.js';
+import './types-Bs23H3QM.js';
 import 'arctic';
 import 'better-sqlite3';
 import 'mysql2';

package/dist/api.js

@@ -934,15 +934,9 @@ var listSessions = () => createAuthEndpoint(
     requireHeaders: true
   },
   async (ctx) => {
-    const sessions = await ctx.context.adapter.findMany({
-      model: ctx.context.tables.session.tableName,
-      where: [
-        {
-          field: "userId",
-          value: ctx.context.session.user.id
-        }
-      ]
-    });
+    const sessions = await ctx.context.internalAdapter.listSessions(
+      ctx.context.session.user.id
+    );
     const activeSessions = sessions.filter((session) => {
       return session.expiresAt > /* @__PURE__ */ new Date();
     });
@@ -1166,7 +1160,9 @@ var signInEmail = createAuthEndpoint(
     );
     if (!session) {
       ctx.context.logger.error("Failed to create session");
-      throw new APIError3("INTERNAL_SERVER_ERROR");
+      throw new APIError3("UNAUTHORIZED", {
+        message: "Failed to create session"
+      });
     }
     await setSessionCookie(ctx, session.id, ctx.body.dontRememberMe);
     return ctx.json({
@@ -1369,6 +1365,26 @@ var callbackOAuth = createAuthEndpoint(
         `${c.context.baseURL}/error?error=oauth_provider_not_found`
       );
     }
+    const parsedState = parseState(c.query.state);
+    if (!parsedState.success) {
+      c.context.logger.error("Unable to parse state");
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
+      );
+    }
+    const {
+      data: { callbackURL, currentURL, dontRememberMe, code }
+    } = parsedState;
+    const storedCode = await c.getSignedCookie(
+      c.context.authCookies.state.name,
+      c.context.secret
+    );
+    if (storedCode !== code) {
+      logger.error("Oauth code mismatch", storedCode, code);
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
+      );
+    }
     const codeVerifier = await c.getSignedCookie(
       c.context.authCookies.pkCodeVerifier.name,
       c.context.secret
@@ -1383,7 +1399,7 @@ var callbackOAuth = createAuthEndpoint(
     } catch (e) {
       c.context.logger.error(e);
       throw c.redirect(
-        `${c.context.baseURL}/error?error=oauth_code_verification_failed`
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const user = await provider.getUserInfo(tokens).then((res) => res?.user);
@@ -1392,23 +1408,15 @@ var callbackOAuth = createAuthEndpoint(
       ...user,
       id
     });
-    const parsedState = parseState(c.query.state);
-    if (!parsedState.success) {
-      c.context.logger.error("Unable to parse state");
-      throw c.redirect(
-        `${c.context.baseURL}/error?error=invalid_state_parameter`
-      );
-    }
-    const { callbackURL, currentURL, dontRememberMe } = parsedState.data;
     if (!user || data.success === false) {
       logger.error("Unable to get user info", data.error);
       throw c.redirect(
-        `${c.context.baseURL}/error?error=oauth_validation_failed`
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     if (!callbackURL) {
       throw c.redirect(
-        `${c.context.baseURL}/error?error=oauth_callback_url_not_found`
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const dbUser = await c.context.internalAdapter.findUserByEmail(user.email).catch((e) => {
@@ -1495,7 +1503,7 @@ var callbackOAuth = createAuthEndpoint(
         throw c.redirect(url.toString());
       }
     } catch {
-      const url = new URL(currentURL || callbackURL);
+      const url = new URL(currentURL || callbackURL || "");
       url.searchParams.set("error", "unable_to_create_session");
       throw c.redirect(url.toString());
     }
@@ -1857,7 +1865,9 @@ var updateUser = createAuthEndpoint(
     const { name, image } = ctx.body;
     const session = ctx.context.session;
     if (!image && !name) {
-      return ctx.json(session.user);
+      return ctx.json({
+        user: session.user
+      });
     }
     const user = await ctx.context.internalAdapter.updateUserByEmail(
       session.user.email,
@@ -1866,7 +1876,9 @@ var updateUser = createAuthEndpoint(
         image
       }
     );
-    return ctx.json(user);
+    return ctx.json({
+      user
+    });
   }
 );
 var changePassword = createAuthEndpoint(
@@ -2221,8 +2233,9 @@ var signUpEmail = () => createAuthEndpoint(
     }
     const dbUser = await ctx.context.internalAdapter.findUserByEmail(email);
     if (dbUser?.user) {
-      throw new APIError9("BAD_REQUEST", {
-        message: "User already exists"
+      ctx.context.logger.info(`Sign-up attempt for existing email: ${email}`);
+      throw new APIError9("UNPROCESSABLE_ENTITY", {
+        message: "The email has already been taken"
       });
     }
     const additionalData = parseAdditionalUserInput(
@@ -2238,7 +2251,7 @@ var signUpEmail = () => createAuthEndpoint(
     });
     if (!createdUser) {
       throw new APIError9("BAD_REQUEST", {
-        message: "Couldn't create user"
+        message: "Failed to create user"
       });
     }
     const hash = await ctx.context.password.hash(password);
@@ -2255,7 +2268,7 @@ var signUpEmail = () => createAuthEndpoint(
     );
     if (!session) {
       throw new APIError9("BAD_REQUEST", {
-        message: "Couldn't create session"
+        message: "Failed to create session"
       });
     }
     await setSessionCookie(ctx, session.id);

package/dist/cli.js

@@ -880,7 +880,7 @@ var kyselyAdapter = (db, config) => {
       return res || null;
     },
     async findMany(data) {
-      const { model, where } = data;
+      const { model, where, limit, offset, sortBy } = data;
       let query = db.selectFrom(model);
       const { and, or } = convertWhere(where);
       if (and) {
@@ -889,6 +889,13 @@ var kyselyAdapter = (db, config) => {
       if (or) {
         query = query.where((eb) => eb.or(or));
       }
+      query = query.limit(limit || 100);
+      if (offset) {
+        query = query.offset(offset);
+      }
+      if (sortBy) {
+        query = query.orderBy(sortBy.field, sortBy.direction);
+      }
       const res = await query.selectAll().execute();
       if (config?.transform) {
         const schema = config.transform.schema[model];

package/dist/client/plugins.d.ts

@@ -2,13 +2,13 @@ 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, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-JGsMiE1o.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-JGsMiE1o.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-DI8FMfhr.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DI8FMfhr.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
-import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-Bkb3x6r0.js';
-import '../index-QaO4zgiz.js';
-import 'arctic';
+import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-Bh0h0nFa.js';
+import '../types-Bs23H3QM.js';
 import 'zod';
+import 'arctic';
 import 'better-call';
 import '@simplewebauthn/types';
 import 'kysely';
@@ -251,4 +251,9 @@ declare const inferAdditionalFields: <T, S extends {
     } : never : undefined;
 };
 
-export { anonymousClient, inferAdditionalFields, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };
+declare const adminClient: () => {
+    id: "better-auth-client";
+    $InferServerPlugin: ReturnType<typeof admin>;
+};
+
+export { adminClient, anonymousClient, inferAdditionalFields, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };

package/dist/client/plugins.js

@@ -300,7 +300,8 @@ var getPasskeyActions = ($fetch, {
           response: res
         },
         ...opts?.fetchOptions,
-        ...options
+        ...options,
+        method: "POST"
       });
       if (!verified.data) {
         return verified;
@@ -327,7 +328,8 @@ var getPasskeyActions = ($fetch, {
         body: {
           response: res,
           name: opts?.name
-        }
+        },
+        method: "POST"
       });
       if (!verified.data) {
         return verified;
@@ -512,7 +514,16 @@ var inferAdditionalFields = (schema) => {
     $InferServerPlugin: {}
   };
 };
+
+// src/plugins/admin/client.ts
+var adminClient = () => {
+  return {
+    id: "better-auth-client",
+    $InferServerPlugin: {}
+  };
+};
 export {
+  adminClient,
   anonymousClient,
   getPasskeyActions,
   inferAdditionalFields,

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-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-Bkb3x6r0.js';
+import './index-Bh0h0nFa.js';
 import 'kysely';
-import './index-QaO4zgiz.js';
+import './types-Bs23H3QM.js';
 import 'arctic';
 import 'better-call';
 import 'better-sqlite3';