From eb642c72cac8b4dca08a29cb89e494692fcdcb6e Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Sun, 13 Apr 2025 20:01:18 +0300
Subject: [PATCH] chore: cleanup

---
 packages/better-auth/package.json                      |  2 +-
 .../adapters/mongodb-adapter/adapter.mongo-db.test.ts  |  6 +-----
 packages/better-auth/src/auth.ts                       |  7 ++-----
 .../src/plugins/multi-session/multi-session.test.ts    |  4 +---
 packages/better-auth/src/plugins/username/index.ts     |  2 +-
 .../better-auth/src/plugins/username/username.test.ts  | 10 ++++++++++
 .../better-auth/src/social-providers/social.test.ts    |  3 ++-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/better-auth/package.json b/packages/better-auth/package.json
index 84da823ab9..7fe9f0d2eb 100644
--- a/packages/better-auth/package.json
+++ b/packages/better-auth/package.json
@@ -19,7 +19,7 @@
     "prisma:normal:push": "prisma db push --schema src/adapters/prisma-adapter/test/normal-tests/schema.prisma",
     "prisma:number-id:push": "prisma db push --schema src/adapters/prisma-adapter/test/number-id-tests/schema.prisma",
     "bump": "bumpp",
-    "typecheck": "tsc --noEmit --project tsconfig.declarations.json"
+    "typecheck": "tsc --noEmit"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
diff --git a/packages/better-auth/src/adapters/mongodb-adapter/adapter.mongo-db.test.ts b/packages/better-auth/src/adapters/mongodb-adapter/adapter.mongo-db.test.ts
index 33f7db3061..904a24d208 100644
--- a/packages/better-auth/src/adapters/mongodb-adapter/adapter.mongo-db.test.ts
+++ b/packages/better-auth/src/adapters/mongodb-adapter/adapter.mongo-db.test.ts
@@ -23,11 +23,7 @@ describe("adapter test", async () => {
 		await clearDb();
 	});
 
-	const adapter = mongodbAdapter(db, {
-		debugLogs: {
-			isRunningAdapterTests: true,
-		},
-	});
+	const adapter = mongodbAdapter(db);
 	await runAdapterTest({
 		getAdapter: async (customOptions = {}) => {
 			return adapter({
diff --git a/packages/better-auth/src/auth.ts b/packages/better-auth/src/auth.ts
index 5202134ba5..df3d47d2a2 100644
--- a/packages/better-auth/src/auth.ts
+++ b/packages/better-auth/src/auth.ts
@@ -16,11 +16,8 @@ import { BetterAuthError } from "./error";
 
 export type WithJsDoc<T, D> = Expand<T & D>;
 
-export const betterAuth = <
-	O extends BetterAuthOptions &
-		Record<Exclude<keyof O, keyof BetterAuthOptions>, never>,
->(
-	options: O,
+export const betterAuth = <O extends BetterAuthOptions>(
+	options: O & Record<never, never>,
 ) => {
 	const authContext = init(options as O);
 	const { api } = getEndpoints(authContext, options as O);
diff --git a/packages/better-auth/src/plugins/multi-session/multi-session.test.ts b/packages/better-auth/src/plugins/multi-session/multi-session.test.ts
index 01671472fc..ca65af3e18 100644
--- a/packages/better-auth/src/plugins/multi-session/multi-session.test.ts
+++ b/packages/better-auth/src/plugins/multi-session/multi-session.test.ts
@@ -108,9 +108,6 @@ describe("multi-session", async () => {
 		});
 		await client.multiSession.revoke(
 			{
-				fetchOptions: {
-					headers,
-				},
 				sessionToken: token,
 			},
 			{
@@ -119,6 +116,7 @@ describe("multi-session", async () => {
 						`better-auth.session_token=`,
 					);
 				},
+				headers,
 			},
 		);
 		const res = await client.multiSession.listDeviceSessions({
diff --git a/packages/better-auth/src/plugins/username/index.ts b/packages/better-auth/src/plugins/username/index.ts
index d4f5df7a52..aa884fa8fd 100644
--- a/packages/better-auth/src/plugins/username/index.ts
+++ b/packages/better-auth/src/plugins/username/index.ts
@@ -235,7 +235,7 @@ export const username = (options?: UsernameOptions) => {
 					},
 					handler: createAuthMiddleware(async (ctx) => {
 						const username = ctx.body.username;
-						if (username) {
+						if (username !== undefined && typeof username === "string") {
 							const minUsernameLength = options?.minUsernameLength || 3;
 							const maxUsernameLength = options?.maxUsernameLength || 30;
 							if (username.length < minUsernameLength) {
diff --git a/packages/better-auth/src/plugins/username/username.test.ts b/packages/better-auth/src/plugins/username/username.test.ts
index 99e9e16c61..6fc9684663 100644
--- a/packages/better-auth/src/plugins/username/username.test.ts
+++ b/packages/better-auth/src/plugins/username/username.test.ts
@@ -101,4 +101,14 @@ describe("username", async (it) => {
 		expect(res.error?.status).toBe(422);
 		expect(res.error?.code).toBe("USERNAME_IS_TOO_SHORT");
 	});
+
+	it("should fail on empty username", async () => {
+		const res = await client.signUp.email({
+			email: "email-4@email.com",
+			username: "",
+			password: "new_password",
+			name: "new-name",
+		});
+		expect(res.error?.status).toBe(422);
+	});
 });
diff --git a/packages/better-auth/src/social-providers/social.test.ts b/packages/better-auth/src/social-providers/social.test.ts
index b150e0794e..25e4cbfc05 100644
--- a/packages/better-auth/src/social-providers/social.test.ts
+++ b/packages/better-auth/src/social-providers/social.test.ts
@@ -350,7 +350,8 @@ describe("Social Providers", async (c) => {
 				},
 			});
 
-			const authUrl = signInRes.data.url;
+			const authUrl = signInRes.data?.url;
+			if (!authUrl) throw new Error("No auth url found");
 			const mockEndpoint = authUrl.replace(
 				"https://accounts.google.com/o/oauth2/auth",
 				"http://localhost:8080/authorize",