Merge branch 'main' into feat/team-hidden

Author: naaa760

.github/workflows/e2e-atoms.yml

@@ -13,6 +13,8 @@ env:
   ATOMS_E2E_API_URL: ${{ secrets.ATOMS_E2E_API_URL }}
   ATOMS_E2E_ORG_ID: ${{ secrets.ATOMS_E2E_ORG_ID }}
   ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED }}
+  ATOMS_E2E_APPLE_ID: ${{ secrets.ATOMS_E2E_APPLE_ID }}
+  ATOMS_E2E_APPLE_CONNECT_APP_SPECIFIC_PASSCODE: ${{ secrets.ATOMS_E2E_APPLE_CONNECT_APP_SPECIFIC_PASSCODE }}
   DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
   DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
 

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,14 +43,15 @@ 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({
@@ -74,15 +75,14 @@ describe("rateLimitApiKey middleware", () => {
       success: true,
     };
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (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,10 +96,11 @@ 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);
@@ -121,6 +122,7 @@ 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);
@@ -131,6 +133,7 @@ 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({
@@ -158,6 +161,7 @@ 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);
@@ -168,6 +172,7 @@ 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({
@@ -195,6 +200,7 @@ 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);
@@ -235,6 +241,7 @@ 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);

apps/api/v1/pages/api/bookings/[id]/_get.ts

@@ -102,8 +102,11 @@ export async function getHandler(req: NextApiRequest) {
   const booking = await prisma.booking.findUnique({
     where: { id },
     include: {
+      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       attendees: true,
+      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       user: true,
+      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       payment: true,
       eventType: expand.includes("team") ? { include: { team: true } } : false,
     },

apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts

@@ -63,6 +63,7 @@ export async function getHandler(req: NextApiRequest) {
 
   const booking = await prisma.booking.findUnique({
     where: { id },
+    // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
     include: { references: true },
   });
 

apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts

@@ -61,6 +61,7 @@ export async function getHandler(req: NextApiRequest) {
 const checkIfRecordingBelongsToBooking = async (bookingId: number, recordingId: string) => {
   const booking = await prisma.booking.findUnique({
     where: { id: bookingId },
+    // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
     include: { references: true },
   });
 

apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts

@@ -44,6 +44,7 @@ export async function getHandler(req: NextApiRequest) {
 
   const booking = await prisma.booking.findUnique({
     where: { id },
+    // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
     include: { references: true },
   });
 

apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts

@@ -1,7 +1,10 @@
 import type { NextApiRequest } from "next";
 import type { z } from "zod";
 
-import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
+import {
+  getCalendarCredentialsWithoutDelegation,
+  getConnectedCalendars,
+} from "@calcom/features/calendars/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

apps/api/v1/pages/api/destination-calendars/_post.ts

@@ -1,6 +1,9 @@
 import type { NextApiRequest } from "next";
 
-import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
+import {
+  getCalendarCredentialsWithoutDelegation,
+  getConnectedCalendars,
+} from "@calcom/features/calendars/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

apps/api/v1/pages/api/event-types/_get.ts

@@ -55,6 +55,7 @@ async function getHandler(req: NextApiRequest) {
       slug: slug, // slug will be undefined if not provided in query
     },
     include: {
+      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       customInputs: true,
       hashedLink: { select: { link: true } },
       team: { select: { slug: true } },

apps/api/v1/pages/api/payments/[id].ts

@@ -46,6 +46,7 @@ export async function paymentById(
   if (safeQuery.success && method === "GET") {
     const userWithBookings = await prisma.user.findUnique({
       where: { id: userId },
+      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       include: { bookings: true },
     });
     await prisma.payment