chore: release v5.0.10

feat: Domain-wide delegation for Google Calendar and Google Meet (#16622 )
* Add endpoints for testing the flow * Add MVP * new route * Fixes * Fixes * Remove enable toggle support from domainWideDelegation * Fixes * Revert "Remove enable toggle support from domainWideDelegation" This reverts commit c29e729206cd1fa063f9c9ce0cf148ef1577d60b. * Revert yarn.lock * More fixes * Fix new workspace platform add * refactor: improvements * refactor: bug fixes and improvements * fix: type errors * fix: conflicts * chore: update test * fix: logic * chore: improvements * fix: toglle * fix: bugs * fix: type err * chore: check number type * fix: after conflicts * chore: fix type err * fix: type errors and tests * fix: tets * test * chore: remove unused * fix: google meet url on booking page and secondary calendar * fix: add property * fix: type err * fix: re assingment bug * fix: use getAllCredentials * chore: fix import * fix: installed count * fix: pass event type * fix: import * fix: [Stacked PR] Review fixes (#17958) * Review fixes * fix: destination calendar bug --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix ts error * Fix getSchedule not using dwd credentials (#17995) * fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015) * Remove fn rename to reduce number of files changed * chore: check feature globally * test: add unit tests * chore: move function * test: add booking test * wip * Remove domain-wide-delegation team feature flag * Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict * Fix tests and their ts errors * Fix more tests * Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes * fix: Multiple calendar connections from Google not showing up in apps/installed * DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used * Disable deletetion of DWD as it is destructive and prefer disabling instead * Show DWD credential calendars at the top * Fixed tests * Calendar Cache DWD support * Self-Review: Verify email required and add more selectedCalendar tests * Self Review: shorten names * Self ReviewL Dead code removal * Revert "Calendar Cache DWD support" This reverts commit 009f236470fa21eba5986117d4f6e4d4c5e38c34. * Some misc fixes * fixes * Performance improvememt in slots loading and booking * More cases for handling dwd credentials * simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available * Fix tests * Fix installed/conferencing not showing gogole meet * Shorten name * Fix ApI v2 tests * Add some more tests * add getSchedule tests * Improve tests * Make Google Meet default when DWD for google is enabled * Enable feature flagging for DWD * chore: bump libraries * Encrypt serviceaccount private key * Fix ts errors * bump platform libraries * org add dwd * org add dwd * bump platform libraries * fix selected calendars * fix remove selected dwd calendar * remove oauthclient id aliad in authedCalendar * remove oauthclient id aliad in authedCalendar * refactor: OrganizationsDwdController * chore: export toggleDwdEnabled from platform-libraries * feat: v2 update (enable / disable) dwd * refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic * wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api * try fix set destination calendar api v2 * fixup! try fix set destination calendar api v2 * setting google meet as default location working for dwd * bump platform libraries version * allow office 365 workspace slug * allow office 365 workspace slug * chore: v2 create dwd MS and Google service keys input * fix: CreateDwdInput serviceAccountKey * fix: CredentialForCalendarService type * fix: check workspace slug * feat: update serviceAccessKey of DWD * testing * fixup! testing * fix: getAuthUtl bug * fix: unit tests * fix: type err and unit test * fix: e2e test * fix: credentials bug and failing unit tests * Update CalendarService.ts * chore: refactor office365 calendar service and add testDomainWideDelegationSetup * fix: office365Calendar use correct clientId/Secret for DWD * fix: office365Calendar dwd no need refresh token * test: add unit test for outlook dwd and setup * feat: added dwd support for office365 calendar * feat: added dwd support for office365 video * test: finish test for outlook dwd * fix: create dialog bug * chore: remove console logs * fix: refreshToken bug * bump version libraries * refactor: fetch dwd credentials only in findQualifiedHosts * fixup! refactor: fetch dwd credentials only in findQualifiedHosts * fix: type err * fix: type err * fix: getUserDisplayName * fix: unit test * chore: bump platform lib --------- Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
2025-03-02 20:07:08 +00:00 · 2025-03-02 16:52:57 -03:00 · 2025-03-02 18:45:22 +00:00 · 2025-03-02 12:02:37 +05:30 · 2025-03-01 12:06:30 -05:00 · 2025-03-01 15:53:20 +05:30
939 changed files with 24509 additions and 7546 deletions
@@ -412,3 +412,15 @@ DIRECTORY_IDS_TO_LOG=
 # Set this when Cal.com is used to serve only one organization's booking pages
 # Read more about it in the README.md
 NEXT_PUBLIC_SINGLE_ORG_SLUG=
+
+## Env variables related to avoiding booking failures
+# Request for checking reservation would be attempted to send every these seconds if the request is stale at that time
+NEXT_PUBLIC_QUERY_RESERVATION_INTERVAL_SECONDS=
+# Request for checking reservation of same slot would be sent only after this time has passed. It must be lower than PUBLIC_QUERY_RESERVATION_INTERVAL_SECONDS
+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
+# Used to enable quick availability checks for x% of all visitors
+NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
@@ -5,9 +5,19 @@
 - Fixes #XXXX (GitHub issue number)
 - Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

-<!-- Please provide a loom video for visual changes to speed up reviews
- Loom Video: https://www.loom.com/
-->
+## Visual Demo (For contributors especially)
+
+A visual demonstration is strongly recommended, for both the original and new change **(video / image - any one)**.
+
+#### Video Demo (if applicable):
+
+- Show screen recordings of the issue or feature.
+- Demonstrate how to reproduce the issue, the behavior before and after the change.
+
+#### Image Demo (if applicable):
+
+- Add side-by-side screenshots of the original and updated change.
+- Highlight any significant change(s).

 ## Mandatory Tasks (DO NOT REMOVE)

@@ -96,3 +96,4 @@ apps/auth
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+i18n.cache
@@ -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"
@@ -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";

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

 import { getUserAvailability } from "@calcom/core/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";
@@ -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";
@@ -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";

@@ -3,7 +3,7 @@ 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 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";

@@ -5,7 +5,7 @@ import {
  checkIfRoomNameMatchesInRecording,
 } 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 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 { 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 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 { getCalendarCredentialsWithoutDwd, getConnectedCalendars } from "@calcom/core/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 = getCalendarCredentialsWithoutDwd(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 { getCalendarCredentialsWithoutDwd, getConnectedCalendars } from "@calcom/core/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 = getCalendarCredentialsWithoutDwd(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";

@@ -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";
@@ -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";
@@ -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 { schemaSchedulePublic, schemaSingleScheduleBodyParams } from "~/lib/validations/schedule";
@@ -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";

@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import { 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 { schemaSchedulePublic } from "~/lib/validations/schedule";
@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";

 import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
 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 { schemaCreateScheduleBodyParams, schemaSchedulePublic } from "~/lib/validations/schedule";
@@ -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 { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";

 import { selectedCalendarIdSchema } from "~/lib/validations/selected-calendar";
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";

-import { defaultResponder } from "@calcom/lib/server";
+import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";

 import { schemaSelectedCalendarPublic, selectedCalendarIdSchema } from "~/lib/validations/selected-calendar";
@@ -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 type { UpdateArguments } from "@calcom/lib/server/repository/selectedCalendar";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import prisma from "@calcom/prisma";
@@ -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";

--- a/Show More
+++ b/Show More