better-auth 1.7.17 → 1.7.18

package/dist/db/internal-adapter.mjs

@@ -38,7 +38,7 @@ const createInternalAdapter = (adapter, ctx) => {
 	* or `deleteUserSessions` sweeping a user's accumulated preserved rows) would
 	* re-match it and re-fire the hooks, re-dispatching back-channel logout.
 	*/
-	const endPreservedSessions = (where) => {
+	const endPreservedSessions = (where, afterEnd) => {
 		const liveSessions = [...where, {
 			field: "expiresAt",
 			value: /* @__PURE__ */ new Date(),
@@ -51,6 +51,7 @@ const createInternalAdapter = (adapter, ctx) => {
 					where: liveSessions,
 					update: { expiresAt: /* @__PURE__ */ new Date() }
 				});
+				await afterEnd?.();
 			},
 			executeMainFn: false
 		});
@@ -91,7 +92,7 @@ const createInternalAdapter = (adapter, ctx) => {
 		const previousRevokedBefore = Number(await secondaryStorage.get(revokedBeforeKey(userId)));
 		await secondaryStorage.set(revokedBeforeKey(userId), String(Math.max(revokedAt, previousRevokedBefore || 0)), revokedBeforeTTL);
 		const deletedTokens = new Set(sessionReferences.map((session) => session.token));
-		for (const { token } of sessionReferences) await secondaryStorage.delete(token);
+		for (const token of deletedTokens) await secondaryStorage.delete(token);
 		const activeSessionsKey = `active-sessions-${userId}`;
 		const currentSessionReferences = await getActiveSessionReferences(userId);
 		const now = Date.now();
@@ -104,9 +105,10 @@ const createInternalAdapter = (adapter, ctx) => {
 		}
 		await secondaryStorage.delete(activeSessionsKey);
 	}
-	async function queueCachedUserSessionDeletion(userId, sessionReferences, revokedAt = Date.now()) {
+	async function queueCachedUserSessionDeletion(userId, sessionReferences) {
 		if (!secondaryStorage) return;
 		const references = sessionReferences ?? await getActiveSessionReferences(userId);
+		const revokedAt = Date.now();
 		await queueAfterTransactionHook(() => deleteCachedUserSessions(userId, references, revokedAt), { onError(error) {
 			logger.error("Failed to delete committed user sessions from secondary storage", error);
 		} });
@@ -531,25 +533,40 @@ const createInternalAdapter = (adapter, ctx) => {
 			}], "account", void 0);
 		},
 		deleteUserSessions: async (userId) => {
-			const revokedAt = Date.now();
 			const sessionReferences = await getActiveSessionReferences(userId);
-			if (secondaryStorage) {
-				if (!options.session?.storeSessionInDatabase) {
-					await queueCachedUserSessionDeletion(userId, sessionReferences, revokedAt);
-					return;
-				}
-				if (ctx.options.session?.preserveSessionInDatabase) {
-					if (await endPreservedSessions([{
-						field: "userId",
-						value: userId
-					}]) !== null) await queueCachedUserSessionDeletion(userId, sessionReferences, revokedAt);
-					return;
-				}
+			if (!secondaryStorage) {
+				await deleteManyWithHooks([{
+					field: "userId",
+					value: userId
+				}], "session", void 0);
+				return;
+			}
+			if (!options.session?.storeSessionInDatabase) {
+				await queueCachedUserSessionDeletion(userId, sessionReferences);
+				return;
+			}
+			const revokeCachedSessions = async () => queueCachedUserSessionDeletion(userId, [...sessionReferences, ...await getActiveSessionReferences(userId)]);
+			if (ctx.options.session?.preserveSessionInDatabase) {
+				await endPreservedSessions([{
+					field: "userId",
+					value: userId
+				}], revokeCachedSessions);
+				return;
 			}
-			if (await deleteManyWithHooks([{
+			await deleteManyWithHooks([{
 				field: "userId",
 				value: userId
-			}], "session", void 0) !== null) await queueCachedUserSessionDeletion(userId, sessionReferences, revokedAt);
+			}], "session", {
+				fn: async (where) => {
+					const deleted = await (await getCurrentAdapter(adapter)).deleteMany({
+						model: "session",
+						where
+					});
+					await revokeCachedSessions();
+					return deleted;
+				},
+				executeMainFn: false
+			});
 		},
 		deleteSessions: async (sessionTokens) => {
 			if (secondaryStorage) {

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.7.17";
+var version = "1.7.18";
 //#endregion
 export { version };

package/dist/test-utils/test-instance.mjs

@@ -32,6 +32,8 @@ const testPassword = {
 async function getTestInstance(options, config) {
 	const testWith = config?.testWith || "sqlite";
 	const postgresSchema = testWith === "postgres" ? `ba_test_${randomUUID().replaceAll("-", "_")}` : void 0;
+	const mysqlServerURL = "mysql://root:root_password@127.0.0.1:3306";
+	const mysqlDatabase = testWith === "mysql" ? `ba_test_${randomUUID().replaceAll("-", "_")}` : void 0;
 	const quotePostgresIdentifier = (identifier) => `"${identifier.replaceAll("\"", "\"\"")}"`;
 	async function getPostgres() {
 		const { Kysely, PostgresDialect } = await import("kysely");
@@ -49,8 +51,14 @@ async function getTestInstance(options, config) {
 	}
 	async function getMysql() {
 		const { Kysely, MysqlDialect } = await import("kysely");
-		const { createPool } = await import("mysql2/promise");
-		return new Kysely({ dialect: new MysqlDialect({ pool: createPool("mysql://user:password@localhost:3306/better_auth") }) });
+		const { createConnection, createPool } = await import("mysql2");
+		const admin = createConnection(mysqlServerURL).promise();
+		try {
+			await admin.query(`CREATE DATABASE \`${mysqlDatabase}\``);
+		} finally {
+			await admin.end();
+		}
+		return new Kysely({ dialect: new MysqlDialect({ pool: createPool(`${mysqlServerURL}/${mysqlDatabase}`) }) });
 	}
 	async function mongodbClient() {
 		const { MongoClient } = await import("mongodb");
@@ -64,6 +72,9 @@ async function getTestInstance(options, config) {
 		};
 		return await dbClient("mongodb://127.0.0.1:27017", "better-auth");
 	}
+	const postgres = testWith === "postgres" ? await getPostgres() : void 0;
+	const mysql = testWith === "mysql" ? await getMysql() : void 0;
+	const sqlite = testWith === "sqlite" ? await getSqlite() : void 0;
 	const opts = {
 		socialProviders: {
 			github: {
@@ -76,20 +87,45 @@ async function getTestInstance(options, config) {
 			}
 		},
 		secret: "better-auth-secret-that-is-long-enough-for-validation-test",
-		database: testWith === "postgres" ? {
-			db: await getPostgres(),
+		database: postgres ? {
+			db: postgres,
 			type: "postgres",
 			transaction: config?.transaction
-		} : testWith === "mongodb" ? await Promise.all([mongodbClient(), await import("../adapters/mongodb-adapter/index.mjs")]).then(([db, { mongodbAdapter }]) => mongodbAdapter(db)) : testWith === "mysql" ? {
-			db: await getMysql(),
+		} : testWith === "mongodb" ? await Promise.all([mongodbClient(), await import("../adapters/mongodb-adapter/index.mjs")]).then(([db, { mongodbAdapter }]) => mongodbAdapter(db)) : mysql ? {
+			db: mysql,
 			type: "mysql",
 			transaction: config?.transaction
-		} : await getSqlite(),
+		} : sqlite,
 		emailAndPassword: { enabled: true },
 		rateLimit: { enabled: false },
 		advanced: { cookies: {} },
 		logger: { level: "debug" }
 	};
+	const cleanup = async () => {
+		if (testWith === "mongodb") {
+			await (await mongodbClient()).dropDatabase();
+			return;
+		}
+		if (postgres) {
+			try {
+				if (postgresSchema) await sql.raw(`DROP SCHEMA IF EXISTS ${quotePostgresIdentifier(postgresSchema)} CASCADE`).execute(postgres);
+				else await sql`DROP SCHEMA public CASCADE; CREATE SCHEMA public;`.execute(postgres);
+			} finally {
+				await postgres.destroy();
+			}
+			return;
+		}
+		if (mysql) {
+			try {
+				await sql.raw(`DROP DATABASE IF EXISTS \`${mysqlDatabase}\``).execute(mysql);
+			} finally {
+				await mysql.destroy();
+			}
+			return;
+		}
+		if (sqlite) sqlite.close();
+	};
+	cleanupSet.add(cleanup);
 	const authOptions = {
 		baseURL: "http://localhost:" + (config?.port || 3e3),
 		...opts,
@@ -126,32 +162,6 @@ async function getTestInstance(options, config) {
 		});
 	}
 	await createTestUser();
-	const cleanup = async () => {
-		if (testWith === "mongodb") {
-			await (await mongodbClient()).dropDatabase();
-			return;
-		}
-		if (testWith === "postgres") {
-			const postgres = await getPostgres();
-			if (postgresSchema) await sql.raw(`DROP SCHEMA IF EXISTS ${quotePostgresIdentifier(postgresSchema)} CASCADE`).execute(postgres);
-			else await sql`DROP SCHEMA public CASCADE; CREATE SCHEMA public;`.execute(postgres);
-			await postgres.destroy();
-			return;
-		}
-		if (testWith === "mysql") {
-			const mysql = await getMysql();
-			await sql`SET FOREIGN_KEY_CHECKS = 0;`.execute(mysql);
-			const tables = await mysql.introspection.getTables();
-			for (const table of tables) await mysql.deleteFrom(table.name).execute();
-			await sql`SET FOREIGN_KEY_CHECKS = 1;`.execute(mysql);
-			return;
-		}
-		if (testWith === "sqlite") {
-			(await getSqlite()).close();
-			return;
-		}
-	};
-	cleanupSet.add(cleanup);
 	const customFetchImpl = async (url, init) => {
 		const headers = init?.headers || {};
 		const storageHeaders = currentUserContextStorage.getStore()?.headers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.7.17",
+  "version": "1.7.18",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -503,13 +503,13 @@
     "kysely": "^0.28.17 || ^0.29.0",
     "nanostores": "^1.3.0",
     "zod": "^4.5.4",
-    "@better-auth/core": "1.7.17",
-    "@better-auth/drizzle-adapter": "1.7.17",
-    "@better-auth/kysely-adapter": "1.7.17",
-    "@better-auth/memory-adapter": "1.7.17",
-    "@better-auth/mongo-adapter": "1.7.17",
-    "@better-auth/prisma-adapter": "1.7.17",
-    "@better-auth/telemetry": "1.7.17"
+    "@better-auth/core": "1.7.18",
+    "@better-auth/drizzle-adapter": "1.7.18",
+    "@better-auth/kysely-adapter": "1.7.18",
+    "@better-auth/memory-adapter": "1.7.18",
+    "@better-auth/mongo-adapter": "1.7.18",
+    "@better-auth/prisma-adapter": "1.7.18",
+    "@better-auth/telemetry": "1.7.18"
   },
   "devDependencies": {
     "@lynx-js/react": "^0.121.2",