feat: update session handling to use auth.api.getSession and configure Jest for better-auth modules.

Author: Rajat

apps/web/app/(with-contexts)/layout-with-context.tsx

@@ -22,6 +22,9 @@ import { Theme } from "@courselit/page-models";
 import { ThemeProvider as NextThemesProvider } from "@components/next-theme-provider";
 import { defaultState } from "@components/default-state";
 import { getUserProfile } from "./helpers";
+import { auth } from "@/auth";
+
+type BetterAuthSession = Awaited<ReturnType<typeof auth.api.getSession>> | null;
 
 function LayoutContent({
     address,
@@ -36,7 +39,7 @@ function LayoutContent({
     siteinfo: SiteInfo;
     theme: Theme;
     config: ServerConfig;
-    session: Session | null;
+    session: BetterAuthSession;
 }) {
     const [profile, setProfile] = useState(defaultState.profile);
     const [theme, setTheme] = useState(initialTheme);
@@ -103,7 +106,7 @@ export default function Layout(props: {
     siteinfo: SiteInfo;
     theme: Theme;
     config: ServerConfig;
-    session: Session | null;
+    session: BetterAuthSession;
 }) {
     return (
         <Suspense fallback={null}>

apps/web/app/api/payment/initiate/__tests__/integration.test.ts

@@ -29,11 +29,28 @@ jest.mock("@models/Community");
 jest.mock("@models/PaymentPlan");
 jest.mock("@models/Membership");
 jest.mock("@models/Invoice");
-jest.mock("@/auth");
+jest.mock("@/auth", () => ({
+    auth: {
+        api: {
+            getSession: jest.fn(),
+        },
+    },
+}));
 jest.mock("@/payments-new");
 jest.mock("../../helpers");
 jest.mock("@/graphql/users/logic");
 jest.mock("@/graphql/paymentplans/logic");
+jest.mock("better-auth", () => ({
+    betterAuth: jest.fn(),
+    APIError: class extends Error {},
+}));
+jest.mock("better-auth/plugins", () => ({
+    customSession: jest.fn(),
+    emailOTP: jest.fn(),
+}));
+jest.mock("better-auth/adapters", () => ({
+    createAdapterFactory: jest.fn(),
+}));
 
 describe("Payment Initiate Integration Tests - Included Products", () => {
     const mockDomainId = new mongoose.Types.ObjectId(
@@ -158,7 +175,7 @@ describe("Payment Initiate Integration Tests - Included Products", () => {
         } as unknown as NextRequest;
 
         // Mock auth
-        (auth as jest.Mock).mockResolvedValue({
+        (auth.api.getSession as unknown as jest.Mock).mockResolvedValue({
             user: {
                 email: "test@test.com",
             },

apps/web/app/api/payment/initiate/__tests__/route.test.ts

@@ -20,7 +20,13 @@ jest.mock("@models/Course");
 jest.mock("@models/PaymentPlan");
 jest.mock("@models/Invoice");
 jest.mock("@models/Community");
-jest.mock("@/auth");
+jest.mock("@/auth", () => ({
+    auth: {
+        api: {
+            getSession: jest.fn(),
+        },
+    },
+}));
 jest.mock("../../helpers");
 jest.mock("@/graphql/users/logic");
 jest.mock("@/payments-new");
@@ -68,7 +74,7 @@ describe("Payment Initiate Route", () => {
             },
         } as unknown as NextRequest;
 
-        (auth as jest.Mock).mockResolvedValue({
+        (auth.api.getSession as jest.Mock).mockResolvedValue({
             user: {
                 email: "test@test.com",
             },
@@ -119,7 +125,7 @@ describe("Payment Initiate Route", () => {
     });
 
     it("returns 401 if user is not authenticated", async () => {
-        (auth as jest.Mock).mockResolvedValue(null);
+        (auth.api.getSession as jest.Mock).mockResolvedValue(null);
 
         const response = await POST(mockRequest);
         expect(response.status).toBe(401);

apps/web/jest.server.config.ts

@@ -13,6 +13,7 @@ const config: Config = {
         slugify: "<rootDir>/__mocks__/slugify.ts",
         "@models/(.*)": "<rootDir>/models/$1",
         "@/auth": "<rootDir>/auth.ts",
+        "@/ba-multitenant-adapter": "<rootDir>/ba-multitenant-adapter.ts",
         "@/payments-new": "<rootDir>/payments-new",
         "@/graphql/(.*)": "<rootDir>/graphql/$1",
         "@/config/(.*)": "<rootDir>/config/$1",
@@ -26,11 +27,13 @@ const config: Config = {
         "\\.(css|less|scss|sass)$": "identity-obj-proxy",
     },
     transform: {
-        "^.+\\.(ts|tsx)$": [
+        "^.+\\.(ts|tsx|mjs)$": [
             "ts-jest",
             {
+                useESM: true,
                 tsconfig: {
                     jsx: "react-jsx",
+                    allowJs: true,
                 },
             },
         ],
@@ -40,11 +43,12 @@ const config: Config = {
         "**/api/**/__tests__/**/*.test.ts",
     ],
     testPathIgnorePatterns: [
-        "/node_modules/",
+        "/node_modules/(?!better-auth)/",
         "/.next/",
         // Exclude component tests - they should run in the regular config
         ".*/components/.*/__tests__/.*\\.test\\.(tsx|ts)$",
     ],
+    transformIgnorePatterns: ["node_modules/(?!better-auth)"],
     moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json"],
 };
 

apps/web/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.