refactor: booking-list-state-management

.changeset/config.json

@@ -7,7 +7,7 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": ["@calcom/platform-libraries", "@calcom/api-v2"],
+  "ignore": ["@calcom/platform-libraries"],
   "privatePackages": {
     "version": false,
     "tag": false

.eslintrc.js

@@ -1,3 +1,4 @@
+// This configuration only applies to the package manager root.
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   extends: ["./packages/config/eslint-preset.js"],
@@ -6,105 +7,29 @@ module.exports = {
     "import/no-cycle": ["warn", { maxDepth: Infinity }],
   },
   overrides: [
-    // WARN: features must not be imported by app-store or lib
     {
-      files: ["packages/app-store/**/*.{ts,tsx,js,jsx}", "packages/lib/**/*.{ts,tsx,js,jsx}"],
+      files: ["packages/lib/**/*.{ts,tsx,js,jsx}", "packages/prisma/**/*.{ts,tsx,js,jsx}"],
       rules: {
         "no-restricted-imports": [
           "warn",
           {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch all alias imports
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "Avoid importing @calcom/features from @calcom/app-store or @calcom/lib.",
-              },
-            ],
+            paths: ["@calcom/app-store"],
+            patterns: ["@calcom/app-store/*"],
           },
         ],
       },
     },
-    // WARN: lib must not import app-store or features
-    {
-      files: ["packages/lib/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
-          "warn",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into app-store
-                  "**/app-store",
-                  "**/app-store/*",
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch alias imports
-                  "@calcom/app-store",
-                  "@calcom/app-store/*",
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "@calcom/lib should not import @calcom/app-store or @calcom/features.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-    // ERROR: app-store must not import trpc
     {
       files: ["packages/app-store/**/*.{ts,tsx,js,jsx}"],
       rules: {
-        "no-restricted-imports": [
-          "error",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into trpc
-                  "**/trpc",
-                  "**/trpc/*",
-                  // Catch alias imports
-                  "@calcom/trpc",
-                  "@calcom/trpc/*",
-                  "@trpc",
-                  "@trpc/*",
-                ],
-                message:
-                  "@calcom/app-store must not import trpc. Move UI to apps/web/components/apps or introduce an API boundary.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-
-    // ERROR: prisma must not import `features` package
-    {
-      files: ["packages/prisma/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
+        "@typescript-eslint/no-restricted-imports": [
           "error",
           {
             patterns: [
               {
-                group: [
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch all alias imports
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "Avoid importing @calcom/features from @calcom/prisma.",
+                group: ["@calcom/trpc/*", "@trpc/*"],
+                message: "tRPC imports are blocked in packages/app-store. Move UI to apps/web/components/apps or introduce an API boundary.",
+                allowTypeImports: false,
               },
             ],
           },

apps/api/v1/lib/helpers/captureErrors.ts

@@ -1,14 +1,20 @@
 import { captureException as SentryCaptureException } from "@sentry/nextjs";
 import type { NextMiddleware } from "next-api-middleware";
 
+import { redactError } from "@calcom/lib/redactError";
+
 export const captureErrors: NextMiddleware = async (_req, res, next) => {
   try {
     // Catch any errors that are thrown in remaining
     // middleware and the API route handler
     await next();
   } catch (error) {
-    console.error(error);
     SentryCaptureException(error);
-    res.status(500).json({ message: "Something went wrong" });
+    const redactedError = redactError(error);
+    if (redactedError instanceof Error) {
+      res.status(400).json({ message: redactedError.message, error: redactedError });
+      return;
+    }
+    res.status(400).json({ message: "Something went wrong", error });
   }
 };

apps/api/v1/lib/helpers/rateLimitApiKey.test.ts

@@ -30,7 +30,7 @@ describe("rateLimitApiKey middleware", () => {
       query: {},
       userId: testUserId,
     });
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(res._getStatusCode()).toBe(401);
@@ -43,15 +43,14 @@ describe("rateLimitApiKey middleware", () => {
       query: { apiKey: "test-key" },
       userId: testUserId,
     });
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
     (checkRateLimitAndThrowError as any).mockResolvedValueOnce({
       limit: 100,
       remaining: 99,
       reset: Date.now(),
     });
 
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(checkRateLimitAndThrowError).toHaveBeenCalledWith({
@@ -75,14 +74,15 @@ describe("rateLimitApiKey middleware", () => {
       success: true,
     };
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     (checkRateLimitAndThrowError as any).mockImplementationOnce(
       ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
         onRateLimiterResponse(rateLimiterResponse);
       }
     );
+
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(res.getHeader("X-RateLimit-Limit")).toBe(rateLimiterResponse.limit);
@@ -96,11 +96,10 @@ describe("rateLimitApiKey middleware", () => {
       query: { apiKey: "test-key" },
       userId: testUserId,
     });
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
     (checkRateLimitAndThrowError as any).mockRejectedValue(new Error("Rate limit exceeded"));
 
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(res._getStatusCode()).toBe(429);
@@ -122,7 +121,6 @@ describe("rateLimitApiKey middleware", () => {
     };
 
     // Mock rate limiter to trigger the onRateLimiterResponse callback
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (checkRateLimitAndThrowError as any).mockImplementationOnce(
       ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
         onRateLimiterResponse(rateLimiterResponse);
@@ -133,7 +131,6 @@ describe("rateLimitApiKey middleware", () => {
     vi.mocked(handleAutoLock).mockResolvedValueOnce(true);
 
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(handleAutoLock).toHaveBeenCalledWith({
@@ -161,7 +158,6 @@ describe("rateLimitApiKey middleware", () => {
     };
 
     // Mock rate limiter to trigger the onRateLimiterResponse callback
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (checkRateLimitAndThrowError as any).mockImplementationOnce(
       ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
         onRateLimiterResponse(rateLimiterResponse);
@@ -172,7 +168,6 @@ describe("rateLimitApiKey middleware", () => {
     vi.mocked(handleAutoLock).mockRejectedValueOnce(new Error("No user found for this API key."));
 
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(handleAutoLock).toHaveBeenCalledWith({
@@ -200,7 +195,6 @@ describe("rateLimitApiKey middleware", () => {
     };
 
     // Mock rate limiter to trigger the onRateLimiterResponse callback
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (checkRateLimitAndThrowError as any).mockImplementationOnce(
       ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
         onRateLimiterResponse(rateLimiterResponse);
@@ -241,7 +235,6 @@ describe("rateLimitApiKey middleware", () => {
     );
 
     // @ts-expect-error weird typing between middleware and createMocks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(res._getStatusCode()).toBe(429);