@convex-dev/better-auth 0.11.1 → 0.11.3

package/src/test/adapter-factory/basic.ts

@@ -68,7 +68,11 @@ export const getNormalTestSuiteTests = (
 			const transformed = transformGeneratedModel(user);
 			// console.log(`transformed:`, transformed);
 			// console.log(`result:`, result);
-			expect(result).toEqual(transformed);
+			expect(result).toEqual({
+				...transformed,
+				createdAt: new Date(user.createdAt).getTime(),
+				updatedAt: new Date(user.updatedAt).getTime(),
+			});
 		},
 		"create - should always return an id": async () => {
 			const { id: _, ...user } = await generate("user");
@@ -599,7 +603,7 @@ export const getNormalTestSuiteTests = (
 				where: [{ field: "createdAt", value: user.createdAt, operator: "eq" }],
 			});
 			expect(result).toEqual(user);
-			expect(result?.createdAt).toBeInstanceOf(Date);
+			expect(typeof result?.createdAt).toBe("number");
 			expect(result?.createdAt).toEqual(user.createdAt);
 		},
 		"findOne - should perform backwards joins": async () => {
@@ -753,7 +757,7 @@ export const getNormalTestSuiteTests = (
 				});
 				if (result?.session?.length) {
 					result.session = result.session.sort(
-						(a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
+						(a, b) => (a.createdAt as unknown as number) - (b.createdAt as unknown as number),
 					);
 				}
 
@@ -869,7 +873,7 @@ export const getNormalTestSuiteTests = (
 		"findMany - should find many models with date fields": async () => {
 			const users = (await insertRandom("user", 3)).map((x) => x[0]);
 			const youngestUser = users.sort(
-				(a, b) => b.createdAt.getTime() - a.createdAt.getTime(),
+				(a, b) => (b.createdAt as unknown as number) - (a.createdAt as unknown as number),
 			)[0]!;
 			const result = await adapter.findMany<User>({
 				model: "user",
@@ -1709,7 +1713,7 @@ export const getNormalTestSuiteTests = (
 		"findMany - should find many models with gt operator": async () => {
 			const users = (await insertRandom("user", 3)).map((x) => x[0]);
 			const oldestUser = users.sort(
-				(a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
+				(a, b) => (a.createdAt as unknown as number) - (b.createdAt as unknown as number),
 			)[0]!;
 			const result = await adapter.findMany<User>({
 				model: "user",
@@ -1730,7 +1734,7 @@ export const getNormalTestSuiteTests = (
 		"findMany - should find many models with gte operator": async () => {
 			const users = (await insertRandom("user", 3)).map((x) => x[0]);
 			const oldestUser = users.sort(
-				(a, b) => b.createdAt.getTime() - a.createdAt.getTime(),
+				(a, b) => (b.createdAt as unknown as number) - (a.createdAt as unknown as number),
 			)[0]!;
 			const result = await adapter.findMany<User>({
 				model: "user",

package/src/test/adapter-factory/convex-custom.ts

@@ -199,6 +199,63 @@ export const convexCustomTestSuite = createTestSuite(
       ).toEqual(user);
     },
 
+    "should use composite index for eq + sortBy on second field": async () => {
+      const sharedExpiresAt = Date.now() + 60_000;
+      await adapter.create({
+        model: "session",
+        data: {
+          token: `tok-z-${sharedExpiresAt}`,
+          expiresAt: sharedExpiresAt,
+          userId: "zzz-user",
+          createdAt: sharedExpiresAt,
+          updatedAt: sharedExpiresAt,
+        },
+      });
+      await adapter.create({
+        model: "session",
+        data: {
+          token: `tok-a-${sharedExpiresAt}`,
+          expiresAt: sharedExpiresAt,
+          userId: "aaa-user",
+          createdAt: sharedExpiresAt,
+          updatedAt: sharedExpiresAt,
+        },
+      });
+      await adapter.create({
+        model: "session",
+        data: {
+          token: `tok-m-${sharedExpiresAt}`,
+          expiresAt: sharedExpiresAt,
+          userId: "mmm-user",
+          createdAt: sharedExpiresAt,
+          updatedAt: sharedExpiresAt,
+        },
+      });
+      await adapter.create({
+        model: "session",
+        data: {
+          token: `tok-non-matching-${sharedExpiresAt}`,
+          expiresAt: sharedExpiresAt + 60_000,
+          userId: "bbb-user",
+          createdAt: sharedExpiresAt,
+          updatedAt: sharedExpiresAt,
+        },
+      });
+
+      const result = await adapter.findMany<{ userId: string }>({
+        model: "session",
+        where: [{ field: "expiresAt", value: sharedExpiresAt }],
+        sortBy: { field: "userId", direction: "asc" },
+        select: ["userId"],
+      });
+
+      expect(result.map((session) => session.userId)).toEqual([
+        "aaa-user",
+        "mmm-user",
+        "zzz-user",
+      ]);
+    },
+
     "should automatically paginate": async () => {
       for (let i = 0; i < 300; i++) {
         await adapter.create({
@@ -700,7 +757,7 @@ export const convexCustomTestSuite = createTestSuite(
           where: [{ field: "createdAt", value: now }],
         }),
       ).toEqual(user);
-      expect(user.createdAt).toBeInstanceOf(Date);
+      expect(typeof user.createdAt).toBe("number");
     },
   }),
 );

package/src/utils/index.ts

@@ -13,7 +13,7 @@ import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
 import * as jose from "jose";
 import type { Jwk } from "better-auth/plugins/jwt";
 
-type TrustedOriginsOption =
+export type TrustedOriginsOption =
   | (string | null | undefined)[]
   | ((
       request?: Request