chore: release v5.0.13

fix: api v2 create event-type with delegation credentials (#19797 )
refactor: Salesforce - account query based on website (#19799 )
2025-03-07 00:38:07 +00:00 · 2025-03-06 19:46:46 +02:00 · 2025-03-06 21:53:49 +05:30 · 2025-03-06 14:51:39 +00:00 · 2025-03-06 19:32:30 +05:30 · 2025-03-06 19:16:41 +05:30
1267 changed files with 15448 additions and 17821 deletions
@@ -421,4 +421,6 @@ NEXT_PUBLIC_QUERY_RESERVATION_STALE_TIME_SECONDS=
 # Query available slots interval - Should be kept high in minutes as it could cause significant load on the system
 NEXT_PUBLIC_QUERY_AVAILABLE_SLOTS_INTERVAL_SECONDS=
 # Used to invalidate available slots when navigating to booking form
-NEXT_PUBLIC_INVALIDATE_AVAILABLE_SLOTS_ON_BOOKING_FORM=0
+NEXT_PUBLIC_INVALIDATE_AVAILABLE_SLOTS_ON_BOOKING_FORM=0
+# Used to enable quick availability checks for x% of all visitors
+NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
@@ -1,4 +1,4 @@
-/apps/api/**/* @calcom/Platform
+/apps/api/**/* @calcom/Platform @calcom/Foundation
 /deploy/**/* @calcom/Foundation
 /infra/**/* @calcom/Foundation
 /packages/app-store/applecalendar/**/* @calcom/Foundation
@@ -12,12 +12,11 @@
 /packages/app-store/larkcalendar/**/* @calcom/Foundation
 /packages/app-store/office365calendar/**/* @calcom/Foundation
 /packages/app-store/zohocalendar/**/* @calcom/Foundation
-/packages/core/getAggregatedAvailability/index.ts @calcom/Foundation
-/packages/core/getAggregateWorkingHours.ts @calcom/Foundation
-/packages/core/getUserAvailability.ts @calcom/Foundation
 /packages/features/bookings/lib/**/* @calcom/Foundation
+/packages/lib/getAggregatedAvailability.ts @calcom/Foundation
+/packages/lib/getUserAvailability.ts @calcom/Foundation
 /packages/lib/server/getLuckyUser.ts @calcom/Foundation
 /packages/lib/slots.ts @calcom/Foundation
-/packages/platform/**/* @calcom/Platform
+/packages/platform/**/* @calcom/Platform @calcom/Foundation
 /packages/prisma/**/* @calcom/Foundation
 /packages/trpc/server/routers/viewer/slots/**/* @calcom/Foundation
@@ -14,7 +14,7 @@ description: "Run yarn install with node_modules linker and cache enabled"
 inputs:
  node_version:
    required: false
-    default: v18.x
+    default: v20.x

 runs:
  using: "composite"
@@ -1 +1 @@
-v18
+20
@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"
@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"
@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"
@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"
@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"
@@ -0,0 +1,9 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/api-v2"
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"
@@ -113,7 +113,7 @@ We use it in several ways, but mainly, we first import the auto-generated schema

 We have some shared validations which several resources require, like baseApiParams which parses apiKey in all requests, or querIdAsString or TransformParseInt which deal with the id's coming from req.query.

- **[*]BaseBodyParams** that omits any values from the model that are too sensitive or we don't want to pick when creating a new resource like id, userId, etc.. (those are gotten from context or elswhere)
+- **[*]BaseBodyParams** that omits any values from the model that are too sensitive or we don't want to pick when creating a new resource like id, userId, etc.. (those are gotten from context or elsewhere)

 - **[*]Public** that also omits any values that we don't want to expose when returning the model as a response, which we parse against before returning all resources.

@@ -208,7 +208,7 @@ Add this command: `./scripts/vercel-deploy.sh`

 See `scripts/vercel-deploy.sh` for more info on how the deployment is done.

-> _❗ IMORTANT: If you're forking the API repo you will need to update the URLs in both the main repo [`.gitmodules`](https://github.com/calcom/cal.com/blob/main/.gitmodules#L7) and this repo [`./scripts/vercel-deploy.sh`](https://github.com/calcom/api/blob/main/scripts/vercel-deploy.sh#L3) ❗_
+> _❗ IMPORTANT: If you're forking the API repo you will need to update the URLs in both the main repo [`.gitmodules`](https://github.com/calcom/cal.com/blob/main/.gitmodules#L7) and this repo [`./scripts/vercel-deploy.sh`](https://github.com/calcom/api/blob/main/scripts/vercel-deploy.sh#L3) ❗_

 ## Environment variables

@@ -22,6 +22,7 @@ const recurringEventInputSchema = z.object({
 const hostSchema = _HostModel.pick({
  isFixed: true,
  userId: true,
+  scheduleId: true,
 });

 export const childrenSchema = z.object({
@@ -113,7 +113,7 @@ const schemaUserEditParams = z.object({
 });

 // @note: These are the values that are editable via PATCH method on the user Model,
-// merging both BaseBodyParams with RequiredParams, and omiting whatever we want at the end.
+// merging both BaseBodyParams with RequiredParams, and omitting whatever we want at the end.

 const schemaUserCreateParams = z.object({
  email: emailSchema.toLowerCase(),
@@ -137,7 +137,7 @@ const schemaUserCreateParams = z.object({
 });

 // @note: These are the values that are editable via PATCH method on the user Model,
-// merging both BaseBodyParams with RequiredParams, and omiting whatever we want at the end.
+// merging both BaseBodyParams with RequiredParams, and omitting whatever we want at the end.
 export const schemaUserEditBodyParams = schemaUserBaseBodyParams
  .merge(schemaUserEditParams)
  .omit({})
@@ -10,7 +10,6 @@ const nextConfig = {
  },
  transpilePackages: [
    "@calcom/app-store",
-    "@calcom/core",
    "@calcom/dayjs",
    "@calcom/emails",
    "@calcom/features",
@@ -47,7 +46,7 @@ const nextConfig = {
  async rewrites() {
    return {
      afterFiles: [
-        // This redirects requests recieved at / the root to the /api/ folder.
+        // This redirects requests received at / the root to the /api/ folder.
        {
          source: "/v:version/:rest*",
          destination: "/api/v:version/:rest*",
@@ -24,7 +24,6 @@
  },
  "dependencies": {
    "@calcom/app-store": "*",
-    "@calcom/core": "*",
    "@calcom/dayjs": "*",
    "@calcom/emails": "*",
    "@calcom/features": "*",
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdAsString } from "~/lib/validations/shared/queryIdString";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { apiKeyPublicSchema } from "~/lib/validations/api-key";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { apiKeyEditBodySchema, apiKeyPublicSchema } from "~/lib/validations/api-key";
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import type { Ensure } from "@calcom/types/utils";

@@ -4,7 +4,7 @@ import { v4 } from "uuid";

 import { generateUniqueAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { apiKeyCreateBodySchema, apiKeyPublicSchema } from "~/lib/validations/api-key";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaAttendeeReadPublic } from "~/lib/validations/attendee";
@@ -2,7 +2,7 @@ import type { NextApiRequest } from "next";
 import type { z } from "zod";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaAttendeeEditBodyParams, schemaAttendeeReadPublic } from "~/lib/validations/attendee";
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaAttendeeReadPublic } from "~/lib/validations/attendee";
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaAttendeeCreateBodyParams, schemaAttendeeReadPublic } from "~/lib/validations/attendee";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaAvailabilityReadPublic } from "~/lib/validations/availability";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,9 +1,9 @@
 import type { NextApiRequest } from "next";
 import { z } from "zod";

-import { getUserAvailability } from "@calcom/core/getUserAvailability";
+import { getUserAvailability } from "@calcom/lib/getUserAvailability";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { availabilityUserSelect } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaBookingReferenceReadPublic } from "~/lib/validations/booking-reference";
@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaBookingReferenceReadPublic } from "~/lib/validations/booking-reference";
@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { bookingCancelSchema } from "~/lib/validations/booking";
 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -38,6 +38,12 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
 *        schema:
 *          type: string
 *        description: The reason for cancellation of the booking
+ *      - in: query
+ *        name: cancelledBy
+ *        required: false
+ *        schema:
+ *          type: string
+ *        description: The email of who cancelled the booking
 *     tags:
 *       - bookings
 *     responses:
@@ -64,15 +70,17 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
 *        description: User not found
 */
 async function handler(req: NextApiRequest) {
-  const { id, allRemainingBookings, cancellationReason } = schemaQueryIdParseInt
-    .merge(bookingCancelSchema.pick({ allRemainingBookings: true, cancellationReason: true }))
+  const { id, allRemainingBookings, cancellationReason, cancelledBy } = schemaQueryIdParseInt
+    .merge(
+      bookingCancelSchema.pick({ allRemainingBookings: true, cancellationReason: true, cancelledBy: true })
+    )
    .parse({
      ...req.query,
      allRemainingBookings: req.query.allRemainingBookings === "true",
    });

  // Normalizing for universal handler
-  req.body = { id, allRemainingBookings, cancellationReason };
+  req.body = { id, allRemainingBookings, cancellationReason, cancelledBy };
  return await handleCancelBooking(req);
 }

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaBookingReadPublic } from "~/lib/validations/booking";
@@ -2,7 +2,7 @@ import type { NextApiRequest } from "next";
 import type { z } from "zod";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
@@ -112,7 +112,7 @@ export async function patchHandler(req: NextApiRequest) {
 async function checkPermissions(req: NextApiRequest, body: z.infer<typeof schemaBookingEditBodyParams>) {
  const { userId, isSystemWideAdmin, isOrganizationOwnerOrAdmin } = req;
  if (body.userId && !isSystemWideAdmin && !isOrganizationOwnerOrAdmin) {
-    // Organizer has to be a cal user and we can't allow a booking to be transfered to some other cal user's name
+    // Organizer has to be a cal user and we can't allow a booking to be transferred to some other cal user's name
    throw new HttpError({
      statusCode: 403,
      message: "Only admin can change the organizer of a booking",
@@ -1,6 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,9 +1,11 @@
 import type { NextApiRequest } from "next";

-import { getRecordingsOfCalVideoByRoomName } from "@calcom/core/videoClient";
-import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/core/videoClient";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
+import {
+  getRecordingsOfCalVideoByRoomName,
+  getDownloadLinkOfCalVideoByRecordingId,
+} from "@calcom/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { RecordingItemSchema } from "@calcom/prisma/zod-utils";
 import type { PartialReference } from "@calcom/types/EventManager";
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,11 +1,11 @@
 import type { NextApiRequest } from "next";

+import { HttpError } from "@calcom/lib/http-error";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import {
  getTranscriptsAccessLinkFromRecordingId,
  checkIfRoomNameMatchesInRecording,
-} from "@calcom/core/videoClient";
-import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+} from "@calcom/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { PartialReference } from "@calcom/types/EventManager";

@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,8 +1,8 @@
 import type { NextApiRequest } from "next";

-import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/core/videoClient";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
+import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { PartialReference } from "@calcom/types/EventManager";

@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";
@@ -4,7 +4,7 @@ import getBookingDataSchemaForApi from "@calcom/features/bookings/lib/getBooking
 import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { CreationSource } from "@calcom/prisma/enums";

 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import type { UserWithCalendars } from "@calcom/lib/getConnectedDestinationCalendars";
 import { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/lib/getConnectedDestinationCalendars";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma from "@calcom/prisma";

@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaCredentialDeleteParams } from "~/lib/validations/credential-sync";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaCredentialGetParams } from "~/lib/validations/credential-sync";
@@ -2,7 +2,7 @@ import type { NextApiRequest } from "next";

 import { OAuth2UniversalSchema } from "@calcom/app-store/_utils/oauth/universalSchema";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaCredentialPatchParams, schemaCredentialPatchBody } from "~/lib/validations/credential-sync";
@@ -5,7 +5,7 @@ import { OAuth2UniversalSchema } from "@calcom/app-store/_utils/oauth/universalS
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";

@@ -108,7 +108,7 @@ async function handler(req: NextApiRequest) {
  // ^ Workaround for the select in `create` not working

  if (createCalendarResources) {
-    const calendar = await getCalendar(credential);
+    const calendar = await getCalendar({ ...credential, delegatedTo: null });
    if (!calendar) throw new HttpError({ message: "Calendar missing for credential", statusCode: 500 });
    const calendars = await calendar.listCalendars();
    const calendarToCreate = calendars.find((calendar) => calendar.primary) || calendars[0];
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaEventTypeCustomInputPublic } from "~/lib/validations/event-type-custom-input";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaEventTypeCustomInputPublic } from "~/lib/validations/event-type-custom-input";
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaDestinationCalendarReadPublic } from "~/lib/validations/destination-calendar";
@@ -2,9 +2,9 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";
 import type { z } from "zod";

-import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
+import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import type { PrismaClient } from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
@@ -185,7 +185,7 @@ async function verifyCredentialsAndGetId({
  currentCredentialId: number | null;
 }) {
  if (parsedBody.integration && parsedBody.externalId) {
-    const calendarCredentials = getCalendarCredentials(userCredentials);
+    const calendarCredentials = getCalendarCredentialsWithoutDelegation(userCredentials);

    const { connectedCalendars } = await getConnectedCalendars(
      calendarCredentials,
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { extractUserIdsFromQuery } from "~/lib/utils/extractUserIdsFromQuery";
@@ -1,8 +1,8 @@
 import type { NextApiRequest } from "next";

-import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
+import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";

@@ -82,7 +82,7 @@ async function postHandler(req: NextApiRequest) {
      message: "Bad request, credential id invalid",
    });

-  const calendarCredentials = getCalendarCredentials(userCredentials);
+  const calendarCredentials = getCalendarCredentialsWithoutDelegation(userCredentials);

  const { connectedCalendars } = await getConnectedCalendars(calendarCredentials, [], parsedBody.externalId);

@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";

@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import type { z } from "zod";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { SchedulingType } from "@calcom/prisma/enums";

@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import type { PrismaClient } from "@calcom/prisma";

@@ -124,7 +124,7 @@ async function defaultScheduleId<T extends DefaultScheduleIdEventTypeBase>({
  }, {} as { [x: number]: number | null });

  return eventTypes.map((eventType) => {
-    // realistically never happens, userId should't be null on personal event types.
+    // realistically never happens, userId shouldn't be null on personal event types.
    if (!eventType.userId) return eventType;
    return {
      ...eventType,
@@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/client";

@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
 import { CreationSource } from "@calcom/prisma/enums";
 import { createContext } from "@calcom/trpc/server/createContext";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaUserReadPublic } from "~/lib/validations/user";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { membershipIdSchema } from "~/lib/validations/membership";
@@ -28,7 +28,7 @@ import { membershipIdSchema } from "~/lib/validations/membership";
 *     - memberships
 *     responses:
 *       201:
- *         description: OK, membership removed successfuly
+ *         description: OK, membership removed successfully
 *       400:
 *        description: Bad request. Membership id is invalid.
 *       401:
@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { membershipIdSchema, schemaMembershipPublic } from "~/lib/validations/membership";
@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import {
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaMembershipPublic } from "~/lib/validations/membership";
@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";

 import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { membershipCreateBodySchema, schemaMembershipPublic } from "~/lib/validations/membership";
@@ -1,4 +1,4 @@
-import { defaultHandler } from "@calcom/lib/server";
+import { defaultHandler } from "@calcom/lib/server/defaultHandler";

 import { withMiddleware } from "~/lib/helpers/withMiddleware";

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

 import { schemaSchedulePublic } from "~/lib/validations/schedule";
--- a/Show More
+++ b/Show More