Pass logger from req

apps/web/__tests__/ai-detect-recurring-pattern.test.ts

@@ -11,12 +11,6 @@ import { getEmailAccount } from "@/__tests__/helpers";
 const TIMEOUT = 15_000;
 
 vi.mock("server-only", () => ({}));
-vi.mock("@/utils/logger", () => ({
-  createScopedLogger: () => ({
-    trace: vi.fn(),
-    error: vi.fn(),
-  }),
-}));
 vi.mock("@/utils/braintrust", () => ({
   Braintrust: class {
     insertToDataset() {}

apps/web/__tests__/setup.ts

@@ -0,0 +1,13 @@
+import { vi } from "vitest";
+
+// Mock next/server's after() to just run synchronously in tests
+vi.mock("next/server", async () => {
+  const actual = await vi.importActual("next/server");
+  return {
+    ...actual,
+    after: async (fn: () => void | Promise<void>) => {
+      // In tests, just run the function synchronously
+      return await fn();
+    },
+  };
+});

apps/web/app/api/ai/models/route.ts

@@ -3,9 +3,6 @@ import OpenAI from "openai";
 import prisma from "@/utils/prisma";
 import { withEmailAccount } from "@/utils/middleware";
 import { Provider } from "@/utils/llms/config";
-import { createScopedLogger } from "@/utils/logger";
-
-const logger = createScopedLogger("api/ai/models");
 
 export type OpenAiModelsResponse = Awaited<ReturnType<typeof getOpenAiModels>>;
 
@@ -17,8 +14,8 @@ async function getOpenAiModels({ apiKey }: { apiKey: string }) {
   return models.data;
 }
 
-export const GET = withEmailAccount(async (request) => {
-  const emailAccountId = request.auth.emailAccountId;
+export const GET = withEmailAccount("api/ai/models", async (req) => {
+  const { emailAccountId } = req.auth;
 
   const emailAccount = await prisma.emailAccount.findUnique({
     where: { id: emailAccountId },
@@ -38,7 +35,7 @@ export const GET = withEmailAccount(async (request) => {
     });
     return NextResponse.json(result);
   } catch (error) {
-    logger.error("Failed to get OpenAI models", { error });
+    req.logger.error("Failed to get OpenAI models", { error });
     return NextResponse.json([]);
   }
 });

apps/web/app/api/sso/signin/route.test.ts

@@ -10,14 +10,6 @@ vi.mock("@/utils/auth", () => ({
   },
 }));
 
-// Mock the logger
-vi.mock("@/utils/logger", () => ({
-  createScopedLogger: vi.fn(() => ({
-    info: vi.fn(),
-    error: vi.fn(),
-  })),
-}));
-
 // Mock Prisma
 vi.mock("@/utils/prisma", () => ({
   default: {
@@ -30,12 +22,10 @@ vi.mock("@/utils/prisma", () => ({
 import { NextRequest } from "next/server";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { betterAuthConfig } from "@/utils/auth";
-import { createScopedLogger } from "@/utils/logger";
 import prisma from "@/utils/prisma";
 import { GET } from "./route";
 
 const mockBetterAuthConfig = vi.mocked(betterAuthConfig);
-const mockLogger = vi.mocked(createScopedLogger);
 
 describe("SSO Signin Route", () => {
   const mockContext = { params: Promise.resolve({}) };

apps/web/utils/auth.test.ts

@@ -19,13 +19,6 @@ vi.mock("@/utils/error", () => ({
   captureException: vi.fn(),
 }));
 
-vi.mock("@/utils/logger", () => ({
-  createScopedLogger: () => ({
-    info: vi.fn(),
-    error: vi.fn(),
-  }),
-}));
-
 // Import the real function from auth.ts for testing
 
 describe("handleReferralOnSignUp", () => {

apps/web/utils/cron.test.ts

@@ -7,10 +7,6 @@ vi.mock("@/env", () => ({
   env: { CRON_SECRET: "test-secret-123" },
 }));
 
-vi.mock("@/utils/logger", () => ({
-  createScopedLogger: () => ({ error: vi.fn() }),
-}));
-
 describe("hasCronSecret", () => {
   let request: Request;
 

apps/web/utils/encryption.test.ts

@@ -4,14 +4,6 @@ import { encryptToken, decryptToken } from "./encryption";
 // Mock server-only as it's required for tests
 vi.mock("server-only", () => ({}));
 
-// Mock the logger to prevent actual logging during tests
-vi.mock("@/utils/logger", () => ({
-  createScopedLogger: () => ({
-    error: vi.fn(),
-    log: vi.fn(),
-  }),
-}));
-
 // Mock environment variables
 vi.mock("@/env", () => ({
   env: {

apps/web/utils/logger.ts

@@ -73,6 +73,7 @@ export function createScopedLogger(scope: string) {
       },
       with: (newFields: Record<string, unknown>) =>
         createLogger({ ...fields, ...newFields }),
+      flush: () => Promise.resolve(), // No-op for console logger
     };
   };
 
@@ -103,6 +104,7 @@ function createAxiomLogger(scope: string) {
     },
     with: (newFields: Record<string, unknown>) =>
       createLogger({ ...fields, ...newFields }),
+    flush: () => log.flush(),
   });
 
   return createLogger();
@@ -115,6 +117,7 @@ function createNullLogger() {
     warn: () => {},
     trace: () => {},
     with: () => createNullLogger(),
+    flush: () => Promise.resolve(),
   };
 }