chore: release v5.1.21

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: lauris@cal.com <lauris@cal.com>

.env.example

@@ -17,6 +17,7 @@
 #
 
 # To enable enterprise-only features please add your environment variable to the .env file then make your way to /auth/setup to select your license and follow instructions.
+
 CALCOM_LICENSE_KEY=
 # Signature token for the Cal.com License API (used for self-hosted integrations)
 # We will give you a token when we provide you with a license key this ensure you and only you can communicate with the Cal.com License API for your license key
@@ -116,6 +117,11 @@ NEXT_PUBLIC_PLAIN_CHAT_ID=
 PLAIN_CHAT_HMAC_SECRET_KEY=
 NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS=
 
+
+# Dub Config
+DUB_API_KEY=
+NEXT_PUBLIC_DUB_PROGRAM_ID=
+
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
 
@@ -192,7 +198,10 @@ NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0
 NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
 STRIPE_TEAM_MONTHLY_PRICE_ID=
 STRIPE_TEAM_PRODUCT_ID=
+# It is a price ID in the product with id STRIPE_ORG_PRODUCT_ID
 STRIPE_ORG_MONTHLY_PRICE_ID=
+STRIPE_ORG_PRODUCT_ID=
+
 STRIPE_WEBHOOK_SECRET=
 STRIPE_WEBHOOK_SECRET_APPS=
 STRIPE_PRIVATE_KEY=
@@ -285,7 +294,7 @@ NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
 # use organizations
 ORGANIZATIONS_ENABLED=
 NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=30
-NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE=3700 # $37.00 per seat
+NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE_NEW=37 # $37.00 per seat
 
 # This variable should only be set to 1 or true if you want to autolink external provider sign-ups with
 # existing organizations based on email domain address
@@ -353,13 +362,6 @@ E2E_TEST_OIDC_USER_PASSWORD=
 
 # ***********************************************************************************************************
 
-# provide a value between 0 and 100 to ensure the percentage of traffic
-# redirected from the legacy to the future pages
-AB_TEST_BUCKET_PROBABILITY=50
-APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
-APP_ROUTER_APPS_ENABLED=0
-APP_ROUTER_TEAM_ENABLED=0
-
 # disable setry server source maps
 SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
 
@@ -402,8 +404,17 @@ NEXT_PUBLIC_WEBSITE_TERMS_URL=
 # [0: silly & upwards, 1: trace & upwards, 2: debug & upwards, 3: info & upwards, 4: warn & upwards, 5: error & fatal, 6: fatal]
 NEXT_PUBLIC_LOGGER_LEVEL=
 
-# Used to use Replexica SDK, a tool for real-time AI-powered localization
-REPLEXICA_API_KEY=
+# For storing Daily Video recordings on S3 Bucket
+CAL_VIDEO_BUCKET_NAME=
+CAL_VIDEO_BUCKET_REGION=
+CAL_VIDEO_ASSUME_ROLE_ARN=
+
+# For local testing of Daily Video
+# Set this to the link of a working Daily Video meeting link
+CAL_VIDEO_MEETING_LINK_FOR_TESTING=
+
+# Used to use lingo.dev SDK, a tool for real-time AI-powered localization
+LINGO_DOT_DEV_API_KEY=
 
 # Comma-separated list of DSyncData.directoryId to log SCIM API requests for. It can be enabled temporarily for debugging the requests being sent to SCIM server.
 DIRECTORY_IDS_TO_LOG=
@@ -413,6 +424,8 @@ DIRECTORY_IDS_TO_LOG=
 # Read more about it in the README.md
 NEXT_PUBLIC_SINGLE_ORG_SLUG=
 
+AKISMET_API_KEY=
+
 ## 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=
@@ -423,4 +436,10 @@ 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
+NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
+
+#  Deprecated. Use NEXT_PUBLIC_BODY_SCRIPTS instead. NEXT_PUBLIC_HEAD_SCRIPTS are now injected into the body only.
+NEXT_PUBLIC_HEAD_SCRIPTS=
+NEXT_PUBLIC_BODY_SCRIPTS=
+
+DATABASE_CHUNK_SIZE=

.github/CODEOWNERS

@@ -1,4 +1,5 @@
-/apps/api/**/* @calcom/Platform
+/**/package.json @calcom/Foundation
+/apps/api/**/* @calcom/Platform @calcom/Foundation
 /deploy/**/* @calcom/Foundation
 /infra/**/* @calcom/Foundation
 /packages/app-store/applecalendar/**/* @calcom/Foundation
@@ -17,6 +18,6 @@
 /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

.github/ISSUE_TEMPLATE/platform.md

@@ -0,0 +1,58 @@
+---
+name: Cal.com/platform request
+about: Suggest a feature or bug report for cal.com/platform
+title: ""
+labels: ["platform", "🚨 needs approval"]
+assignees: ""
+---
+
+### Is your proposal related to a problem?
+
+<!--
+  Provide a clear and concise description of what the problem is.
+  For example, "I'm always frustrated when..."
+-->
+
+(Write your answer here.)
+
+### Describe the solution you'd like
+
+<!--
+  Provide a clear and concise description of what you want to happen.
+-->
+
+(Describe your proposed solution here.)
+
+### Describe alternatives you've considered
+
+<!--
+  Let us know about other solutions you've tried or researched.
+-->
+
+(Write your answer here.)
+
+### Additional context
+
+<!--
+  Is there anything else you can add about the proposal?
+  You might want to link to related issues here, if you haven't already.
+-->
+
+(Write your answer here.)
+
+### Requirement/Document
+
+<!--
+  Is there any type of document that could support that feature?
+-->
+
+(Share it here.)
+
+---
+
+##### House rules
+
+- If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
+  - For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
+  - Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
+  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)

.github/actions/yarn-install/action.yml

@@ -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"

.github/workflows/cron-scheduleEmailReminders.yml

@@ -1,3 +1,5 @@
+# deprecated - use smtp with tasker instead */
+
 name: Cron - scheduleEmailReminders
 
 on:

.github/workflows/docs-build.yml

@@ -35,7 +35,7 @@ jobs:
         working-directory: docs
         run: |
           export NODE_OPTIONS="--max_old_space_size=8192"
-          npm install -g mintlify
+          npm install -g mintlify@4.0.436
           mintlify dev &
           sleep 5 # Let it run for 5 seconds
           kill $!

.github/workflows/e2e-api-v2.yml

@@ -17,7 +17,7 @@ env:
   NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
   NODE_OPTIONS: --max-old-space-size=29000
   REDIS_URL: "redis://localhost:6379"
-  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
+  LINGO_DOT_DEV_API_KEY: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY }}
   STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}

.github/workflows/i18n.yml

@@ -21,5 +21,5 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         with:
-          api-key: ${{ secrets.CI_REPLEXICA_API_KEY }}
+          api-key: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY }}
           pull-request: true

.github/workflows/unit-tests.yml

@@ -2,7 +2,7 @@ name: Unit
 on:
   workflow_call:
 env:
-  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
+  LINGO_DOT_DEV_API_KEY: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY }}
 permissions:
   contents: read
 jobs:

.nvmrc

@@ -1 +1 @@
-v18
+20

.yarn/versions/0d245976.yml

@@ -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"

.yarn/versions/437d6d08.yml

@@ -0,0 +1,6 @@
+undecided:
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"

.yarn/versions/5939e821.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/68111b65.yml

@@ -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"

.yarn/versions/72651de2.yml

@@ -0,0 +1,7 @@
+undecided:
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/7370f650.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/872aa10a.yml

@@ -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"

.yarn/versions/87c7867f.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/89efa242.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/8b30ee17.yml

@@ -0,0 +1,7 @@
+undecided:
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/8f24426c.yml

@@ -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"

.yarn/versions/907efed3.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/a7dbc946.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/b110ad01.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/d15e647d.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/e2b13f5d.yml

@@ -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"

.yarn/versions/e387aeae.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/e96b6c01.yml

@@ -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"

.yarn/versions/ed1c4f13.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/ee059230.yml

@@ -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"

.yarn/versions/f396afcd.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/f57307f8.yml

@@ -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"

.yarn/versions/fe6969b2.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

CONTRIBUTING.md

@@ -1,43 +1,76 @@
 # Contributing to Cal.com
 
-Contributions are what makes the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
-## House rules
+## House Rules (for PRs and Issues)
 
-- Before submitting a new issue or PR, check if it already exists in [issues](https://github.com/calcom/cal.com/issues) or [PRs](https://github.com/calcom/cal.com/pulls).
-- GitHub issues: take note of the `🚨 needs approval` label.
-  - **For Contributors**:
-    - Feature Requests: Wait for a core member to approve and remove the `🚨 needs approval` label before you start coding or submit a PR.
-    - Bugs, Security, Performance, Documentation, etc.: You can start coding immediately, even if the `🚨 needs approval` label is present. This label mainly concerns feature requests.
-  - **Our Process**:
-    - Issues from non-core members automatically receive the `🚨 needs approval` label.
-    - We greatly value new feature ideas. To ensure consistency in the product's direction, they undergo review and approval.
+### 👥 Prevent Work Duplication
+
+Before submitting a new issue or PR, check if it already exists in the [Issues](https://github.com/calcom/cal.com/issues) or [Pull Requests](https://github.com/calcom/cal.com/pulls).
+
+### ✅ Work Only on Approved Issues
+
+For feature requests, please wait for a core team member to approve and remove the `🚨 needs approval` label before you start coding or submitting a PR.
+
+For bugs, security, performance, documentation, etc., you can start coding immediately—even if the `🚨 needs approval` label is present.
+
+We highly value new feature ideas, but to maintain consistency in the product direction, they must go through a review and approval process.
+
+### 🚫 Don’t Just Drop a Link
+
+Avoid posting third-party links (e.g., Slack threads or Linear tickets) without context. A GitHub issue or PR should stand on its own—reviewers shouldn’t have to chase information across multiple tools to understand the context.
+
+### 👀 Think Like a Reviewer
+
+Put yourself in the reviewer’s shoes. What would you want to know if reading this for the first time? Are there key decisions, goals, or constraints that need clarification? Does the PR assume knowledge that isn’t obvious? Are there related issues or previous PRs that should be linked?
+
+### 🧵 Bring in Context from Private Channels
+
+If the task originated from a private conversation (e.g., Slack), take a moment to extract the relevant details and include them in the GitHub issue or PR. Avoid sharing sensitive information, but make sure important reasoning is captured.
+
+> Example:  
+> “A user requested feature X to solve problem Y. I considered approaches A, B, and C, but chose C for the following reasons…”
+
+### 📚 Treat It Like Documentation
+
+GitHub is a shared source of truth. Every issue and PR contributes to the long-term understanding of the codebase. Write clearly enough that someone—possibly you—can revisit it months later and still understand what happened and why.
+
+### ✅ Summarize Your PR at the Top
+
+Even if the code changes are minor or self-explanatory, a short written summary helps reviewers quickly understand the intent. You can use GitHub Copilot’s auto-summarize feature, but make sure to verify it for accuracy and relevance.
+
+### 🔗 Use GitHub Keywords to Auto-Link Issues
+
+Use phrases like “Closes #123” or “Fixes #456” in your PR descriptions. This automatically links your PR to the related issue and closes it once merged—keeping everything traceable and organized.
+
+### 🧪 Mention What Was Tested (and How)
+
+Explain how you validated your changes. It doesn’t need to be exhaustive—just enough to give reviewers confidence that things were tested and work as expected.
+
+> Example:  
+> “Tested locally with mock data and confirmed the flow works on staging.”
+
+### 🧠 Assume Future-You Won’t Remember
+
+Write with the future in mind. If there are trade-offs, edge cases, or temporary workarounds, document them clearly so they don’t get lost or misinterpreted later.
 
 ## Priorities
 
 <table>
   <tr>
-    <td>
-      Type of Issue
-    </td>
-    <td>
-      Priority
-    </td>
+    <td><strong>Type of Issue</strong></td>
+    <td><strong>Priority</strong></td>
   </tr>
   <tr>
-    <td>
-      Minor improvements, non-core feature requests
-    </td>
+    <td>Minor improvements, non-core feature requests</td>
     <td>
       <a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+sort:updated-desc+label:%22Low+priority%22">
         <img src="https://img.shields.io/badge/-Low%20Priority-green">
       </a>
     </td>
   </tr>
-   <tr>
-    <td>
-      Confusing UX (... but working)
-    </td>
+  <tr>
+    <td>Confusing UX (but still functional)</td>
     <td>
       <a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+sort:updated-desc+label:%22Medium+priority%22">
         <img src="https://img.shields.io/badge/-Medium%20Priority-yellow">
@@ -45,9 +78,7 @@ Contributions are what makes the open source community such an amazing place to
     </td>
   </tr>
   <tr>
-    <td>
-      Core Features (Booking page, availability, timezone calculation)
-    </td>
+    <td>Core Features (Booking page, availability, timezone calculation)</td>
     <td>
       <a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+sort:updated-desc+label:%22High+priority%22">
         <img src="https://img.shields.io/badge/-High%20Priority-orange">
@@ -55,9 +86,7 @@ Contributions are what makes the open source community such an amazing place to
     </td>
   </tr>
   <tr>
-    <td>
-      Core Bugs (Login, Booking page, Emails are not working)
-    </td>
+    <td>Core Bugs (Login, Booking page, Emails not working)</td>
     <td>
       <a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+sort:updated-desc+label:Urgent">
         <img src="https://img.shields.io/badge/-Urgent-red">
@@ -68,59 +97,7 @@ Contributions are what makes the open source community such an amazing place to
 
 ## Developing
 
-The development branch is `main`. This is the branch that all pull
-requests should be made against. The changes on the `main`
-branch are tagged into a release monthly.
-
-To develop locally:
-
-1. [Fork](https://github.com/calcom/cal.com/fork/) this repository to your
-   own GitHub account and then
-   [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
-2. Create a new branch:
-
-   ```sh
-   git checkout -b MY_BRANCH_NAME
-   ```
-
-3. Install yarn:
-
-   ```sh
-   npm install -g yarn
-   ```
-
-4. Install the dependencies with:
-
-   ```sh
-   yarn
-   ```
-
-5. Set up your `.env` file:
-
-   - Duplicate `.env.example` to `.env`.
-   - Use `openssl rand -base64 32` to generate a key and add it under `NEXTAUTH_SECRET` in the `.env` file.
-   - Use `openssl rand -base64 32` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
-
-6. Setup Node
-   If your Node version does not meet the project's requirements as instructed by the docs, "nvm" (Node Version Manager) allows using Node at the version required by the project:
-
-   ```sh
-   nvm use
-   ```
-
-   You first might need to install the specific version:
-
-   ```sh
-   nvm install
-   ```
-
-   You can install nvm from [here](https://github.com/nvm-sh/nvm).
-
-7. Start developing and watch for code changes:
-
-   ```sh
-   yarn dev
-   ```
+[See README](https://github.com/calcom/cal.com#development)
 
 ## Building
 
@@ -130,23 +107,19 @@ You can build the project with:
 yarn build
 ```
 
-Please be sure that you can make a full production build before pushing code.
+Please ensure that you can make a full production build before pushing code.
 
 ## Testing
 
 More info on how to add new tests coming soon.
 
-### Running tests
+### Running Tests
 
-This will run and test all flows in multiple Chromium windows to verify that no critical flow breaks:
+[See README](https://github.com/calcom/cal.com#e2e-testing)
 
-```sh
-yarn test-e2e
-```
+#### Resolving Issues
 
-#### Resolving issues
-
-##### E2E test browsers not installed
+##### E2E Test Browsers Not Installed
 
 Run `npx playwright install` to download test browsers and resolve the error below when running `yarn test-e2e`:
 
@@ -166,68 +139,8 @@ If you get errors, be sure to fix them before committing.
 
 ## Making a Pull Request
 
-- Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) while creating your PR.
-- If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. See more about [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
-- Be sure to fill the PR Template accordingly.
-- Review [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations
-
-## Guidelines for committing yarn lockfile
-
-Do not commit your `yarn.lock` unless you've made changes to the `package.json`. If you've already committed `yarn.lock` unintentionally, follow these steps to undo:
-
-If your last commit has the `yarn.lock` file alongside other files and you only wish to uncommit the `yarn.lock`:
-
-```bash
-git checkout HEAD~1 yarn.lock
-git commit -m "Revert yarn.lock changes"
-```
-
-_NB_: You may have to bypass the pre-commit hook with by appending `--no-verify` to the git commit
-If you've pushed the commit with the `yarn.lock`:
-
-1.  Correct the commit locally using the above method.
-2.  Carefully force push:
-
-```bash
-git push origin <your-branch-name> --force
-```
-
-If `yarn.lock` was committed a while ago and there have been several commits since, you can use the following steps to revert just the `yarn.lock` changes without impacting the subsequent changes:
-
-1. **Checkout a Previous Version**:
-
-   - Find the commit hash before the `yarn.lock` was unintentionally committed. You can do this by viewing the Git log:
-
-     ```bash
-     git log yarn.lock
-     ```
-
-   - Once you have identified the commit hash, use it to checkout the previous version of `yarn.lock`:
-
-     ```bash
-     git checkout <commit_hash> yarn.lock
-     ```
-
-2. **Commit the Reverted Version**:
-
-   - After checking out the previous version of the `yarn.lock`, commit this change:
-
-     ```bash
-     git commit -m "Revert yarn.lock to its state before unintended changes"
-     ```
-
-3. **Proceed with Caution**:
-
-   - If you need to push this change, first pull the latest changes from your remote branch to ensure you're not overwriting other recent changes:
-
-     ```bash
-     git pull origin <your-branch-name>
-     ```
-
-   - Then push the updated branch:
-
-     ```bash
-     git push origin <your-branch-name>
-     ```
-
-Lastly, make sure to keep the branches updated (e.g. click the `Update branch` button on GitHub PR).
+- Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) when creating your PR. (This option isn't available if you're [contributing from a fork belonging to an organization](https://github.com/orgs/community/discussions/5634))
+- If your PR refers to or fixes an issue, add `refs #XXX` or `fixes #XXX` to the PR description. Replace `XXX` with the respective issue number. See more about [linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+- Fill out the PR template accordingly.
+- Review the [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations.
+- Lastly, make sure to keep your branches updated (e.g., click the `Update branch` button on the GitHub PR page).

README.md

@@ -24,6 +24,7 @@
 
 <p align="center">
    <a href="https://www.producthunt.com/products/cal-com"><img src="https://img.shields.io/badge/Product%20Hunt-%231%20Product%20of%20the%20Month-%23DA552E" alt="Product Hunt"></a>
+   <img src="https://api.checklyhq.com/v1/badges/groups/1120718?style=flat&theme=default" alt="Checkly QA">
    <a href="https://status.cal.com"><img height="20px" src="https://betteruptime.com/status-badges/v1/monitor/a9kf.svg" alt="Uptime"></a>
    <a href="https://github.com/calcom/cal.com/stargazers"><img src="https://img.shields.io/github/stars/calcom/cal.com" alt="Github Stars"></a>
    <a href="https://news.ycombinator.com/item?id=34507672"><img src="https://img.shields.io/badge/Hacker%20News-%231-%23FF6600" alt="Hacker News"></a>
@@ -172,24 +173,25 @@ yarn dx
 ```
 
 #### Development tip
+1. Add `export NODE_OPTIONS=“--max-old-space-size=16384”` to your shell script to increase the memory limit for the node process. Alternatively, you can run this in your terminal before running the app. Replace 16384 with the amount of RAM you want to allocate to the node process.
 
-Add `NEXT_PUBLIC_LOGGER_LEVEL={level}` to your .env file to control the logging verbosity for all tRPC queries and mutations.\
-Where {level} can be one of the following:
+2. Add `NEXT_PUBLIC_LOGGER_LEVEL={level}` to your .env file to control the logging verbosity for all tRPC queries and mutations.\
+   Where {level} can be one of the following:
 
-`0` for silly \
-`1` for trace \
-`2` for debug \
-`3` for info \
-`4` for warn \
-`5` for error \
-`6` for fatal
+   `0` for silly \
+   `1` for trace \
+   `2` for debug \
+   `3` for info \
+   `4` for warn \
+   `5` for error \
+   `6` for fatal
 
-When you set `NEXT_PUBLIC_LOGGER_LEVEL={level}` in your .env file, it enables logging at that level and higher. Here's how it works:
+   When you set `NEXT_PUBLIC_LOGGER_LEVEL={level}` in your .env file, it enables logging at that level and higher. Here's how it works:
 
-The logger will include all logs that are at the specified level or higher. For example: \
+   The logger will include all logs that are at the specified level or higher. For example: \
 
-- If you set `NEXT_PUBLIC_LOGGER_LEVEL=2`, it will log from level 2 (debug) upwards, meaning levels 2 (debug), 3 (info), 4 (warn), 5 (error), and (fatal) will be logged. \
-- If you set `NEXT_PUBLIC_LOGGER_LEVEL=3`, it will log from level 3 (info) upwards, meaning levels 3 (info), 4 (warn), 5 (error), and 6 (fatal) will be logged, but level 2 (debug) and level 1 (trace) will be ignored. \
+   - If you set `NEXT_PUBLIC_LOGGER_LEVEL=2`, it will log from level 2 (debug) upwards, meaning levels 2 (debug), 3 (info), 4 (warn), 5 (error), and (fatal) will be logged. \
+   - If you set `NEXT_PUBLIC_LOGGER_LEVEL=3`, it will log from level 3 (info) upwards, meaning levels 3 (info), 4 (warn), 5 (error), and 6 (fatal) will be logged, but level 2 (debug) and level 1 (trace) will be ignored. \
 
 ```sh
 echo 'NEXT_PUBLIC_LOGGER_LEVEL=3' >> .env

__checks__/organization.spec.ts

@@ -1,4 +1,3 @@
-import type { Page } from "@playwright/test";
 import { test, expect } from "@playwright/test";
 
 test.describe("Org", () => {
@@ -8,14 +7,16 @@ test.describe("Org", () => {
       const response = await page.goto("https://i.cal.com/embed");
       expect(response?.status()).toBe(200);
       await page.screenshot({ path: "screenshot.jpg" });
-      await expectPageToBeRenderedWithEmbedSsr(page);
+      const body = await response?.text();
+      await expectPageToBeRenderedWithEmbedSsr(body);
     });
 
     test("Org User(Rick) Page should be embeddable", async ({ page }) => {
       const response = await page.goto("https://i.cal.com/team-rick/embed");
       expect(response?.status()).toBe(200);
       await expect(page.locator("text=Used by Checkly")).toBeVisible();
-      await expectPageToBeRenderedWithEmbedSsr(page);
+      const body = await response?.text();
+      await expectPageToBeRenderedWithEmbedSsr(body);
     });
 
     test("Org User Event(/team-rick/test-event) Page should be embeddable", async ({ page }) => {
@@ -23,14 +24,16 @@ test.describe("Org", () => {
       expect(response?.status()).toBe(200);
       await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible();
       await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible();
-      await expectPageToBeRenderedWithEmbedSsr(page);
+      const body = await response?.text();
+      await expectPageToBeRenderedWithEmbedSsr(body);
     });
 
     test("Org Team Profile(/sales) page should be embeddable", async ({ page }) => {
       const response = await page.goto("https://i.cal.com/sales/embed");
       expect(response?.status()).toBe(200);
       await expect(page.locator("text=Cal.com Sales")).toBeVisible();
-      await expectPageToBeRenderedWithEmbedSsr(page);
+      const body = await response?.text();
+      await expectPageToBeRenderedWithEmbedSsr(body);
     });
 
     test("Org Team Event page(/sales/hippa) should be embeddable", async ({ page }) => {
@@ -38,7 +41,8 @@ test.describe("Org", () => {
       expect(response?.status()).toBe(200);
       await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible();
       await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible();
-      await expectPageToBeRenderedWithEmbedSsr(page);
+      const body = await response?.text();
+      await expectPageToBeRenderedWithEmbedSsr(body);
     });
   });
 
@@ -68,7 +72,8 @@ test.describe("Org", () => {
   test("Organization Homepage - Has Engineering and Marketing Teams", async ({ page }) => {
     const response = await page.goto("https://i.cal.com");
     expect(response?.status()).toBe(200);
-    await expect(page.locator("text=Cal.com")).toBeVisible();
+    // Somehow there are two Cal.com text momentarily, but shouldn't be the concern of this check
+    await expect(page.locator("text=Cal.com").first()).toBeVisible();
     await expect(page.locator("text=Engineering")).toBeVisible();
     await expect(page.locator("text=Marketing")).toBeVisible();
   });
@@ -95,11 +100,6 @@ test.describe("Org", () => {
 });
 
 // This ensures that the route is actually mapped to a page that is using withEmbedSsr
-async function expectPageToBeRenderedWithEmbedSsr(page: Page) {
-  expect(
-    await page.evaluate(() => {
-      //@ts-expect-error - __NEXT_DATA__ is a global variable defined by Next.js
-      return window.__NEXT_DATA__.props.pageProps.isEmbed;
-    })
-  ).toBe(true);
+async function expectPageToBeRenderedWithEmbedSsr(responseText: string | undefined) {
+  expect(responseText).toContain('\\"isEmbed\\":true');
 }

apps/api/v1/README.md

@@ -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
 

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

@@ -0,0 +1,8 @@
+import { setUser as SentrySetUser } from "@sentry/nextjs";
+import type { NextMiddleware } from "next-api-middleware";
+
+export const captureUserId: NextMiddleware = async (req, res, next) => {
+  if (req.userId) SentrySetUser({ id: req.userId });
+
+  await next();
+};

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

@@ -2,15 +2,16 @@ import { label } from "next-api-middleware";
 
 import { addRequestId } from "./addRequestid";
 import { captureErrors } from "./captureErrors";
+import { captureUserId } from "./captureUserId";
 import { checkIsInMaintenanceMode } from "./checkIsInMaintenanceMode";
 import { extendRequest } from "./extendRequest";
 import {
-  HTTP_POST,
   HTTP_DELETE,
-  HTTP_PATCH,
   HTTP_GET,
-  HTTP_GET_OR_POST,
   HTTP_GET_DELETE_PATCH,
+  HTTP_GET_OR_POST,
+  HTTP_PATCH,
+  HTTP_POST,
 } from "./httpMethods";
 import { rateLimitApiKey } from "./rateLimitApiKey";
 import { verifyApiKey } from "./verifyApiKey";
@@ -31,6 +32,7 @@ const middleware = {
   extendRequest,
   pagination: withPagination,
   captureErrors,
+  captureUserId,
   verifyCredentialSyncEnabled,
 };
 
@@ -44,8 +46,9 @@ const middlewareOrder = [
   "verifyApiKey",
   "rateLimitApiKey",
   "addRequestId",
+  "captureUserId",
 ] as Middleware[]; // <-- Provide a list of middleware to call automatically
 
 const withMiddleware = label(middleware, middlewareOrder);
 
-export { withMiddleware, middleware, middlewareOrder };
+export { middleware, middlewareOrder, withMiddleware };

apps/api/v1/lib/validations/booking.ts

@@ -8,7 +8,8 @@ import {
   _TeamModel,
   _UserModel,
 } from "@calcom/prisma/zod";
-import { extendedBookingCreateBody, iso8601 } from "@calcom/prisma/zod-utils";
+import { iso8601 } from "@calcom/prisma/zod-utils";
+import { extendedBookingCreateBody } from "@calcom/prisma/zod/custom/booking";
 
 import { schemaQueryUserId } from "./shared/queryUserId";
 

apps/api/v1/lib/validations/event-type.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
 
+import { MAX_SEATS_PER_TIME_SLOT } from "@calcom/lib/constants";
 import slugify from "@calcom/lib/slugify";
 import { _EventTypeModel as EventType, _HostModel } from "@calcom/prisma/zod";
 import { customInputSchema, eventTypeBookingFields } from "@calcom/prisma/zod-utils";
@@ -103,7 +104,7 @@ const schemaEventTypeEditParams = z
       .transform((s) => slugify(s))
       .optional(),
     length: z.number().int().optional(),
-    seatsPerTimeSlot: z.number().optional(),
+    seatsPerTimeSlot: z.number().min(1).max(MAX_SEATS_PER_TIME_SLOT).nullable().optional(),
     seatsShowAttendees: z.boolean().optional(),
     seatsShowAvailabilityCount: z.boolean().optional(),
     bookingFields: eventTypeBookingFields.optional(),

apps/api/v1/lib/validations/user.ts

@@ -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({})

apps/api/v1/next.config.js

@@ -46,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*",

apps/api/v1/package.json

@@ -33,7 +33,7 @@
     "@sentry/nextjs": "^8.8.0",
     "bcryptjs": "^2.4.3",
     "memory-cache": "^0.2.0",
-    "next": "^13.5.6",
+    "next": "^13.5.9",
     "next-api-middleware": "^1.0.1",
     "next-axiom": "^0.17.0",
     "next-swagger-doc": "^0.3.6",

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

@@ -79,9 +79,10 @@ async function handler(req: NextApiRequest) {
       allRemainingBookings: req.query.allRemainingBookings === "true",
     });
 
-  // Normalizing for universal handler
-  req.body = { id, allRemainingBookings, cancellationReason, cancelledBy };
-  return await handleCancelBooking(req);
+  return await handleCancelBooking({
+    bookingData: { id, allRemainingBookings, cancellationReason, cancelledBy },
+    userId: req.userId,
+  });
 }
 
 export default defaultResponder(handler);

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

@@ -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",

apps/api/v1/pages/api/bookings/_post.ts

@@ -213,12 +213,14 @@ import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
  *         description: Authorization information is missing or invalid.
  */
 async function handler(req: NextApiRequest) {
-  const { userId, isSystemWideAdmin, isOrganizationOwnerOrAdmin } = req;
+  const { isSystemWideAdmin, isOrganizationOwnerOrAdmin } = req;
+  let userId = req.userId;
+
   req.body = {
     ...req.body,
     creationSource: CreationSource.API_V1,
   };
-  if (isSystemWideAdmin) req.userId = req.body.userId || userId;
+  if (isSystemWideAdmin) userId = req.body.userId || userId;
 
   if (isOrganizationOwnerOrAdmin) {
     const accessibleUsersIds = await getAccessibleUsers({
@@ -226,11 +228,19 @@ async function handler(req: NextApiRequest) {
       memberUserIds: [req.body.userId || userId],
     });
     const [requestedUserId] = accessibleUsersIds;
-    req.userId = requestedUserId || userId;
+    userId = requestedUserId || userId;
   }
 
   try {
-    return await handleNewBooking(req, getBookingDataSchemaForApi);
+    return await handleNewBooking(
+      {
+        bookingData: req.body,
+        userId,
+        hostname: req.headers.host || "",
+        forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
+      },
+      getBookingDataSchemaForApi
+    );
   } catch (error: unknown) {
     const knownError = error as Error;
     if (knownError?.message === ErrorCode.NoAvailableUsersFound) {

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

@@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";
 import type { z } from "zod";
 
-import { getCalendarCredentialsWithoutDwd, getConnectedCalendars } from "@calcom/lib/CalendarManager";
+import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
@@ -185,7 +185,7 @@ async function verifyCredentialsAndGetId({
   currentCredentialId: number | null;
 }) {
   if (parsedBody.integration && parsedBody.externalId) {
-    const calendarCredentials = getCalendarCredentialsWithoutDwd(userCredentials);
+    const calendarCredentials = getCalendarCredentialsWithoutDelegation(userCredentials);
 
     const { connectedCalendars } = await getConnectedCalendars(
       calendarCredentials,

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

@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";
 
-import { getCalendarCredentialsWithoutDwd, getConnectedCalendars } from "@calcom/lib/CalendarManager";
+import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
@@ -82,7 +82,7 @@ async function postHandler(req: NextApiRequest) {
       message: "Bad request, credential id invalid",
     });
 
-  const calendarCredentials = getCalendarCredentialsWithoutDwd(userCredentials);
+  const calendarCredentials = getCalendarCredentialsWithoutDelegation(userCredentials);
 
   const { connectedCalendars } = await getConnectedCalendars(calendarCredentials, [], parsedBody.externalId);
 

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

@@ -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,

apps/api/v1/pages/api/invites/_post.ts

@@ -8,6 +8,7 @@ import { createContext } from "@calcom/trpc/server/createContext";
 import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";
 import type { TInviteMemberInputSchema } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema";
 import { ZInviteMemberInputSchema } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema";
+import { createCallerFactory } from "@calcom/trpc/server/trpc";
 import type { UserProfile } from "@calcom/types/UserProfile";
 
 import { TRPCError } from "@trpc/server";
@@ -38,7 +39,8 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
 
   const ctx = await createContext({ req, res }, sessionGetter);
   try {
-    const caller = viewerTeamsRouter.createCaller(ctx);
+    const createCaller = createCallerFactory(viewerTeamsRouter);
+    const caller = createCaller(ctx);
     await caller.inviteMember({
       role: data.role,
       language: data.language,

apps/api/v1/pages/api/memberships/[id]/_delete.ts

@@ -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:

apps/api/v1/pages/api/teams/[teamId]/publish.ts

@@ -6,6 +6,7 @@ import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
 import { createContext } from "@calcom/trpc/server/createContext";
 import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";
+import { createCallerFactory } from "@calcom/trpc/server/trpc";
 import type { UserProfile } from "@calcom/types/UserProfile";
 
 import { TRPCError } from "@trpc/server";
@@ -39,7 +40,8 @@ const patchHandler = async (req: NextApiRequest, res: NextApiResponse) => {
   /** @see https://trpc.io/docs/server-side-calls */
   const ctx = await createContext({ req, res }, sessionGetter);
   try {
-    const caller = viewerTeamsRouter.createCaller(ctx);
+    const createCaller = createCallerFactory(viewerTeamsRouter);
+    const caller = createCaller(ctx);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return await caller.publish(req.query as any /* Let tRPC handle this */);
   } catch (cause) {

apps/api/v1/pages/api/teams/_post.ts

@@ -1,8 +1,8 @@
 import type { NextApiRequest } from "next";
 
 import { getStripeCustomerIdFromUserId } from "@calcom/app-store/stripepayment/lib/customer";
-import stripe from "@calcom/app-store/stripepayment/lib/server";
 import { getDubCustomer } from "@calcom/features/auth/lib/dub";
+import stripe from "@calcom/features/ee/payments/server/stripe";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
 import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";

apps/api/v1/pages/api/users/[userId]/_delete.ts

@@ -31,7 +31,7 @@ import { schemaQueryUserId } from "~/lib/validations/shared/queryUserId";
  *     - users
  *     responses:
  *       201:
- *         description: OK, user removed successfuly
+ *         description: OK, user removed successfully
  *       400:
  *        description: Bad request. User id is invalid.
  *       401:

apps/api/v1/test/lib/selected-calendars/_post.test.ts

@@ -81,6 +81,7 @@ describe("POST /api/selected-calendars", () => {
         userId: 444444,
         id: "xxx-xxx",
         eventTypeId: null,
+        delegationCredentialId: null,
         domainWideDelegationCredentialId: null,
         googleChannelId: null,
         googleChannelKind: null,
@@ -123,6 +124,7 @@ describe("POST /api/selected-calendars", () => {
         googleChannelResourceId: null,
         googleChannelResourceUri: null,
         googleChannelExpiration: null,
+        delegationCredentialId: null,
         domainWideDelegationCredentialId: null,
         eventTypeId: null,
         error: null,

apps/api/v2/.env.example

@@ -32,3 +32,9 @@ DOCS_URL=
 # Axiom logging
 AXIOM_DATASET=
 AXIOM_TOKEN=
+
+# DEBUG: 0
+# INFO: 1
+# WARN: 2
+# ERROR: 3
+LOGGER_BRIDGE_LOG_LEVEL="1"

apps/api/v2/.snyk

@@ -0,0 +1,12 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.1
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  'npm:semver:20150403':
+    - '@calcom/platform-libraries-0.0.2 > @calcom/features > @calcom/atoms > rollup-plugin-node-builtins > browserify-fs > levelup > semver':
+        patched: '2025-03-05T12:50:30.654Z'
+        id: 'npm:semver:20150403'
+        path: >-
+          @calcom/platform-libraries-0.0.2 > @calcom/features > @calcom/atoms >
+          rollup-plugin-node-builtins > browserify-fs > levelup > semver

apps/api/v2/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine as build
+FROM node:20-alpine AS build
 
 ARG DATABASE_DIRECT_URL
 ARG DATABASE_URL

apps/api/v2/README.md

@@ -54,9 +54,29 @@ CALCOM_LICENSE_KEY=c4234812-12ab-42s6-a1e3-55bedd4a5bb
 
 ## Running the app
 
+# Development
+
 ```bash
-# development
 $ yarn run start
+```
+
+OR if you don't want to use docker, you can run following command.
+
+```bash
+$ yarn dev:no-docker
+```
+
+Additionally you can run following command(in different terminal) to ensure that any change in any of the dependencies is rebuilt and detected. It watches platform-libraries, platform-constants, platform-enums, platform-utils, platform-types.
+
+```bash
+$ yarn run dev:build:watch
+```
+
+If you are making changes in packages/platform/libraries, you should run the following command too that would connect your local packages/platform/libraries to the api/v2
+
+```bash
+$ yarn local
+```
 
 # watch mode
 $ yarn run start:dev
@@ -65,6 +85,9 @@ $ yarn run start:dev
 $ yarn run start:prod
 ```
 
+
+
+
 ## Test
 
 ```bash
@@ -74,6 +97,12 @@ $ yarn run test
 # e2e tests
 $ yarn run test:e2e
 
+# e2e tests in watch mode
+$ yarn test:e2e:watch 
+
+# run specific e2e test file in watch mode
+$ yarn test:e2e:watch --testPathPattern=filePath
+
 # test coverage
 $ yarn run test:cov
 ```

apps/api/v2/package.json

@@ -9,8 +9,14 @@
     "build": "yarn dev:build && nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "nest start",
-    "dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch",
-    "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build ",
+    "dev:build:watch": "concurrently --names \"libraries,lru-fix,constants,enums,utils,types\" \"yarn _dev:build:watch:libraries\" \"yarn _dev:build:watch:libraries:lru-fix\" \"yarn _dev:build:watch:constants\" \"yarn _dev:build:watch:enums\" \"yarn _dev:build:watch:utils\" \"yarn _dev:build:watch:types\"",
+    "_dev:build:watch:libraries": "yarn workspace @calcom/platform-libraries build:watch",
+    "_dev:build:watch:libraries:lru-fix": "yarn workspace @calcom/platform-libraries watch-lru-fix",
+    "_dev:build:watch:constants": "yarn workspace @calcom/platform-constants build:watch",
+    "_dev:build:watch:enums": "yarn workspace @calcom/platform-enums build:watch",
+    "_dev:build:watch:utils": "yarn workspace @calcom/platform-utils build:watch",
+    "_dev:build:watch:types": "yarn workspace @calcom/platform-types build:watch",
+    "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build",
     "dev": "yarn dev:build && ts-node scripts/docker-start.ts && yarn copy-swagger-module && yarn start --watch",
     "dev:no-docker": "yarn dev:build && yarn copy-swagger-module && yarn start --watch",
     "start:debug": "nest start --debug --watch",
@@ -24,13 +30,15 @@
     "test:e2e:watch": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json --watch",
     "prisma": "yarn workspace @calcom/prisma prisma",
     "generate-schemas": "yarn prisma generate && yarn prisma format",
-    "copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts"
+    "copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts",
+    "prepare": "yarn run snyk-protect",
+    "snyk-protect": "snyk-protect"
   },
   "dependencies": {
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.124",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.172",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
@@ -50,10 +58,12 @@
     "@sentry/nestjs": "^8.37.1",
     "@sentry/node": "^8.8.0",
     "@sentry/profiling-node": "^8.37.1",
+    "@snyk/protect": "latest",
     "body-parser": "^1.20.2",
     "bull": "^4.12.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
+    "concurrently": "^9.1.2",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",
     "fs-extra": "^11.2.0",
@@ -86,7 +96,6 @@
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.10",
     "@types/luxon": "^3.3.7",
-    "@types/node": "^20.3.1",
     "@types/passport-jwt": "^3.0.13",
     "@types/supertest": "^2.0.12",
     "jest": "^29.7.0",
@@ -99,9 +108,10 @@
     "ts-loader": "^9.4.3",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.9.4"
+    "typescript": "^5.8.2"
   },
   "prisma": {
     "schema": "../../../packages/prisma/schema.prisma"
-  }
+  },
+  "snyk": true
 }

apps/api/v2/src/app.ts

@@ -21,6 +21,7 @@ import {
   X_CAL_PLATFORM_EMBED,
 } from "@calcom/platform-constants";
 
+import { CalendarServiceExceptionFilter } from "./filters/calendar-service-exception.filter";
 import { TRPCExceptionFilter } from "./filters/trpc-exception.filter";
 
 export const bootstrap = (app: NestExpressApplication): NestExpressApplication => {
@@ -76,6 +77,7 @@ export const bootstrap = (app: NestExpressApplication): NestExpressApplication =
   app.useGlobalFilters(new ZodExceptionFilter());
   app.useGlobalFilters(new HttpExceptionFilter());
   app.useGlobalFilters(new TRPCExceptionFilter());
+  app.useGlobalFilters(new CalendarServiceExceptionFilter());
 
   app.use(cookieParser());
 

apps/api/v2/src/ee/bookings/2024-04-15/bookings.module.ts

@@ -1,17 +1,49 @@
 import { BookingsController_2024_04_15 } from "@/ee/bookings/2024-04-15/controllers/bookings.controller";
+import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
+import { AppsRepository } from "@/modules/apps/apps.repository";
 import { BillingModule } from "@/modules/billing/billing.module";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
+import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
+import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, RedisModule, TokensModule, BillingModule],
-  providers: [TokensRepository, OAuthFlowService, OAuthClientRepository, ApiKeysRepository],
+  imports: [
+    PrismaModule,
+    RedisModule,
+    TokensModule,
+    BillingModule,
+    UsersModule,
+    EventTypesModule_2024_04_15,
+    SchedulesModule_2024_04_15,
+    EventTypesModule_2024_06_14,
+  ],
+  providers: [
+    TokensRepository,
+    OAuthFlowService,
+    OAuthClientRepository,
+    ApiKeysRepository,
+    OAuthClientUsersService,
+    PlatformBookingsService,
+    CalendarsService,
+    CredentialsRepository,
+    AppsRepository,
+    CalendarsRepository,
+    SelectedCalendarsRepository,
+  ],
   controllers: [BookingsController_2024_04_15],
 })
 export class BookingsModule_2024_04_15 {}

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts

@@ -114,7 +114,6 @@ describe("Bookings Endpoints 2024-04-15", () => {
           optionValue: "",
         },
         notes: "test",
-        guests: [],
       };
 
       const body: CreateBookingInput_2024_04_15 = {
@@ -145,6 +144,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
           expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
           expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
           expect(responseBody.data.metadata).toEqual(bookingMetadata);
+          expect(responseBody.data.responses).toEqual(bookingResponses);
 
           createdBooking = responseBody.data;
         });
@@ -244,6 +244,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
           expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
           expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
           expect(responseBody.data.metadata).toEqual(bookingMetadata);
+          expect(responseBody.data.responses).toEqual(bookingResponses);
 
           createdBooking = responseBody.data;
         });
@@ -269,7 +270,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
             optionValue: "",
           },
           notes: "test",
-          guests: [],
+          guests: ["someone@example.com"],
         };
 
         const body: CreateBookingInput_2024_04_15 = {
@@ -301,6 +302,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
             expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
             expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
             expect(responseBody.data.metadata).toEqual(newBookingMetadata);
+            expect(responseBody.data.responses).toEqual(bookingResponses);
 
             createdBooking = responseBody.data;
           });
@@ -349,6 +351,64 @@ describe("Bookings Endpoints 2024-04-15", () => {
         });
     });
 
+    it("should create a booking with split name", async () => {
+      const bookingStart = "2040-05-21T11:30:00.000Z";
+      const bookingEnd = "2040-05-21T12:30:00.000Z";
+      const bookingEventTypeId = eventTypeId;
+      const bookingTimeZone = "Europe/London";
+      const bookingLanguage = "en";
+      const bookingHashedLink = "";
+      const bookingMetadata = {
+        timeFormat: "12",
+        meetingType: "organizer-phone",
+      };
+      const bookingResponses = {
+        name: { firstName: "John", lastName: "Doe" },
+        email: "tester@example.com",
+        location: {
+          value: "link",
+          optionValue: "",
+        },
+        notes: "test",
+      };
+
+      const body: CreateBookingInput_2024_04_15 = {
+        start: bookingStart,
+        end: bookingEnd,
+        eventTypeId: bookingEventTypeId,
+        timeZone: bookingTimeZone,
+        language: bookingLanguage,
+        metadata: bookingMetadata,
+        hashedLink: bookingHashedLink,
+        responses: bookingResponses,
+      };
+
+      return request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
+            response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.userPrimaryEmail).toBeDefined();
+          expect(responseBody.data.userPrimaryEmail).toEqual(userEmail);
+          expect(responseBody.data.id).toBeDefined();
+          expect(responseBody.data.uid).toBeDefined();
+          expect(responseBody.data.startTime).toEqual(bookingStart);
+          expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
+          expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
+          expect(responseBody.data.metadata).toEqual(bookingMetadata);
+          expect(responseBody.data.responses).toEqual({
+            ...bookingResponses,
+            name: `${bookingResponses.name.firstName} ${bookingResponses.name.lastName}`,
+          });
+
+          createdBooking = responseBody.data;
+        });
+    });
+
     afterAll(async () => {
       await userRepositoryFixture.deleteByEmail(user.email);
       await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts

@@ -4,6 +4,7 @@ import { MarkNoShowInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/mark
 import { GetBookingOutput_2024_04_15 } from "@/ee/bookings/2024-04-15/outputs/get-booking.output";
 import { GetBookingsOutput_2024_04_15 } from "@/ee/bookings/2024-04-15/outputs/get-bookings.output";
 import { MarkNoShowOutput_2024_04_15 } from "@/ee/bookings/2024-04-15/outputs/mark-no-show.output";
+import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
 import { VERSION_2024_04_15, VERSION_2024_06_11, VERSION_2024_06_14 } from "@/lib/api-versions";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
@@ -13,8 +14,11 @@ import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
 import { BillingService } from "@/modules/billing/services/billing.service";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { UsersService } from "@/modules/users/services/users.service";
+import { UsersRepository, UserWithProfile } from "@/modules/users/users.repository";
 import {
   Controller,
   Post,
@@ -33,7 +37,6 @@ import {
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { ApiQuery, ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
-import { User } from "@prisma/client";
 import { CreationSource } from "@prisma/client";
 import { Request } from "express";
 import { NextApiRequest } from "next/types";
@@ -99,7 +102,10 @@ export class BookingsController_2024_04_15 {
     private readonly oAuthClientRepository: OAuthClientRepository,
     private readonly billingService: BillingService,
     private readonly config: ConfigService,
-    private readonly apiKeyRepository: ApiKeysRepository
+    private readonly apiKeyRepository: ApiKeysRepository,
+    private readonly platformBookingsService: PlatformBookingsService,
+    private readonly usersRepository: UsersRepository,
+    private readonly usersService: UsersService
   ) {}
 
   @Get("/")
@@ -109,18 +115,19 @@ export class BookingsController_2024_04_15 {
   @ApiQuery({ name: "limit", type: "number", required: false })
   @ApiQuery({ name: "cursor", type: "number", required: false })
   async getBookings(
-    @GetUser() user: User,
+    @GetUser() user: UserWithProfile,
     @Query() queryParams: GetBookingsInput_2024_04_15
   ): Promise<GetBookingsOutput_2024_04_15> {
     const { filters, cursor, limit } = queryParams;
     const bookingListingByStatus = filters?.status ?? Status_2024_04_15["upcoming"];
+    const profile = this.usersService.getUserMainProfile(user);
     const bookings = await getAllUserBookings({
       bookingListingByStatus: [bookingListingByStatus],
       skip: cursor ?? 0,
       take: limit ?? 10,
       filters,
       ctx: {
-        user: { email: user.email, id: user.id },
+        user: { email: user.email, id: user.id, orgId: profile?.organizationId },
         prisma: this.prismaReadService.prisma as unknown as PrismaClient,
       },
     });
@@ -166,13 +173,22 @@ export class BookingsController_2024_04_15 {
     @Headers(X_CAL_CLIENT_ID) clientId?: string,
     @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Partial<BookingResponse>>> {
-    const oAuthClientId = clientId?.toString();
+    const oAuthClientId =
+      clientId?.toString() || (await this.getOAuthClientIdFromEventType(body.eventTypeId));
     const { orgSlug, locationUrl } = body;
-    req.headers["x-cal-force-slug"] = orgSlug;
     try {
-      const booking = await handleNewBooking(
-        await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl, isEmbed)
-      );
+      const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl, isEmbed);
+      const booking = await handleNewBooking({
+        bookingData: bookingRequest.body,
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        forcedSlug: orgSlug,
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+      });
       if (booking.userId && booking.uid && booking.startTime) {
         void (await this.billingService.increaseUsageByUserId(booking.userId, {
           uid: booking.uid,
@@ -194,7 +210,7 @@ export class BookingsController_2024_04_15 {
   async cancelBooking(
     @Req() req: BookingRequest,
     @Param("bookingUid") bookingUid: string,
-    @Body() _: CancelBookingInput_2024_04_15,
+    @Body() body: CancelBookingInput_2024_04_15,
     @Headers(X_CAL_CLIENT_ID) clientId?: string,
     @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<{ bookingId: number; bookingUid: string; onlyRemovedAttendee: boolean }>> {
@@ -208,9 +224,16 @@ export class BookingsController_2024_04_15 {
     if (bookingUid) {
       try {
         req.body.uid = bookingUid;
-        const res = await handleCancelBooking(
-          await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
-        );
+        const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed);
+        const res = await handleCancelBooking({
+          bookingData: bookingRequest.body,
+          userId: bookingRequest.userId,
+          arePlatformEmailsEnabled: bookingRequest.arePlatformEmailsEnabled,
+          platformClientId: bookingRequest.platformClientId,
+          platformCancelUrl: bookingRequest.platformCancelUrl,
+          platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+          platformBookingUrl: bookingRequest.platformBookingUrl,
+        });
         if (!res.onlyRemovedAttendee) {
           void (await this.billingService.cancelUsageByBookingUid(res.bookingUid));
         }
@@ -257,11 +280,12 @@ export class BookingsController_2024_04_15 {
   @Post("/recurring")
   async createRecurringBooking(
     @Req() req: BookingRequest,
-    @Body() _: CreateRecurringBookingInput_2024_04_15[],
+    @Body() body: CreateRecurringBookingInput_2024_04_15[],
     @Headers(X_CAL_CLIENT_ID) clientId?: string,
     @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<BookingResponse[]>> {
-    const oAuthClientId = clientId?.toString();
+    const oAuthClientId =
+      clientId?.toString() || (await this.getOAuthClientIdFromEventType(body[0]?.eventTypeId));
     try {
       const recurringEventId = uuidv4();
       for (const recurringEvent of req.body) {
@@ -270,9 +294,18 @@ export class BookingsController_2024_04_15 {
         }
       }
 
-      const createdBookings: BookingResponse[] = await handleNewRecurringBooking(
-        await this.createNextApiRecurringBookingRequest(req, oAuthClientId, undefined, isEmbed)
-      );
+      const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed);
+
+      const createdBookings: BookingResponse[] = await handleNewRecurringBooking({
+        bookingData: bookingRequest.body,
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+      });
 
       createdBookings.forEach(async (booking) => {
         if (booking.userId && booking.uid && booking.startTime) {
@@ -296,11 +329,12 @@ export class BookingsController_2024_04_15 {
   @Post("/instant")
   async createInstantBooking(
     @Req() req: BookingRequest,
-    @Body() _: CreateBookingInput_2024_04_15,
+    @Body() body: CreateBookingInput_2024_04_15,
     @Headers(X_CAL_CLIENT_ID) clientId?: string,
     @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>>> {
-    const oAuthClientId = clientId?.toString();
+    const oAuthClientId =
+      clientId?.toString() || (await this.getOAuthClientIdFromEventType(body.eventTypeId));
     req.userId = (await this.getOwnerId(req)) ?? -1;
     try {
       const instantMeeting = await handleInstantMeeting(
@@ -338,7 +372,8 @@ export class BookingsController_2024_04_15 {
           return keyData?.userId;
         } else {
           // Access Token
-          return this.oAuthFlowService.getOwnerId(bearerToken);
+          const ownerId = await this.oAuthFlowService.getOwnerId(bearerToken);
+          return ownerId;
         }
       }
     } catch (err) {
@@ -346,6 +381,41 @@ export class BookingsController_2024_04_15 {
     }
   }
 
+  private async getOwnerIdRescheduledBooking(
+    request: Request,
+    platformClientId?: string
+  ): Promise<number | undefined> {
+    if (
+      platformClientId &&
+      request.body.rescheduledBy &&
+      !request.body.rescheduledBy.includes(platformClientId)
+    ) {
+      request.body.rescheduledBy = OAuthClientUsersService.getOAuthUserEmail(
+        platformClientId,
+        request.body.rescheduledBy
+      );
+    }
+
+    if (request.body.rescheduledBy) {
+      if (request.body.rescheduledBy !== request.body.responses.email) {
+        return (await this.usersRepository.findByEmail(request.body.rescheduledBy))?.id;
+      }
+    }
+
+    return undefined;
+  }
+
+  private async getOAuthClientIdFromEventType(eventTypeId: number): Promise<string | undefined> {
+    if (!eventTypeId) {
+      return undefined;
+    }
+    const oAuthClientParams = await this.platformBookingsService.getOAuthClientParams(eventTypeId);
+    if (!oAuthClientParams) {
+      return undefined;
+    }
+    return oAuthClientParams.platformClientId;
+  }
+
   private async getOAuthClientsParams(clientId: string, isEmbed = false): Promise<OAuthRequestParams> {
     const res = { ...DEFAULT_PLATFORM_PARAMS };
 
@@ -379,7 +449,9 @@ export class BookingsController_2024_04_15 {
   ): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
     const requestId = req.get("X-Request-Id");
     const clone = { ...req };
-    const userId = (await this.getOwnerId(req)) ?? -1;
+    const userId = clone.body.rescheduleUid
+      ? await this.getOwnerIdRescheduledBooking(req, oAuthClientId)
+      : await this.getOwnerId(req);
     const oAuthParams = oAuthClientId
       ? await this.getOAuthClientsParams(oAuthClientId, this.transformToBoolean(isEmbed))
       : DEFAULT_PLATFORM_PARAMS;
@@ -396,9 +468,27 @@ export class BookingsController_2024_04_15 {
       noEmail: !oAuthParams.arePlatformEmailsEnabled,
       creationSource: CreationSource.API_V2,
     };
+    if (oAuthClientId) {
+      await this.setPlatformAttendeesEmails(clone.body, oAuthClientId);
+    }
     return clone as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
   }
 
+  async setPlatformAttendeesEmails(requestBody: any, oAuthClientId: string): Promise<void> {
+    if (requestBody?.responses?.email) {
+      requestBody.responses.email = await this.platformBookingsService.getPlatformAttendeeEmail(
+        requestBody.responses.email,
+        oAuthClientId
+      );
+    }
+    if (requestBody?.responses?.guests && requestBody?.responses?.guests.length) {
+      requestBody.responses.guests = await this.platformBookingsService.getPlatformAttendeesEmails(
+        requestBody.responses.guests,
+        oAuthClientId
+      );
+    }
+  }
+
   private async createNextApiRecurringBookingRequest(
     req: BookingRequest,
     oAuthClientId?: string,
@@ -425,6 +515,9 @@ export class BookingsController_2024_04_15 {
       noEmail: !oAuthParams.arePlatformEmailsEnabled,
       creationSource: CreationSource.API_V2,
     });
+    if (oAuthClientId) {
+      await this.setPlatformAttendeesEmails(clone.body, oAuthClientId);
+    }
     return clone as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
   }
 

apps/api/v2/src/ee/bookings/2024-04-15/controllers/managed-user-bookings.e2e-spec.ts

@@ -0,0 +1,463 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/create-booking.input";
+import {
+  GetBookingsDataEntry,
+  GetBookingsOutput_2024_04_15,
+} from "@/ee/bookings/2024-04-15/outputs/get-bookings.output";
+import { HttpExceptionFilter } from "@/filters/http-exception.filter";
+import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
+import { Locales } from "@/lib/enums/locales";
+import {
+  CreateManagedUserData,
+  CreateManagedUserOutput,
+} from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
+import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { PlatformOAuthClient, Team, User } from "@prisma/client";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants";
+import {
+  ApiSuccessResponse,
+  CreateEventTypeInput_2024_06_14,
+  EventTypeOutput_2024_06_14,
+} from "@calcom/platform-types";
+
+const CLIENT_REDIRECT_URI = "http://localhost:4321";
+
+describe("Managed user bookings 2024-04-15", () => {
+  let app: INestApplication;
+
+  let oAuthClient: PlatformOAuthClient;
+  let organization: Team;
+  let userRepositoryFixture: UserRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+  let profilesRepositoryFixture: ProfileRepositoryFixture;
+  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+  const platformAdminEmail = `managed-users-bookings-admin-${randomString()}@api.com`;
+  let platformAdmin: User;
+
+  const managedUsersTimeZone = "Europe/Rome";
+  const firstManagedUserEmail = `managed-user-bookings-2024-04-15-first-user@api.com`;
+  const secondManagedUserEmail = `managed-user-bookings-2024-04-15-second-user@api.com`;
+  const thirdManagedUserEmail = `managed-user-bookings-2024-04-15-third-user@api.com`;
+
+  let firstManagedUser: CreateManagedUserData;
+  let secondManagedUser: CreateManagedUserData;
+  let thirdManagedUser: CreateManagedUserData;
+
+  let firstManagedUserEventTypeId: number;
+
+  let firstManagedUserBookingsCount = 0;
+  let secondManagedUserBookingsCount = 0;
+  let thirdManagedUserBookingsCount = 0;
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      providers: [PrismaExceptionFilter, HttpExceptionFilter],
+      imports: [AppModule, UsersModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+    platformAdmin = await userRepositoryFixture.create({ email: platformAdminEmail });
+
+    organization = await teamRepositoryFixture.create({
+      name: `oauth-client-users-organization-${randomString()}`,
+      isPlatform: true,
+      isOrganization: true,
+    });
+    oAuthClient = await createOAuthClient(organization.id);
+
+    await profilesRepositoryFixture.create({
+      uid: "asd1qwwqeqw-asddsadasd",
+      username: platformAdminEmail,
+      organization: { connect: { id: organization.id } },
+      user: {
+        connect: { id: platformAdmin.id },
+      },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "OWNER",
+      user: { connect: { id: platformAdmin.id } },
+      team: { connect: { id: organization.id } },
+      accepted: true,
+    });
+
+    await app.init();
+  });
+
+  async function createOAuthClient(organizationId: number) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: [CLIENT_REDIRECT_URI],
+      permissions: 1023,
+    };
+    const secret = "secret";
+
+    const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+    return client;
+  }
+
+  it(`should create first managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: firstManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Alice Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    firstManagedUser = responseBody.data;
+  });
+
+  it("should create an event type for managed user", async () => {
+    const body: CreateEventTypeInput_2024_06_14 = {
+      title: "Managed user bookings first managed user event type",
+      slug: "managed-user-bookings-first-managed-user-event-type",
+      description: "Managed user bookings first managed user event type description",
+      lengthInMinutes: 30,
+    };
+
+    return request(app.getHttpServer())
+      .post("/api/v2/event-types")
+      .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+      .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+      .send(body)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+        const createdEventType = responseBody.data;
+        expect(createdEventType).toHaveProperty("id");
+        expect(createdEventType.title).toEqual(body.title);
+        expect(createdEventType.description).toEqual(body.description);
+        expect(createdEventType.lengthInMinutes).toEqual(body.lengthInMinutes);
+        expect(createdEventType.ownerId).toEqual(firstManagedUser.user.id);
+        firstManagedUserEventTypeId = createdEventType.id;
+      });
+  });
+
+  it(`should create second managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: secondManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Bob Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    secondManagedUser = responseBody.data;
+  });
+
+  it(`should create third managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: thirdManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Charlie Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    thirdManagedUser = responseBody.data;
+  });
+
+  describe("bookings using original emails", () => {
+    it("managed user should be booked by managed user attendee and booking shows up in both users' bookings", async () => {
+      const body: CreateBookingInput_2024_04_15 = {
+        start: "2040-05-21T09:30:00.000Z",
+        end: "2040-05-21T10:00:00.000Z",
+        eventTypeId: firstManagedUserEventTypeId,
+        timeZone: "Europe/London",
+        language: "en",
+        metadata: {},
+        hashedLink: "",
+        responses: {
+          name: secondManagedUser.user.name || "unknown-name",
+          email: secondManagedUserEmail,
+          location: {
+            value: "attendeeInPerson",
+            optionValue: "rome",
+          },
+          notes: "test",
+          guests: [],
+        },
+      };
+
+      await request(app.getHttpServer()).post("/v2/bookings").send(body).expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getFirstManagedUserBookings.body;
+      const firstManagedUserBookings: GetBookingsDataEntry[] =
+        firstManagedUserBookingsResponseBody.data.bookings;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getSecondManagedUserBookings.body;
+      const secondManagedUserBookings: GetBookingsDataEntry[] =
+        secondManagedUserBookingsResponseBody.data.bookings;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+
+    it("managed user should be booked by managed user attendee and managed user as a guest and booking shows up in all three users' bookings", async () => {
+      const body: CreateBookingInput_2024_04_15 = {
+        start: "2040-05-21T10:30:00.000Z",
+        end: "2040-05-21T11:00:00.000Z",
+        eventTypeId: firstManagedUserEventTypeId,
+        timeZone: "Europe/London",
+        language: "en",
+        metadata: {},
+        hashedLink: "",
+        responses: {
+          name: thirdManagedUser.user.name || "unknown-name",
+          email: thirdManagedUserEmail,
+          location: {
+            value: "attendeeInPerson",
+            optionValue: "rome",
+          },
+          notes: "test",
+          guests: [secondManagedUserEmail],
+        },
+      };
+
+      await request(app.getHttpServer()).post("/v2/bookings").send(body).expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+      thirdManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getFirstManagedUserBookings.body;
+      const firstManagedUserBookings: GetBookingsDataEntry[] =
+        firstManagedUserBookingsResponseBody.data.bookings;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getSecondManagedUserBookings.body;
+      const secondManagedUserBookings: GetBookingsDataEntry[] =
+        secondManagedUserBookingsResponseBody.data.bookings;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+
+      const getThirdManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${thirdManagedUser.accessToken}`)
+        .expect(200);
+      const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getThirdManagedUserBookings.body;
+      const thirdManagedUserBookings: GetBookingsDataEntry[] =
+        thirdManagedUserBookingsResponseBody.data.bookings;
+      expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+  });
+
+  describe("bookings using OAuth client emails", () => {
+    it("managed user should be booked by managed user attendee and booking shows up in both users' bookings", async () => {
+      const body: CreateBookingInput_2024_04_15 = {
+        start: "2040-05-21T12:00:00.000Z",
+        end: "2040-05-21T12:30:00.000Z",
+        eventTypeId: firstManagedUserEventTypeId,
+        timeZone: "Europe/London",
+        language: "en",
+        metadata: {},
+        hashedLink: "",
+        responses: {
+          name: secondManagedUser.user.name || "unknown-name",
+          email: secondManagedUser.user.email,
+          location: {
+            value: "attendeeInPerson",
+            optionValue: "rome",
+          },
+          notes: "test",
+          guests: [],
+        },
+      };
+
+      await request(app.getHttpServer()).post("/v2/bookings").send(body).expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getFirstManagedUserBookings.body;
+      const firstManagedUserBookings: GetBookingsDataEntry[] =
+        firstManagedUserBookingsResponseBody.data.bookings;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getSecondManagedUserBookings.body;
+      const secondManagedUserBookings: GetBookingsDataEntry[] =
+        secondManagedUserBookingsResponseBody.data.bookings;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+
+    it("managed user should be booked by managed user attendee and managed user as a guest and booking shows up in all three users' bookings", async () => {
+      const body: CreateBookingInput_2024_04_15 = {
+        start: "2040-05-21T13:00:00.000Z",
+        end: "2040-05-21T13:30:00.000Z",
+        eventTypeId: firstManagedUserEventTypeId,
+        timeZone: "Europe/London",
+        language: "en",
+        metadata: {},
+        hashedLink: "",
+        responses: {
+          name: thirdManagedUser.user.name || "unknown-name",
+          email: thirdManagedUser.user.email,
+          location: {
+            value: "attendeeInPerson",
+            optionValue: "rome",
+          },
+          notes: "test",
+          guests: [secondManagedUser.user.email],
+        },
+      };
+
+      await request(app.getHttpServer()).post("/v2/bookings").send(body).expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+      thirdManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getFirstManagedUserBookings.body;
+      const firstManagedUserBookings: GetBookingsDataEntry[] =
+        firstManagedUserBookingsResponseBody.data.bookings;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getSecondManagedUserBookings.body;
+      const secondManagedUserBookings: GetBookingsDataEntry[] =
+        secondManagedUserBookingsResponseBody.data.bookings;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+
+      const getThirdManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set("Authorization", `Bearer ${thirdManagedUser.accessToken}`)
+        .expect(200);
+      const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_04_15 =
+        getThirdManagedUserBookings.body;
+      const thirdManagedUserBookings: GetBookingsDataEntry[] =
+        thirdManagedUserBookingsResponseBody.data.bookings;
+      expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+  });
+
+  afterAll(async () => {
+    await userRepositoryFixture.delete(firstManagedUser.user.id);
+    await userRepositoryFixture.delete(secondManagedUser.user.id);
+    await userRepositoryFixture.delete(thirdManagedUser.user.id);
+    await userRepositoryFixture.delete(platformAdmin.id);
+    await oauthClientRepositoryFixture.delete(oAuthClient.id);
+    await teamRepositoryFixture.delete(organization.id);
+    await app.close();
+  });
+});

apps/api/v2/src/ee/bookings/2024-04-15/inputs/create-booking.input.ts

@@ -8,9 +8,45 @@ import {
   IsOptional,
   IsArray,
   IsObject,
-  IsEmail,
   ValidateNested,
+  isEmail,
+  Validate,
 } from "class-validator";
+import { ValidationOptions, registerDecorator } from "class-validator";
+
+import { RESCHEDULED_BY_DOCS } from "@calcom/platform-types";
+
+type BookingName = { firstName: string; lastName: string };
+
+function ValidateBookingName(validationOptions?: ValidationOptions) {
+  return function (target: object, propertyName: string) {
+    registerDecorator({
+      name: "validateBookingName",
+      target: target.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any) {
+          if (typeof value === "string") {
+            return value.trim().length > 0;
+          }
+          if (typeof value === "object" && value !== null) {
+            return (
+              typeof value.firstName === "string" &&
+              typeof value.lastName === "string" &&
+              value.firstName.trim().length > 0 &&
+              value.lastName.trim().length > 0
+            );
+          }
+          return false;
+        },
+        defaultMessage(): string {
+          return "Name must be either a non-empty string or an object with non-empty firstName and lastName";
+        },
+      },
+    });
+  };
+}
 
 class Location {
   @IsString()
@@ -23,18 +59,26 @@ class Location {
 }
 
 class Response {
-  @IsString()
-  @ApiProperty()
-  name!: string;
+  @ApiProperty({
+    oneOf: [
+      { type: "string" },
+      { type: "object", properties: { firstName: { type: "string" }, lastName: { type: "string" } } },
+    ],
+  })
+  @ValidateBookingName()
+  name!: string | BookingName;
 
-  @IsEmail()
+  @Validate((value: string) => !value || isEmail(value), {
+    message: "Invalid response email",
+  })
   @ApiProperty()
   email!: string;
 
+  @IsOptional()
   @IsArray()
   @IsString({ each: true })
-  @ApiProperty({ type: [String] })
-  guests!: string[];
+  @ApiPropertyOptional({ type: [String] })
+  guests?: string[];
 
   @IsOptional()
   @ValidateNested()
@@ -72,6 +116,13 @@ export class CreateBookingInput_2024_04_15 {
   @ApiPropertyOptional()
   rescheduleUid?: string;
 
+  @IsOptional()
+  @ApiPropertyOptional({ description: RESCHEDULED_BY_DOCS })
+  @Validate((value: string) => !value || isEmail(value), {
+    message: "Invalid rescheduledBy email format",
+  })
+  rescheduledBy?: string;
+
   @IsTimeZone()
   @ApiProperty()
   timeZone!: string;
@@ -113,8 +164,9 @@ export class CreateBookingInput_2024_04_15 {
   @ApiPropertyOptional()
   seatReferenceUid?: string;
 
-  @Type(() => Response)
   @ApiProperty({ type: Response })
+  @ValidateNested()
+  @Type(() => Response)
   responses!: Response;
 
   @IsString()

apps/api/v2/src/ee/bookings/2024-04-15/inputs/create-recurring-booking.input.ts

@@ -2,7 +2,7 @@ import { CreateBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/c
 import { ApiPropertyOptional } from "@nestjs/swagger";
 import { IsBoolean, IsString, IsNumber, IsOptional } from "class-validator";
 
-import type { AppsStatus } from "@calcom/platform-libraries";
+import type { AppsStatus } from "@calcom/platform-libraries/app-store";
 
 export class CreateRecurringBookingInput_2024_04_15 extends CreateBookingInput_2024_04_15 {
   @IsBoolean()

apps/api/v2/src/ee/bookings/2024-04-15/outputs/get-bookings.output.ts

@@ -160,7 +160,7 @@ class User {
   email!: string;
 }
 
-class GetBookingsDataEntry {
+export class GetBookingsDataEntry {
   @IsInt()
   @ApiProperty()
   id!: number;

apps/api/v2/src/ee/bookings/2024-08-13/bookings.module.ts

@@ -3,26 +3,47 @@ import { BookingsController_2024_08_13 } from "@/ee/bookings/2024-08-13/controll
 import { BookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/bookings.service";
 import { InputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/input.service";
 import { OutputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/output.service";
+import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
+import { AppsRepository } from "@/modules/apps/apps.repository";
 import { BillingModule } from "@/modules/billing/billing.module";
 import { BookingSeatModule } from "@/modules/booking-seat/booking-seat.module";
 import { BookingSeatRepository } from "@/modules/booking-seat/booking-seat.repository";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
+import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, RedisModule, TokensModule, BillingModule, UsersModule, BookingSeatModule],
+  imports: [
+    PrismaModule,
+    RedisModule,
+    TokensModule,
+    BillingModule,
+    UsersModule,
+    BookingSeatModule,
+    SchedulesModule_2024_04_15,
+    EventTypesModule_2024_04_15,
+    EventTypesModule_2024_06_14,
+  ],
   providers: [
     TokensRepository,
     OAuthFlowService,
     OAuthClientRepository,
+    OAuthClientUsersService,
     BookingsService_2024_08_13,
     InputBookingsService_2024_08_13,
     OutputBookingsService_2024_08_13,
@@ -30,6 +51,12 @@ import { Module } from "@nestjs/common";
     EventTypesRepository_2024_06_14,
     BookingSeatRepository,
     ApiKeysRepository,
+    PlatformBookingsService,
+    CalendarsService,
+    CredentialsRepository,
+    AppsRepository,
+    CalendarsRepository,
+    SelectedCalendarsRepository,
   ],
   controllers: [BookingsController_2024_08_13],
   exports: [InputBookingsService_2024_08_13, OutputBookingsService_2024_08_13, BookingsService_2024_08_13],

apps/api/v2/src/ee/bookings/2024-08-13/bookings.repository.ts

@@ -1,6 +1,7 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
+import type { Prisma } from "@prisma/client";
 
 @Injectable()
 export class BookingsRepository_2024_08_13 {
@@ -98,7 +99,7 @@ export class BookingsRepository_2024_08_13 {
   }
 
   async getByUidWithAttendeesAndUserAndEvent(uid: string) {
-    return this.dbRead.prisma.booking.findUnique({
+    const booking = await this.dbRead.prisma.booking.findUnique({
       where: {
         uid,
       },
@@ -108,6 +109,15 @@ export class BookingsRepository_2024_08_13 {
         eventType: true,
       },
     });
+    if (!booking) {
+      return null;
+    }
+
+    return {
+      ...booking,
+      responses: booking.responses as Prisma.JsonObject,
+      metadata: booking.metadata as Prisma.JsonObject | null,
+    };
   }
 
   async getByUidWithAttendeesWithBookingSeatAndUserAndEvent(uid: string) {

apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts

@@ -1,4 +1,5 @@
 import { BookingUidGuard } from "@/ee/bookings/2024-08-13/guards/booking-uid.guard";
+import { CalendarLinksOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/calendar-links.output";
 import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
 import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
 import { MarkAbsentBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/mark-absent.output";
@@ -6,10 +7,12 @@ import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outpu
 import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
 import { BookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/bookings.service";
 import { VERSION_2024_08_13_VALUE, VERSION_2024_08_13 } from "@/lib/api-versions";
+import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import {
   Controller,
@@ -32,17 +35,20 @@ import {
   ApiBody,
   ApiExtraModels,
 } from "@nestjs/swagger";
-import { User } from "@prisma/client";
 import { Request } from "express";
 
 import { BOOKING_READ, BOOKING_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
 import {
   CancelBookingInput,
+  CancelBookingInput_2024_08_13,
   CancelBookingInputPipe,
+  CancelSeatedBookingInput_2024_08_13,
   GetBookingOutput_2024_08_13,
   GetBookingsOutput_2024_08_13,
   RescheduleBookingInput,
+  RescheduleBookingInput_2024_08_13,
   RescheduleBookingInputPipe,
+  RescheduleSeatedBookingInput_2024_08_13,
 } from "@calcom/platform-types";
 import {
   CreateBookingInputPipe,
@@ -64,14 +70,20 @@ import {
 @DocsTags("Bookings")
 @ApiHeader({
   name: "cal-api-version",
-  description: `Must be set to \`2024-08-13\``,
+  description: `Must be set to ${VERSION_2024_08_13}`,
   example: VERSION_2024_08_13,
   required: true,
+  schema: {
+    default: VERSION_2024_08_13,
+  },
 })
 export class BookingsController_2024_08_13 {
   private readonly logger = new Logger("BookingsController_2024_08_13");
 
-  constructor(private readonly bookingsService: BookingsService_2024_08_13) {}
+  constructor(
+    private readonly bookingsService: BookingsService_2024_08_13,
+    private readonly usersService: UsersService
+  ) {}
 
   @Post("/")
   @ApiOperation({
@@ -87,6 +99,10 @@ export class BookingsController_2024_08_13 {
       For team event types it is possible to create instant meeting. To do that just pass \`"instant": true\` to the request body.
 
       The start needs to be in UTC aka if the timezone is GMT+2 in Rome and meeting should start at 11, then UTC time should have hours 09:00 aka without time zone.
+
+      Finally, there are 2 ways to book an event type:
+      1. Provide \`eventTypeId\` in the request body.
+      2. Provide \`eventTypeSlug\` and \`username\` and optionally \`organizationSlug\` if the user with the username is within an organization.
       `,
   })
   @ApiBody({
@@ -98,7 +114,7 @@ export class BookingsController_2024_08_13 {
       ],
     },
     description:
-      "Accepts different types of booking input: CreateBookingInput_2024_08_13, CreateInstantBookingInput_2024_08_13, or CreateRecurringBookingInput_2024_08_13",
+      "Accepts different types of booking input: Create Booking (Option 1), Create Instant Booking (Option 2), or Create Recurring Booking (Option 3)",
   })
   @ApiExtraModels(
     CreateBookingInput_2024_08_13,
@@ -147,19 +163,20 @@ export class BookingsController_2024_08_13 {
 
   @Get("/")
   @UseGuards(ApiAuthGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
-  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @Permissions([BOOKING_READ])
   @ApiOperation({ summary: "Get all bookings" })
   async getBookings(
     @Query() queryParams: GetBookingsInput_2024_08_13,
-    @GetUser() user: User
+    @GetUser() user: UserWithProfile
   ): Promise<GetBookingsOutput_2024_08_13> {
-    const bookings = await this.bookingsService.getBookings(queryParams, user);
+    const profile = this.usersService.getUserMainProfile(user);
+
+    const bookings = await this.bookingsService.getBookings(queryParams, {
+      email: user.email,
+      id: user.id,
+      orgId: profile?.organizationId,
+    });
 
     return {
       status: SUCCESS_STATUS,
@@ -171,9 +188,19 @@ export class BookingsController_2024_08_13 {
   @UseGuards(BookingUidGuard)
   @ApiOperation({
     summary: "Reschedule a booking",
-    description:
-      "Reschedule a booking by passing `:bookingUid` of the booking that should be rescheduled and pass request body with a new start time to create a new booking.",
+    description: "Reschedule a booking or seated booking",
   })
+  @ApiBody({
+    schema: {
+      oneOf: [
+        { $ref: getSchemaPath(RescheduleBookingInput_2024_08_13) },
+        { $ref: getSchemaPath(RescheduleSeatedBookingInput_2024_08_13) },
+      ],
+    },
+    description:
+      "Accepts different types of reschedule booking input: Reschedule Booking (Option 1) or Reschedule Seated Booking (Option 2)",
+  })
+  @ApiExtraModels(RescheduleBookingInput_2024_08_13, RescheduleSeatedBookingInput_2024_08_13)
   async rescheduleBooking(
     @Param("bookingUid") bookingUid: string,
     @Body(new RescheduleBookingInputPipe())
@@ -198,6 +225,17 @@ export class BookingsController_2024_08_13 {
     For seated bookings to cancel one individual booking provide :bookingUid and :seatUid in the request body. For recurring seated bookings it is not possible to cancel all of them with 1 call
     like with non-seated recurring bookings by providing recurring bookind uid - you have to cancel each recurrence booking by its bookingUid + seatUid.`,
   })
+  @ApiBody({
+    schema: {
+      oneOf: [
+        { $ref: getSchemaPath(CancelBookingInput_2024_08_13) },
+        { $ref: getSchemaPath(CancelSeatedBookingInput_2024_08_13) },
+      ],
+    },
+    description:
+      "Accepts different types of cancel booking input: Cancel Booking (Option 1) or Cancel Seated Booking (Option 2)",
+  })
+  @ApiExtraModels(CancelBookingInput_2024_08_13, CancelSeatedBookingInput_2024_08_13)
   async cancelBooking(
     @Req() request: Request,
     @Param("bookingUid") bookingUid: string,
@@ -216,13 +254,11 @@ export class BookingsController_2024_08_13 {
   @HttpCode(HttpStatus.OK)
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard, BookingUidGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Mark a booking absence",
+    description: "The provided authorization header refers to the owner of the booking.",
   })
-  @ApiOperation({ summary: "Mark a booking absence" })
   async markNoShow(
     @Param("bookingUid") bookingUid: string,
     @Body() body: MarkAbsentBookingInput_2024_08_13,
@@ -240,13 +276,11 @@ export class BookingsController_2024_08_13 {
   @HttpCode(HttpStatus.OK)
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard, BookingUidGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Reassign a booking to auto-selected host",
+    description: "The provided authorization header refers to the owner of the booking.",
   })
-  @ApiOperation({ summary: "Automatically reassign booking to a new host" })
   async reassignBooking(
     @Param("bookingUid") bookingUid: string,
     @GetUser() user: UserWithProfile
@@ -263,13 +297,11 @@ export class BookingsController_2024_08_13 {
   @HttpCode(HttpStatus.OK)
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard, BookingUidGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Reassign a booking to a specific host",
+    description: "The provided authorization header refers to the owner of the booking.",
   })
-  @ApiOperation({ summary: "Reassign a booking to a specific user" })
   async reassignBookingToUser(
     @Param("bookingUid") bookingUid: string,
     @Param("userId") userId: number,
@@ -293,13 +325,11 @@ export class BookingsController_2024_08_13 {
   @HttpCode(HttpStatus.OK)
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard, BookingUidGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Confirm a booking",
+    description: "The provided authorization header refers to the owner of the booking.",
   })
-  @ApiOperation({ summary: "Confirm booking that requires a confirmation" })
   async confirmBooking(
     @Param("bookingUid") bookingUid: string,
     @GetUser() user: UserWithProfile
@@ -316,13 +346,11 @@ export class BookingsController_2024_08_13 {
   @HttpCode(HttpStatus.OK)
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard, BookingUidGuard)
-  @ApiHeader({
-    name: "Authorization",
-    description:
-      "value must be `Bearer <token>` where `<token>` either managed user access token or api key prefixed with cal_",
-    required: true,
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Decline a booking",
+    description: "The provided authorization header refers to the owner of the booking.",
   })
-  @ApiOperation({ summary: "Decline booking that requires a confirmation" })
   async declineBooking(
     @Param("bookingUid") bookingUid: string,
     @Body() body: DeclineBookingInput_2024_08_13,
@@ -335,4 +363,23 @@ export class BookingsController_2024_08_13 {
       data: booking,
     };
   }
+
+  @Get("/:bookingUid/calendar-links")
+  @UseGuards(ApiAuthGuard, BookingUidGuard)
+  @Permissions([BOOKING_READ])
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @ApiOperation({
+    summary: "Get 'Add to Calendar' links for a booking",
+    description:
+      "Retrieve calendar links for a booking that can be used to add the event to various calendar services. Returns links for Google Calendar, Microsoft Office, Microsoft Outlook, and a downloadable ICS file.",
+  })
+  @HttpCode(HttpStatus.OK)
+  async getCalendarLinks(@Param("bookingUid") bookingUid: string): Promise<CalendarLinksOutput_2024_08_13> {
+    const calendarLinks = await this.bookingsService.getCalendarLinks(bookingUid);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: calendarLinks,
+    };
+  }
 }

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts

@@ -30,7 +30,7 @@ import {
   OrganizerRescheduledEmail,
   AttendeeCancelledEmail,
   OrganizerCancelledEmail,
-} from "@calcom/platform-libraries";
+} from "@calcom/platform-libraries/emails";
 import {
   CreateBookingInput_2024_08_13,
   BookingOutput_2024_08_13,
@@ -189,7 +189,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             createdBooking = data;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });
@@ -238,7 +238,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             rescheduledBooking = data;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts

@@ -434,7 +434,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
     }
 
     describe("get individual booking", () => {
-      it("should should get a seated booking with split name responses", async () => {
+      it("should get a seated booking with split name responses", async () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings/${bookingWithSplitName.uid}`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
@@ -451,13 +451,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.bookingFieldsResponses.name).toEqual(splitName);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
       });
 
-      it("should should get a seated booking with split name responses", async () => {
+      it("should get a seated booking with split name responses", async () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings/${seatedBookingWithSplitName.uid}`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
@@ -476,7 +476,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.attendees[0].bookingFieldsResponses.name).toEqual(splitName);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -536,7 +536,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.bookingFieldsResponses["video-url"]).toEqual("http://video-url.com");
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/calendar-links.e2e-spec.ts

@@ -0,0 +1,185 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import { Booking, PlatformOAuthClient, Team } from "@calcom/prisma/client";
+
+describe("Bookings Endpoints 2024-08-13", () => {
+  describe("Calendar Links", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = `calendar-links-2024-08-13-user-${randomString()}@api.com`;
+    let user: User;
+    let booking: Booking;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({
+        name: `confirm-bookings-2024-08-13-organization-${randomString()}`,
+      });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: `calendar-links-2024-08-13-${randomString()}-schedule`,
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+      const event = await eventTypesRepositoryFixture.create(
+        {
+          title: `calendar-links-2024-08-13-${randomString()}-event-type`,
+          slug: `calendar-links-2024-08-13-${randomString()}-event-type-slug`,
+          length: 60,
+        },
+        user.id
+      );
+
+      booking = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 12, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 13, 0, 0)),
+        uid: `calendar-links-2024-08-13-booking-${randomString()}`,
+        title: "Test Booking",
+        eventType: {
+          connect: {
+            id: event.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        attendees: {
+          create: {
+            email: "johndoe@example.com",
+            name: "John Doe",
+            locale: "en",
+            timeZone: "America/New_York",
+          },
+        },
+        responses: {
+          create: {
+            name: "John Doe",
+            email: "johndoe@example.com",
+          },
+        },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should get calendar links for a booking", async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/v2/bookings/${booking.uid}/calendar-links`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200);
+
+      expect(response.body.status).toEqual(SUCCESS_STATUS);
+      expect(response.body.data).toBeDefined();
+
+      const googleCalendarLink = response.body.data.find(
+        (item: { id: string }) => item.id === "googleCalendar"
+      ).link;
+      const microsoftOfficeLink = response.body.data.find(
+        (item: { id: string }) => item.id === "microsoftOffice"
+      ).link;
+      const microsoftOutlookLink = response.body.data.find(
+        (item: { id: string }) => item.id === "microsoftOutlook"
+      ).link;
+      const icsLink = response.body.data.find((item: { id: string }) => item.id === "ics").link;
+
+      expect(googleCalendarLink).toMatch(/^https:\/\/calendar\.google\.com\//);
+      expect(microsoftOfficeLink).toMatch(/^https:\/\/outlook\.office\.com\//);
+      expect(microsoftOutlookLink).toMatch(/^https:\/\/outlook\.live\.com\//);
+      expect(icsLink).toMatch(/^data:text\/calendar,/);
+    });
+
+    it("should return 404 for non-existent booking", async () => {
+      await request(app.getHttpServer())
+        .get(`/v2/bookings/non-existent-uid/calendar-links`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(404);
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+});

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts

@@ -174,7 +174,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(dbBooking?.status).toEqual("ACCEPTED");
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });
@@ -235,7 +235,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(dbBooking?.status).toEqual("REJECTED");
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts

@@ -34,7 +34,7 @@ import {
   AttendeeRequestEmail,
   OrganizerRequestEmail,
   AttendeeDeclinedEmail,
-} from "@calcom/platform-libraries";
+} from "@calcom/platform-libraries/emails";
 import {
   CreateBookingInput_2024_08_13,
   BookingOutput_2024_08_13,
@@ -94,6 +94,8 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
   let emailsDisabledSetup: EmailSetup;
 
   const authEmail = `confirm-emails-2024-08-13-admin-${randomString()}@api.com`;
+  let userEmailsEnabled = "";
+  const userEmailsDisabled = `confirm-emails-2024-08-13-user-${randomString()}@api.com`;
 
   beforeAll(async () => {
     const moduleRef = await withApiAuth(
@@ -141,8 +143,12 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
   async function setupEnabledEmails() {
     const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
 
+    userEmailsEnabled = `confirm-emails-2024-08-13-user-${randomString()}+${
+      oAuthClientEmailsEnabled.id
+    }@api.com`;
+
     const user = await userRepositoryFixture.create({
-      email: `confirm-emails-2024-08-13-user-${randomString()}@api.com`,
+      email: userEmailsEnabled,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsEnabled.id,
@@ -179,7 +185,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
     const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
 
     const user = await userRepositoryFixture.create({
-      email: `confirm-emails-2024-08-13-user-${randomString()}@api.com`,
+      email: userEmailsDisabled,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsDisabled.id,
@@ -265,7 +271,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
             emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });
@@ -282,9 +288,6 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
           expect(responseBody.data).toBeDefined();
           expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
           expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          emailsDisabledSetup.rescheduledBookingUid = responseBody.data.uid;
         });
     });
 
@@ -322,7 +325,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
             emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });
@@ -338,10 +341,6 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(AttendeeDeclinedEmail.prototype.getHtml).not.toHaveBeenCalled();
-
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          emailsDisabledSetup.rescheduledBookingUid = responseBody.data.uid;
         });
     });
   });
@@ -351,117 +350,176 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
       jest.clearAllMocks();
     });
 
-    it("should send an email when creating a booking that requires confirmation", async () => {
-      const body: CreateBookingInput_2024_08_13 = {
-        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
-        eventTypeId: emailsEnabledSetup.eventTypeId,
-        attendee: {
-          name: "Mr Proper",
-          email: "mr_proper@gmail.com",
-          timeZone: "Europe/Rome",
-          language: "it",
-        },
-        location: "https://meet.google.com/abc-def-ghi",
-        bookingFieldsResponses: {
-          customField: "customValue",
-        },
-        metadata: {
-          userId: "100",
-        },
-      };
+    describe("confirming booking that requires confirmation and rescheduling it", () => {
+      it("should send an email when creating a booking that requires confirmation", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: emailsEnabledSetup.eventTypeId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
 
-      return request(app.getHttpServer())
-        .post("/v2/bookings")
-        .send(body)
-        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-        .expect(201)
-        .then(async (response) => {
-          const responseBody: CreateBookingOutput_2024_08_13 = response.body;
-          expect(responseBody.status).toEqual(SUCCESS_STATUS);
-          if (responseDataIsBooking(responseBody.data)) {
-            expect(responseBody.data.status).toEqual("pending");
-            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
-            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
-            emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
-          } else {
-            throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
-            );
-          }
+        return request(app.getHttpServer())
+          .post("/v2/bookings")
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(responseBody.data.status).toEqual("pending");
+              expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+              expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+              emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
+      it("should send an email when confirming a booking", async () => {
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/confirm`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+          });
+      });
+
+      describe("rescheduling emails", () => {
+        it("should send confirmation emails when organizer reschedules a booking that requires confirmation", async () => {
+          const body: RescheduleBookingInput_2024_08_13 = {
+            start: new Date(Date.UTC(2030, 0, 8, 14, 30, 0)).toISOString(),
+            rescheduledBy: userEmailsEnabled,
+          };
+
+          return request(app.getHttpServer())
+            .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/reschedule`)
+            .send(body)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .expect(201)
+            .then(async (response) => {
+              const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+              expect(responseBody.status).toEqual(SUCCESS_STATUS);
+              if (responseDataIsBooking(responseBody.data)) {
+                expect(responseBody.data.status).toEqual("accepted");
+                expect(AttendeeRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+                expect(OrganizerRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+
+                expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+                expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+                emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
+              } else {
+                throw new Error(
+                  "Invalid response data - expected booking but received array of possibily recurring bookings"
+                );
+              }
+            });
         });
+
+        it("should send requested rescheduling emails when attendee rescheduling a booking that requires confirmation", async () => {
+          const body: RescheduleBookingInput_2024_08_13 = {
+            start: new Date(Date.UTC(2030, 0, 8, 9, 0, 0)).toISOString(),
+          };
+
+          return request(app.getHttpServer())
+            .post(`/v2/bookings/${emailsEnabledSetup.rescheduledBookingUid}/reschedule`)
+            .send(body)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .expect(201)
+            .then(async (response) => {
+              const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+              expect(responseBody.status).toEqual(SUCCESS_STATUS);
+              if (responseDataIsBooking(responseBody.data)) {
+                expect(responseBody.data.status).toEqual("pending");
+                expect(AttendeeRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+                expect(OrganizerRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+
+                expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+                expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+                emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
+              } else {
+                throw new Error(
+                  "Invalid response data - expected booking but received array of possibily recurring bookings"
+                );
+              }
+            });
+        });
+      });
     });
 
-    it("should send an email when confirming a booking", async () => {
-      return request(app.getHttpServer())
-        .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/confirm`)
-        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-        .expect(200)
-        .then(async (response) => {
-          const responseBody: GetBookingOutput_2024_08_13 = response.body;
-          expect(responseBody.status).toEqual(SUCCESS_STATUS);
-          expect(responseBody.data).toBeDefined();
-          expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
-          expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
-        });
-    });
+    describe("declining booking that requires confirmation", () => {
+      it("should send an email when creating a booking that requires confirmation", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
+          eventTypeId: emailsEnabledSetup.eventTypeId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
 
-    it("should send an email when creating a booking that requires confirmation", async () => {
-      const body: CreateBookingInput_2024_08_13 = {
-        start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
-        eventTypeId: emailsEnabledSetup.eventTypeId,
-        attendee: {
-          name: "Mr Proper",
-          email: "mr_proper@gmail.com",
-          timeZone: "Europe/Rome",
-          language: "it",
-        },
-        location: "https://meet.google.com/abc-def-ghi",
-        bookingFieldsResponses: {
-          customField: "customValue",
-        },
-        metadata: {
-          userId: "100",
-        },
-      };
+        return request(app.getHttpServer())
+          .post("/v2/bookings")
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(responseBody.data.status).toEqual("pending");
+              expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+              expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+              emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
 
-      return request(app.getHttpServer())
-        .post("/v2/bookings")
-        .send(body)
-        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-        .expect(201)
-        .then(async (response) => {
-          const responseBody: CreateBookingOutput_2024_08_13 = response.body;
-          expect(responseBody.status).toEqual(SUCCESS_STATUS);
-          if (responseDataIsBooking(responseBody.data)) {
-            expect(responseBody.data.status).toEqual("pending");
-            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
-            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
-            emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
-          } else {
-            throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
-            );
-          }
-        });
-    });
-
-    it("should send an email when declining a booking", async () => {
-      return request(app.getHttpServer())
-        .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/decline`)
-        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-        .expect(200)
-        .then(async (response) => {
-          const responseBody: GetBookingOutput_2024_08_13 = response.body;
-          expect(responseBody.status).toEqual(SUCCESS_STATUS);
-          expect(responseBody.data).toBeDefined();
-          expect(AttendeeDeclinedEmail.prototype.getHtml).toHaveBeenCalled();
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
-        });
+      it("should send an email when declining a booking", async () => {
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/decline`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeDeclinedEmail.prototype.getHtml).toHaveBeenCalled();
+          });
+      });
     });
   });
 

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts

@@ -36,7 +36,7 @@ import {
   AttendeeCancelledEmail,
   OrganizerReassignedEmail,
   AttendeeUpdatedEmail,
-} from "@calcom/platform-libraries";
+} from "@calcom/platform-libraries/emails";
 import {
   CreateBookingInput_2024_08_13,
   BookingOutput_2024_08_13,
@@ -570,7 +570,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
               emailsDisabledSetup.collectiveEventType.createdBookingUid = responseBody.data.uid;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -610,7 +610,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
               emailsDisabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -787,7 +787,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
               emailsEnabledSetup.collectiveEventType.createdBookingUid = responseBody.data.uid;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -827,7 +827,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
               emailsEnabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts

@@ -30,7 +30,7 @@ import {
   AttendeeRescheduledEmail,
   OrganizerCancelledEmail,
   AttendeeCancelledEmail,
-} from "@calcom/platform-libraries";
+} from "@calcom/platform-libraries/emails";
 import {
   CreateBookingInput_2024_08_13,
   BookingOutput_2024_08_13,
@@ -261,7 +261,7 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
             emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });
@@ -381,7 +381,7 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
             emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
           } else {
             throw new Error(
-              "Invalid response data - expected booking but received array of possibily recurring bookings"
+              "Invalid response data - expected booking but received array of possibly recurring bookings"
             );
           }
         });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/managed-user-bookings.e2e-spec.ts

@@ -0,0 +1,555 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { HttpExceptionFilter } from "@/filters/http-exception.filter";
+import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
+import { Locales } from "@/lib/enums/locales";
+import {
+  CreateManagedUserData,
+  CreateManagedUserOutput,
+} from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
+import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { PlatformOAuthClient, Team, User } from "@prisma/client";
+import * as request from "supertest";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+
+import {
+  CAL_API_VERSION_HEADER,
+  SUCCESS_STATUS,
+  VERSION_2024_06_14,
+  VERSION_2024_08_13,
+} from "@calcom/platform-constants";
+import {
+  ApiSuccessResponse,
+  BookingOutput_2024_08_13,
+  CreateBookingInput_2024_08_13,
+  CreateEventTypeInput_2024_06_14,
+  EventTypeOutput_2024_06_14,
+  GetBookingsOutput_2024_08_13,
+} from "@calcom/platform-types";
+
+const CLIENT_REDIRECT_URI = "http://localhost:4321";
+
+describe("Managed user bookings 2024-08-13", () => {
+  let app: INestApplication;
+
+  let oAuthClient: PlatformOAuthClient;
+  let organization: Team;
+  let userRepositoryFixture: UserRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+  let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+  let schedulesRepositoryFixture: SchedulesRepositoryFixture;
+  let profilesRepositoryFixture: ProfileRepositoryFixture;
+  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+  const platformAdminEmail = `managed-users-bookings-2024-08-13-admin-${randomString()}@api.com`;
+  let platformAdmin: User;
+
+  const managedUsersTimeZone = "Europe/Rome";
+  const firstManagedUserEmail = `managed-user-bookings-2024-08-13-first-user-${randomString()}@api.com`;
+  const secondManagedUserEmail = `managed-user-bookings-2024-08-13-second-user-${randomString()}@api.com`;
+  const thirdManagedUserEmail = `managed-user-bookings-2024-08-13-third-user-${randomString()}@api.com`;
+
+  let firstManagedUser: CreateManagedUserData;
+  let secondManagedUser: CreateManagedUserData;
+  let thirdManagedUser: CreateManagedUserData;
+
+  let firstManagedUserEventTypeId: number;
+
+  let firstManagedUserBookingsCount = 0;
+  let secondManagedUserBookingsCount = 0;
+  let thirdManagedUserBookingsCount = 0;
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      providers: [PrismaExceptionFilter, HttpExceptionFilter],
+      imports: [AppModule, UsersModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+    schedulesRepositoryFixture = new SchedulesRepositoryFixture(moduleRef);
+    profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+    platformAdmin = await userRepositoryFixture.create({ email: platformAdminEmail });
+
+    organization = await teamRepositoryFixture.create({
+      name: `oauth-client-users-organization-${randomString()}`,
+      isPlatform: true,
+      isOrganization: true,
+    });
+    oAuthClient = await createOAuthClient(organization.id);
+
+    await profilesRepositoryFixture.create({
+      uid: "asd1qwwqeqw-asddsadasd",
+      username: platformAdminEmail,
+      organization: { connect: { id: organization.id } },
+      user: {
+        connect: { id: platformAdmin.id },
+      },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "OWNER",
+      user: { connect: { id: platformAdmin.id } },
+      team: { connect: { id: organization.id } },
+      accepted: true,
+    });
+
+    await app.init();
+  });
+
+  async function createOAuthClient(organizationId: number) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: [CLIENT_REDIRECT_URI],
+      permissions: 1023,
+    };
+    const secret = "secret";
+
+    const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+    return client;
+  }
+
+  it(`should create first managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: firstManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Alice Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    firstManagedUser = responseBody.data;
+  });
+
+  it("should create an event type for managed user", async () => {
+    const body: CreateEventTypeInput_2024_06_14 = {
+      title: "Managed user bookings first managed user event type",
+      slug: "managed-user-bookings-first-managed-user-event-type",
+      description: "Managed user bookings first managed user event type description",
+      lengthInMinutes: 30,
+    };
+
+    return request(app.getHttpServer())
+      .post("/api/v2/event-types")
+      .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+      .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+      .send(body)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+        const createdEventType = responseBody.data;
+        expect(createdEventType).toHaveProperty("id");
+        expect(createdEventType.title).toEqual(body.title);
+        expect(createdEventType.description).toEqual(body.description);
+        expect(createdEventType.lengthInMinutes).toEqual(body.lengthInMinutes);
+        expect(createdEventType.ownerId).toEqual(firstManagedUser.user.id);
+        firstManagedUserEventTypeId = createdEventType.id;
+      });
+  });
+
+  it(`should create second managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: secondManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Bob Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    secondManagedUser = responseBody.data;
+  });
+
+  it(`should create third managed user`, async () => {
+    const requestBody: CreateManagedUserInput = {
+      email: thirdManagedUserEmail,
+      timeZone: managedUsersTimeZone,
+      weekStart: "Monday",
+      timeFormat: 24,
+      locale: Locales.FR,
+      name: "Charlie Smith",
+      avatarUrl: "https://cal.com/api/avatar/2b735186-b01b-46d3-87da-019b8f61776b.png",
+    };
+
+    const response = await request(app.getHttpServer())
+      .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+      .set("x-cal-secret-key", oAuthClient.secret)
+      .send(requestBody)
+      .expect(201);
+
+    const responseBody: CreateManagedUserOutput = response.body;
+    expect(responseBody.status).toEqual(SUCCESS_STATUS);
+    expect(responseBody.data).toBeDefined();
+    expect(responseBody.data.user.email).toEqual(
+      OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
+    );
+    expect(responseBody.data.accessToken).toBeDefined();
+    expect(responseBody.data.refreshToken).toBeDefined();
+
+    thirdManagedUser = responseBody.data;
+  });
+
+  describe("bookings using original emails", () => {
+    it("managed user should be booked by managed user attendee and booking shows up in both users' bookings", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId: firstManagedUserEventTypeId,
+        attendee: {
+          name: secondManagedUser.user.name!,
+          email: secondManagedUserEmail,
+          timeZone: secondManagedUser.user.timeZone,
+          language: secondManagedUser.user.locale,
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+      };
+
+      await request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getFirstManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getSecondManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserBookingsResponseBody.data;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+
+    it("managed user should be booked by managed user attendee and managed user as a guest and booking shows up in all three users' bookings", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString(),
+        eventTypeId: firstManagedUserEventTypeId,
+        attendee: {
+          name: thirdManagedUser.user.name!,
+          email: thirdManagedUserEmail,
+          timeZone: thirdManagedUser.user.timeZone,
+          language: thirdManagedUser.user.locale,
+        },
+        guests: [secondManagedUserEmail],
+        location: "https://meet.google.com/abc-def-ghi",
+      };
+
+      await request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+      thirdManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getFirstManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getSecondManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserBookingsResponseBody.data;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+
+      const getThirdManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${thirdManagedUser.accessToken}`)
+        .expect(200);
+
+      const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getThirdManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const thirdManagedUserBookings: BookingOutput_2024_08_13[] = thirdManagedUserBookingsResponseBody.data;
+      expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+  });
+
+  describe("bookings using OAuth client emails", () => {
+    it("managed user should be booked by managed user attendee and booking shows up in both users' bookings", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 15, 0, 0)).toISOString(),
+        eventTypeId: firstManagedUserEventTypeId,
+        attendee: {
+          name: secondManagedUser.user.name!,
+          email: secondManagedUser.user.email,
+          timeZone: secondManagedUser.user.timeZone,
+          language: secondManagedUser.user.locale,
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+      };
+
+      await request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getFirstManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getSecondManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserBookingsResponseBody.data;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+
+    it("managed user should be booked by managed user attendee and managed user as a guest and booking shows up in all three users' bookings", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 15, 30, 0)).toISOString(),
+        eventTypeId: firstManagedUserEventTypeId,
+        attendee: {
+          name: thirdManagedUser.user.name!,
+          email: thirdManagedUser.user.email,
+          timeZone: thirdManagedUser.user.timeZone,
+          language: thirdManagedUser.user.locale,
+        },
+        guests: [secondManagedUser.user.email],
+        location: "https://meet.google.com/abc-def-ghi",
+      };
+
+      await request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201);
+
+      firstManagedUserBookingsCount += 1;
+      secondManagedUserBookingsCount += 1;
+      thirdManagedUserBookingsCount += 1;
+
+      const getFirstManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getFirstManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data;
+      expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount);
+
+      const getSecondManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getSecondManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserBookingsResponseBody.data;
+      expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount);
+
+      const getThirdManagedUserBookings = await request(app.getHttpServer())
+        .get("/v2/bookings")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${thirdManagedUser.accessToken}`)
+        .expect(200);
+
+      const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 =
+        getThirdManagedUserBookings.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const thirdManagedUserBookings: BookingOutput_2024_08_13[] = thirdManagedUserBookingsResponseBody.data;
+      expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+  });
+
+  describe("fetch bookings by attendeeEmail", () => {
+    it("should return bookings for the original email when original email is attendee only", async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/v2/bookings?attendeeEmail=${thirdManagedUserEmail}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const thirdManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const thirdManagedUserAttendeeBookings: BookingOutput_2024_08_13[] =
+        thirdManagedUserAttendeeBookingsResponseBody.data;
+      expect(thirdManagedUserBookingsCount).toEqual(2);
+      expect(thirdManagedUserAttendeeBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+
+    it("should return bookings for the oAuth email when original oAuth email is attendee only", async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/v2/bookings?attendeeEmail=${thirdManagedUser.user.email}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const thirdManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const thirdManagedUserAttendeeBookings: BookingOutput_2024_08_13[] =
+        thirdManagedUserAttendeeBookingsResponseBody.data;
+      expect(thirdManagedUserBookingsCount).toEqual(2);
+      expect(thirdManagedUserAttendeeBookings.length).toEqual(thirdManagedUserBookingsCount);
+    });
+
+    it("should return bookings for the original email when original email is attendee or guest", async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/v2/bookings?attendeeEmail=${secondManagedUserEmail}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserAttendeeBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserAttendeeBookingsResponseBody.data;
+      expect(secondManagedUserBookingsCount).toEqual(4);
+      expect(secondManagedUserAttendeeBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+
+    it("should return bookings for the oAuth email when original oAuth email is attendee or guest", async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/v2/bookings?attendeeEmail=${secondManagedUser.user.email}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(200);
+
+      const secondManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const secondManagedUserAttendeeBookings: BookingOutput_2024_08_13[] =
+        secondManagedUserAttendeeBookingsResponseBody.data;
+      expect(secondManagedUserBookingsCount).toEqual(4);
+      expect(secondManagedUserAttendeeBookings.length).toEqual(secondManagedUserBookingsCount);
+    });
+  });
+
+  afterAll(async () => {
+    await userRepositoryFixture.delete(firstManagedUser.user.id);
+    await userRepositoryFixture.delete(secondManagedUser.user.id);
+    await userRepositoryFixture.delete(thirdManagedUser.user.id);
+    await userRepositoryFixture.delete(platformAdmin.id);
+    await oauthClientRepositoryFixture.delete(oAuthClient.id);
+    await teamRepositoryFixture.delete(organization.id);
+    await app.close();
+  });
+});

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts

@@ -21,7 +21,7 @@ import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
-import { AttendeeCancelledEmail, OrganizerCancelledEmail } from "@calcom/platform-libraries";
+import { AttendeeCancelledEmail, OrganizerCancelledEmail } from "@calcom/platform-libraries/emails";
 import {
   CreateRecurringBookingInput_2024_08_13,
   RecurringBookingOutput_2024_08_13,
@@ -684,7 +684,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
         });
     });
 
-    it("should cancel all remaning recurrences", async () => {
+    it("should cancel all remaining recurrences", async () => {
       const recurringBookingUid = recurringBooking[0].recurringBookingUid;
 
       return request(app.getHttpServer())

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts

@@ -40,6 +40,8 @@ import {
 import { PlatformOAuthClient, Team } from "@calcom/prisma/client";
 
 describe("Bookings Endpoints 2024-08-13", () => {
+  const googleMeetUrl = "https://meet.google.com/abc-def-ghi";
+
   describe("Seated bookings", () => {
     let app: INestApplication;
     let organization: Team;
@@ -330,7 +332,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           timeZone: "Europe/Rome",
           language: "it",
         },
-        location: "https://meet.google.com/abc-def-ghi",
+        location: googleMeetUrl,
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
@@ -383,6 +385,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });
@@ -418,6 +424,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });
@@ -797,7 +807,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           timeZone: "Europe/Rome",
           language: "it",
         },
-        location: "https://meet.google.com/abc-def-ghi",
+        location: googleMeetUrl,
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
@@ -850,6 +860,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });
@@ -885,6 +899,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });
@@ -910,7 +928,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           timeZone: "Europe/Rome",
           language: "it",
         },
-        location: "https://meet.google.com/abc-def-ghi",
+        location: googleMeetUrl,
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
@@ -966,6 +984,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: nameAttendeeOne,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
@@ -982,6 +1004,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: nameAttendeeTwo,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });
@@ -1017,6 +1043,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: nameAttendeeOne,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
@@ -1030,6 +1060,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               bookingFieldsResponses: {
                 name: nameAttendeeTwo,
                 ...body.bookingFieldsResponses,
+                location: {
+                  optionValue: googleMeetUrl,
+                  value: "link",
+                },
               },
               metadata: body.metadata,
             });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts

@@ -1,6 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
 import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
@@ -31,6 +32,7 @@ import {
   RecurringBookingOutput_2024_08_13,
   GetBookingsOutput_2024_08_13,
   GetSeatedBookingOutput_2024_08_13,
+  RescheduleBookingInput_2024_08_13,
 } from "@calcom/platform-types";
 import { PlatformOAuthClient, Team } from "@calcom/prisma/client";
 
@@ -66,6 +68,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
     const team2EventTypeSlug = `team-bookings-event-type-${randomString()}`;
     const phoneOnlyEventTypeSlug = `team-bookings-event-type-${randomString()}`;
 
+    let phoneBasedBooking: BookingOutput_2024_08_13;
+
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         teamUserEmail,
@@ -401,19 +405,20 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.absentHost).toEqual(false);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
       });
 
       it("should create a phone based booking", async () => {
+        const phoneNumber = "+919876543210";
         const body: CreateBookingInput_2024_08_13 = {
           start: new Date(Date.UTC(2030, 0, 8, 15, 0, 0)).toISOString(),
           eventTypeId: phoneOnlyEventTypeId,
           attendee: {
             name: "alice",
-            phoneNumber: "+919876543210",
+            phoneNumber,
             timeZone: "Europe/Madrid",
             language: "es",
           },
@@ -453,9 +458,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
               });
               expect(data.meetingUrl).toEqual(body.meetingUrl);
               expect(data.absentHost).toEqual(false);
+              expect(data.bookingFieldsResponses.attendeePhoneNumber).toEqual(phoneNumber);
+              phoneBasedBooking = data;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -515,7 +522,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.absentHost).toEqual(false);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -523,7 +530,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
     });
 
     describe("get team bookings", () => {
-      it("should should get bookings by teamId", async () => {
+      it("should get bookings by teamId", async () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings?teamId=${team1.id}`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
@@ -542,7 +549,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           });
       });
 
-      it("should should get bookings by teamId", async () => {
+      it("should get bookings by teamId", async () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings?teamId=${team2.id}`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
@@ -584,21 +591,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings?teamId=${team2.id}&eventTypeId=90909`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-          .expect(200)
-          .then(async (response) => {
-            const responseBody: GetBookingsOutput_2024_08_13 = response.body;
-            expect(responseBody.status).toEqual(SUCCESS_STATUS);
-            expect(responseBody.data).toBeDefined();
-            const data: (
-              | BookingOutput_2024_08_13
-              | RecurringBookingOutput_2024_08_13
-              | GetSeatedBookingOutput_2024_08_13
-            )[] = responseBody.data;
-            expect(data.length).toEqual(0);
-          });
+          .expect(400);
       });
 
-      it("should should get bookings by teamIds", async () => {
+      it("should get bookings by teamIds", async () => {
         return request(app.getHttpServer())
           .get(`/v2/bookings?teamIds=${team1.id},${team2.id}`)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
@@ -619,6 +615,59 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
     });
 
+    describe("reschedule", () => {
+      it("should reschedule phone based booking", async () => {
+        const body: RescheduleBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2035, 0, 8, 14, 0, 0)).toISOString(),
+          reschedulingReason: "Flying to mars that day",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${phoneBasedBooking.uid}/reschedule`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.id).toBeDefined();
+              expect(data.uid).toBeDefined();
+              expect(data.hosts.length).toEqual(1);
+              expect(data.hosts[0].id).toEqual(teamUser.id);
+              expect(data.status).toEqual("accepted");
+              expect(data.start).toEqual(body.start);
+              expect(data.end).toEqual(new Date(Date.UTC(2035, 0, 8, 14, 15, 0)).toISOString());
+              expect(data.duration).toEqual(15);
+              expect(data.eventTypeId).toEqual(phoneOnlyEventTypeId);
+              expect(data.attendees.length).toEqual(1);
+              expect(data.attendees[0]).toEqual({
+                name: phoneBasedBooking.attendees[0].name,
+                email: phoneBasedBooking.attendees[0].email,
+                phoneNumber: phoneBasedBooking.attendees[0].phoneNumber,
+                timeZone: phoneBasedBooking.attendees[0].timeZone,
+                language: phoneBasedBooking.attendees[0].language,
+                absent: false,
+              });
+              expect(data.meetingUrl).toEqual(phoneBasedBooking.meetingUrl);
+              expect(data.absentHost).toEqual(false);
+              expect(data.bookingFieldsResponses.attendeePhoneNumber).toEqual(
+                phoneBasedBooking.bookingFieldsResponses.attendeePhoneNumber
+              );
+              phoneBasedBooking = data;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
     async function createOAuthClient(organizationId: number) {
       const data = {
         logo: "logo-url",

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts

@@ -194,7 +194,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.duration).toEqual(variableLengthEventType.length);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -239,7 +239,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.duration).toEqual(lengthInMinutes);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });

apps/api/v2/src/ee/bookings/2024-08-13/outputs/calendar-links.output.ts

@@ -0,0 +1,33 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum, IsString } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class CalendarLink {
+  @IsString()
+  @ApiProperty({
+    description: "The label of the calendar link",
+  })
+  label!: string;
+
+  @IsString()
+  @ApiProperty({
+    description: "The link to the calendar",
+  })
+  link!: string;
+}
+
+export class CalendarLinksOutput_2024_08_13 {
+  @ApiProperty({
+    description: "The status of the request, always 'success' for successful responses",
+    example: SUCCESS_STATUS,
+  })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    description: "Calendar links for the booking",
+    type: [CalendarLink],
+  })
+  data!: CalendarLink[];
+}

apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts

@@ -1,9 +1,13 @@
 import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.repository";
+import { CalendarLink } from "@/ee/bookings/2024-08-13/outputs/calendar-links.output";
 import { InputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/input.service";
 import { OutputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/output.service";
+import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
 import { BillingService } from "@/modules/billing/services/billing.service";
 import { BookingSeatRepository } from "@/modules/booking-seat/booking-seat.repository";
+import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UsersRepository, UserWithProfile } from "@/modules/users/users.repository";
@@ -14,6 +18,7 @@ import { z } from "zod";
 
 import {
   handleNewRecurringBooking,
+  getTranslation,
   getAllUserBookings,
   handleInstantMeeting,
   handleCancelBooking,
@@ -21,6 +26,7 @@ import {
   roundRobinManualReassignment,
   handleMarkNoShow,
   confirmBookingHandler,
+  getCalendarLinks,
 } from "@calcom/platform-libraries";
 import { handleNewBooking } from "@calcom/platform-libraries";
 import {
@@ -39,7 +45,7 @@ import {
   CancelBookingInput,
 } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
-import { EventType } from "@calcom/prisma/client";
+import { EventType, User, Team } from "@calcom/prisma/client";
 
 type CreatedBooking = {
   hosts: { id: number }[];
@@ -55,6 +61,8 @@ const eventTypeBookingFieldSchema = z.object({
 
 const eventTypeBookingFieldsSchema = z.array(eventTypeBookingFieldSchema);
 
+export type EventTypeWithOwnerAndTeam = EventType & { owner: User | null; team: Team | null };
+
 @Injectable()
 export class BookingsService_2024_08_13 {
   private readonly logger = new Logger("BookingsService");
@@ -67,32 +75,50 @@ export class BookingsService_2024_08_13 {
     private readonly prismaReadService: PrismaReadService,
     private readonly billingService: BillingService,
     private readonly usersService: UsersService,
-    private readonly usersRepository: UsersRepository
+    private readonly usersRepository: UsersRepository,
+    private readonly platformBookingsService: PlatformBookingsService,
+    private readonly oAuthClientRepository: OAuthClientRepository
   ) {}
 
   async createBooking(request: Request, body: CreateBookingInput) {
     try {
-      if ("instant" in body && body.instant) {
-        return await this.createInstantBooking(request, body);
+      const eventType = await this.getBookedEventType(body);
+      if (!eventType) {
+        if (body.username && body.eventTypeSlug && !body.organizationSlug) {
+          throw new NotFoundException(
+            `Event type with slug ${body.eventTypeSlug} belonging to user ${body.username} not found.`
+          );
+        }
+        if (body.username && body.eventTypeSlug && body.organizationSlug) {
+          throw new NotFoundException(
+            `Event type with slug ${body.eventTypeSlug} belonging to user ${body.username} within organization ${body.organizationSlug} not found.`
+          );
+        }
+        throw new NotFoundException(`Event type with id ${body.eventTypeId} not found.`);
+      }
+
+      body.eventTypeId = eventType.id;
+
+      if ("instant" in body && body.instant) {
+        return await this.createInstantBooking(request, body, eventType);
       }
 
-      const eventType = await this.eventTypesRepository.getEventTypeById(body.eventTypeId);
       const isRecurring = !!eventType?.recurringEvent;
       const isSeated = !!eventType?.seatsPerTimeSlot;
 
       await this.hasRequiredBookingFieldsResponses(body, eventType);
 
       if (isRecurring && isSeated) {
-        return await this.createRecurringSeatedBooking(request, body);
+        return await this.createRecurringSeatedBooking(request, body, eventType);
       }
       if (isRecurring && !isSeated) {
-        return await this.createRecurringBooking(request, body);
+        return await this.createRecurringBooking(request, body, eventType);
       }
       if (isSeated) {
-        return await this.createSeatedBooking(request, body);
+        return await this.createSeatedBooking(request, body, eventType);
       }
 
-      return await this.createRegularBooking(request, body);
+      return await this.createRegularBooking(request, body, eventType);
     } catch (error) {
       if (error instanceof Error) {
         if (error.message === "no_available_users_found_error") {
@@ -103,6 +129,22 @@ export class BookingsService_2024_08_13 {
     }
   }
 
+  async getBookedEventType(body: CreateBookingInput) {
+    if (body.eventTypeId) {
+      return await this.eventTypesRepository.getEventTypeByIdWithOwnerAndTeam(body.eventTypeId);
+    } else if (body.username && body.eventTypeSlug) {
+      const user = await this.usersRepository.findByUsername(body.username, body.organizationSlug);
+      if (!user) {
+        throw new NotFoundException(`User with username ${body.username} not found`);
+      }
+      return await this.eventTypesRepository.getUserEventTypeBySlugWithOwnerAndTeam(
+        user.id,
+        body.eventTypeSlug
+      );
+    }
+    return null;
+  }
+
   async hasRequiredBookingFieldsResponses(body: CreateBookingInput, eventType: EventType | null) {
     const bookingFields = body.bookingFieldsResponses;
     if (!bookingFields || !eventType || !eventType.bookingFields) {
@@ -125,8 +167,12 @@ export class BookingsService_2024_08_13 {
     return true;
   }
 
-  async createInstantBooking(request: Request, body: CreateInstantBookingInput_2024_08_13) {
-    const bookingRequest = await this.inputService.createBookingRequest(request, body);
+  async createInstantBooking(
+    request: Request,
+    body: CreateInstantBookingInput_2024_08_13,
+    eventType: EventTypeWithOwnerAndTeam
+  ) {
+    const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
     const booking = await handleInstantMeeting(bookingRequest);
 
     const databaseBooking = await this.bookingsRepository.getByIdWithAttendeesAndUserAndEvent(
@@ -139,24 +185,52 @@ export class BookingsService_2024_08_13 {
     return this.outputService.getOutputBooking(databaseBooking);
   }
 
-  async createRecurringBooking(request: Request, body: CreateRecurringBookingInput_2024_08_13) {
-    const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body);
-    const bookings = await handleNewRecurringBooking(bookingRequest);
+  async createRecurringBooking(request: Request, body: CreateRecurringBookingInput_2024_08_13, eventType: EventTypeWithOwnerAndTeam) {
+    const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body, eventType);
+    const bookings = await handleNewRecurringBooking({
+      bookingData: bookingRequest.body,
+      userId: bookingRequest.userId,
+      hostname: bookingRequest.headers?.host || "",
+      platformClientId: bookingRequest.platformClientId,
+      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+      platformCancelUrl: bookingRequest.platformCancelUrl,
+      platformBookingUrl: bookingRequest.platformBookingUrl,
+      platformBookingLocation: bookingRequest.platformBookingLocation,
+      noEmail: bookingRequest.noEmail,
+    });
     const ids = bookings.map((booking) => booking.id || 0);
     return this.outputService.getOutputRecurringBookings(ids);
   }
 
-  async createRecurringSeatedBooking(request: Request, body: CreateRecurringBookingInput_2024_08_13) {
-    const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body);
-    const bookings = await handleNewRecurringBooking(bookingRequest);
+  async createRecurringSeatedBooking(request: Request, body: CreateRecurringBookingInput_2024_08_13, eventType: EventTypeWithOwnerAndTeam) {
+    const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body, eventType);
+    const bookings = await handleNewRecurringBooking({
+      bookingData: bookingRequest.body,
+      userId: bookingRequest.userId,
+      hostname: bookingRequest.headers?.host || "",
+      platformClientId: bookingRequest.platformClientId,
+      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+      platformCancelUrl: bookingRequest.platformCancelUrl,
+      platformBookingUrl: bookingRequest.platformBookingUrl,
+      platformBookingLocation: bookingRequest.platformBookingLocation,
+    });
     return this.outputService.getOutputCreateRecurringSeatedBookings(
       bookings.map((booking) => ({ uid: booking.uid || "", seatUid: booking.seatReferenceUid || "" }))
     );
   }
 
-  async createRegularBooking(request: Request, body: CreateBookingInput_2024_08_13) {
-    const bookingRequest = await this.inputService.createBookingRequest(request, body);
-    const booking = await handleNewBooking(bookingRequest);
+  async createRegularBooking(request: Request, body: CreateBookingInput_2024_08_13,  eventType: EventTypeWithOwnerAndTeam) {
+    const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
+    const booking = await handleNewBooking({
+      bookingData: bookingRequest.body,
+      userId: bookingRequest.userId,
+      hostname: bookingRequest.headers?.host || "",
+      platformClientId: bookingRequest.platformClientId,
+      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+      platformCancelUrl: bookingRequest.platformCancelUrl,
+      platformBookingUrl: bookingRequest.platformBookingUrl,
+      platformBookingLocation: bookingRequest.platformBookingLocation,
+    });
 
     if (!booking.uid) {
       throw new Error("Booking missing uid");
@@ -170,9 +244,18 @@ export class BookingsService_2024_08_13 {
     return this.outputService.getOutputBooking(databaseBooking);
   }
 
-  async createSeatedBooking(request: Request, body: CreateBookingInput_2024_08_13) {
-    const bookingRequest = await this.inputService.createBookingRequest(request, body);
-    const booking = await handleNewBooking(bookingRequest);
+  async createSeatedBooking(request: Request, body: CreateBookingInput_2024_08_13, eventType: EventTypeWithOwnerAndTeam) {
+    const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
+    const booking = await handleNewBooking({
+      bookingData: bookingRequest.body,
+      userId: bookingRequest.userId,
+      hostname: bookingRequest.headers?.host || "",
+      platformClientId: bookingRequest.platformClientId,
+      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+      platformCancelUrl: bookingRequest.platformCancelUrl,
+      platformBookingUrl: bookingRequest.platformBookingUrl,
+      platformBookingLocation: bookingRequest.platformBookingLocation,
+    });
 
     if (!booking.uid) {
       throw new Error("Booking missing uid");
@@ -220,13 +303,23 @@ export class BookingsService_2024_08_13 {
     return this.outputService.getOutputRecurringBookings(ids);
   }
 
-  async getBookings(queryParams: GetBookingsInput_2024_08_13, user: { email: string; id: number }) {
+  async getBookings(
+    queryParams: GetBookingsInput_2024_08_13,
+    user: { email: string; id: number; orgId?: number },
+    userIds?: number[]
+  ) {
+    if (queryParams.attendeeEmail) {
+      queryParams.attendeeEmail = await this.getAttendeeEmail(queryParams.attendeeEmail, user);
+    }
+
     const fetchedBookings: { bookings: { id: number }[] } = await getAllUserBookings({
       bookingListingByStatus: queryParams.status || [],
       skip: queryParams.skip ?? 0,
-      // note(Lauris): we substract -1 because getAllUSerBookings child function adds +1 for some reason
-      take: queryParams.take ? queryParams.take - 1 : 100,
-      filters: this.inputService.transformGetBookingsFilters(queryParams),
+      take: queryParams.take ?? 100,
+      filters: {
+        ...this.inputService.transformGetBookingsFilters(queryParams),
+        ...(userIds?.length ? { userIds } : {}),
+      },
       ctx: {
         user,
         prisma: this.prismaReadService.prisma as unknown as PrismaClient,
@@ -277,6 +370,35 @@ export class BookingsService_2024_08_13 {
     return formattedBookings;
   }
 
+  async getAttendeeEmail(queryParamsAttendeeEmail: string, user: { id: number }) {
+    // note(Lauris): this is to handle attendees that are managed users - in attendee table their email is one of managed users e.g
+    // urdasdqinm+clxyyy21o0003sbk7yw5z6tzg@example.com but if attendeeEmail is passed as urdasdqinm@example.com then we check if user whose
+    // access token is used is a managed user and if attendee with passed email has managed user email composed of passed email without oAuth client id +
+    // authenticated user oAuth client id.
+    const oAuthClient = await this.oAuthClientRepository.getByUserId(user.id);
+    if (!oAuthClient) {
+      return queryParamsAttendeeEmail;
+    }
+    // note(Lauris): query param already contains oAuth client id in the attendeeEmail
+    if (queryParamsAttendeeEmail.includes(oAuthClient.id)) {
+      return queryParamsAttendeeEmail;
+    }
+
+    const managedAttendeeEmail = OAuthClientUsersService.getOAuthUserEmail(
+      oAuthClient.id,
+      queryParamsAttendeeEmail
+    );
+    const [attendee, managedAttendee] = await Promise.all([
+      this.usersRepository.findByEmail(queryParamsAttendeeEmail),
+      this.usersRepository.findByEmail(managedAttendeeEmail),
+    ]);
+    if (!attendee && managedAttendee) {
+      return managedAttendeeEmail;
+    }
+
+    return queryParamsAttendeeEmail;
+  }
+
   async rescheduleBooking(request: Request, bookingUid: string, body: RescheduleBookingInput) {
     try {
       const bookingRequest = await this.inputService.createRescheduleBookingRequest(
@@ -284,7 +406,16 @@ export class BookingsService_2024_08_13 {
         bookingUid,
         body
       );
-      const booking = await handleNewBooking(bookingRequest);
+      const booking = await handleNewBooking({
+        bookingData: bookingRequest.body,
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+      });
       if (!booking.uid) {
         throw new Error("Booking missing uid");
       }
@@ -340,7 +471,16 @@ export class BookingsService_2024_08_13 {
     }
 
     const bookingRequest = await this.inputService.createCancelBookingRequest(request, bookingUid, body);
-    const res = await handleCancelBooking(bookingRequest);
+    const res = await handleCancelBooking({
+      bookingData: bookingRequest.body,
+      userId: bookingRequest.userId,
+      arePlatformEmailsEnabled: bookingRequest.arePlatformEmailsEnabled,
+      platformClientId: bookingRequest.platformClientId,
+      platformCancelUrl: bookingRequest.platformCancelUrl,
+      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+      platformBookingUrl: bookingRequest.platformBookingUrl,
+    });
+
     if (!res.onlyRemovedAttendee) {
       await this.billingService.cancelUsageByBookingUid(res.bookingUid);
     }
@@ -368,7 +508,7 @@ export class BookingsService_2024_08_13 {
     const bodyTransformed = this.inputService.transformInputMarkAbsentBooking(body);
     const bookingBefore = await this.bookingsRepository.getByUid(bookingUid);
     const platformClientParams = bookingBefore?.eventTypeId
-      ? await this.inputService.getOAuthClientParams(bookingBefore.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(bookingBefore.eventTypeId)
       : undefined;
 
     await handleMarkNoShow({
@@ -432,7 +572,7 @@ export class BookingsService_2024_08_13 {
     }
 
     const platformClientParams = booking.eventTypeId
-      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;
 
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
@@ -444,6 +584,7 @@ export class BookingsService_2024_08_13 {
       orgId: profile?.organizationId || null,
       emailsEnabled,
       platformClientParams,
+      reassignedById: requestUser.id,
     });
 
     const reassigned = await this.bookingsRepository.getByUidWithUser(bookingUid);
@@ -471,7 +612,7 @@ export class BookingsService_2024_08_13 {
     }
 
     const platformClientParams = booking.eventTypeId
-      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;
 
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
@@ -498,7 +639,7 @@ export class BookingsService_2024_08_13 {
     }
 
     const platformClientParams = booking.eventTypeId
-      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;
 
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
@@ -526,7 +667,7 @@ export class BookingsService_2024_08_13 {
     }
 
     const platformClientParams = booking.eventTypeId
-      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;
 
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
@@ -547,4 +688,34 @@ export class BookingsService_2024_08_13 {
 
     return this.getBooking(bookingUid);
   }
+
+  async getCalendarLinks(bookingUid: string): Promise<CalendarLink[]> {
+    const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
+
+    if (!booking) {
+      throw new NotFoundException(`Booking with uid ${bookingUid} not found`);
+    }
+
+    if (!booking.eventTypeId) {
+      throw new BadRequestException(`Booking with uid ${bookingUid} has no event type`);
+    }
+
+    const eventType = await this.eventTypesRepository.getEventTypeByIdIncludeUsersAndTeam(
+      booking.eventTypeId
+    );
+    if (!eventType) {
+      throw new BadRequestException(`Booking with uid ${bookingUid} has no event type`);
+    }
+    // TODO: Maybe we should get locale from query params?
+    return getCalendarLinks({
+      booking,
+      eventType: {
+        ...eventType,
+        // TODO: Support dynamic event bookings later. It would require a slug input it seems
+        isDynamic: false,
+      },
+      // It can be made customizable through the API endpoint later.
+      t: await getTranslation("en", "common"),
+    });
+  }
 }

apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts

@@ -1,25 +1,35 @@
 import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.repository";
+import { EventTypeWithOwnerAndTeam } from "@/ee/bookings/2024-08-13/services/bookings.service";
 import {
   bookingResponsesSchema,
   seatedBookingDataSchema,
 } from "@/ee/bookings/2024-08-13/services/output.service";
+import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/output-event-types.service";
 import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
+import { defaultBookingResponses } from "@/lib/safe-parse/default-responses-booking";
+import { safeParse } from "@/lib/safe-parse/safe-parse";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
 import { BookingSeatRepository } from "@/modules/booking-seat/booking-seat.repository";
-import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
+import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
 import { Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { CreationSource } from "@prisma/client";
+import { isURL, isPhoneNumber } from "class-validator";
 import { Request } from "express";
 import { DateTime } from "luxon";
 import { NextApiRequest } from "next/types";
 import { v4 as uuidv4 } from "uuid";
 import { z } from "zod";
 
-import { EventTypeMetaDataSchema } from "@calcom/platform-libraries";
+import {
+  EventTypeMetaDataSchema,
+  apiToInternalintegrationsMapping,
+} from "@calcom/platform-libraries/event-types";
 import {
   CancelBookingInput,
   CancelBookingInput_2024_08_13,
@@ -33,9 +43,13 @@ import {
   RescheduleBookingInput_2024_08_13,
   RescheduleSeatedBookingInput_2024_08_13,
 } from "@calcom/platform-types";
-import { EventType, PlatformOAuthClient } from "@calcom/prisma/client";
+import { BookingInputLocation_2024_08_13 } from "@calcom/platform-types/bookings/2024-08-13/inputs/location.input";
+import { EventType } from "@calcom/prisma/client";
 
-type BookingRequest = NextApiRequest & { userId: number | undefined } & OAuthRequestParams;
+type BookingRequest = NextApiRequest & {
+  userId: number | undefined;
+  noEmail: boolean | undefined;
+} & OAuthRequestParams;
 
 type OAuthRequestParams = {
   platformClientId: string;
@@ -70,79 +84,57 @@ export class InputBookingsService_2024_08_13 {
 
   constructor(
     private readonly oAuthFlowService: OAuthFlowService,
-    private readonly oAuthClientRepository: OAuthClientRepository,
     private readonly eventTypesRepository: EventTypesRepository_2024_06_14,
     private readonly bookingsRepository: BookingsRepository_2024_08_13,
     private readonly config: ConfigService,
     private readonly apiKeyRepository: ApiKeysRepository,
-    private readonly bookingSeatRepository: BookingSeatRepository
+    private readonly bookingSeatRepository: BookingSeatRepository,
+    private readonly outputEventTypesService: OutputEventTypesService_2024_06_14,
+    private readonly platformBookingsService: PlatformBookingsService,
+    private readonly usersRepository: UsersRepository
   ) {}
 
   async createBookingRequest(
     request: Request,
-    body: CreateBookingInput_2024_08_13 | CreateInstantBookingInput_2024_08_13
+    body: CreateBookingInput_2024_08_13 | CreateInstantBookingInput_2024_08_13,
+    eventType: EventTypeWithOwnerAndTeam
   ): Promise<BookingRequest> {
-    const bodyTransformed = await this.transformInputCreateBooking(body);
-    const oAuthClientParams = await this.getOAuthClientParams(body.eventTypeId);
+    const oAuthClientParams = await this.platformBookingsService.getOAuthClientParamsForEventType(eventType);
+    const bodyTransformed = await this.transformInputCreateBooking(
+      body,
+      eventType,
+      oAuthClientParams?.platformClientId
+    );
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
 
-    const location = request.body.location || request.body.meetingUrl;
-    this.logger.log(`createBookingRequest_2024_04_15`, {
+    this.logger.log(`createBookingRequest_2024_08_13`, {
       requestId: request.get("X-Request-Id"),
       ownerId: userId,
-      location,
       oAuthClientParams,
     });
 
     if (oAuthClientParams) {
-      Object.assign(newRequest, { userId, ...oAuthClientParams, platformBookingLocation: location });
+      Object.assign(newRequest, { userId, ...oAuthClientParams });
       newRequest.body = {
         ...bodyTransformed,
         noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
         creationSource: CreationSource.API_V2,
       };
     } else {
-      Object.assign(newRequest, { userId, platformBookingLocation: location });
+      Object.assign(newRequest, { userId });
       newRequest.body = { ...bodyTransformed, noEmail: false, creationSource: CreationSource.API_V2 };
     }
 
     return newRequest as unknown as BookingRequest;
   }
 
-  async getOAuthClientParams(eventTypeId: number) {
-    const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeId);
-
-    let oAuthClient: PlatformOAuthClient | null = null;
-    if (eventType?.userId) {
-      oAuthClient = await this.oAuthClientRepository.getByUserId(eventType.userId);
-    } else if (eventType?.teamId) {
-      oAuthClient = await this.oAuthClientRepository.getByTeamId(eventType.teamId);
-    }
-
-    if (oAuthClient) {
-      return {
-        platformClientId: oAuthClient.id,
-        platformCancelUrl: oAuthClient.bookingCancelRedirectUri,
-        platformRescheduleUrl: oAuthClient.bookingRescheduleRedirectUri,
-        platformBookingUrl: oAuthClient.bookingRedirectUri,
-        arePlatformEmailsEnabled: oAuthClient.areEmailsEnabled,
-      };
-    }
-
-    return undefined;
-  }
-
-  async transformInputCreateBooking(inputBooking: CreateBookingInput_2024_08_13) {
-    const eventType = await this.eventTypesRepository.getEventTypeByIdWithOwnerAndTeam(
-      inputBooking.eventTypeId
-    );
-
-    if (!eventType) {
-      throw new NotFoundException(`Event type with id=${inputBooking.eventTypeId} not found`);
-    }
-
+  async transformInputCreateBooking(
+    inputBooking: CreateBookingInput_2024_08_13,
+    eventType: EventTypeWithOwnerAndTeam,
+    platformClientId?: string
+  ) {
     this.validateBookingLengthInMinutes(inputBooking, eventType);
 
     const lengthInMinutes = inputBooking.lengthInMinutes ?? eventType.length;
@@ -151,7 +143,21 @@ export class InputBookingsService_2024_08_13 {
     );
     const endTime = startTime.plus({ minutes: lengthInMinutes });
 
-    const guests = inputBooking.guests;
+    const guests =
+      inputBooking.guests && platformClientId
+        ? await this.platformBookingsService.getPlatformAttendeesEmails(inputBooking.guests, platformClientId)
+        : inputBooking.guests;
+    const attendeeEmail =
+      inputBooking.attendee.email && platformClientId
+        ? await this.platformBookingsService.getPlatformAttendeeEmail(
+            inputBooking.attendee.email,
+            platformClientId
+          )
+        : inputBooking.attendee.email;
+
+    const inputLocation = inputBooking.location || inputBooking.meetingUrl;
+    this.isBookingLocationWithEventTypeLocations(inputLocation, eventType);
+    const location = inputLocation ? this.transformLocation(inputLocation) : undefined;
 
     return {
       start: startTime.toISO(),
@@ -163,20 +169,14 @@ export class InputBookingsService_2024_08_13 {
       hasHashedBookingLink: false,
       guests,
       // note(Lauris): responses with name and email are required by the handleNewBooking
-      responses: inputBooking.bookingFieldsResponses
-        ? {
-            ...inputBooking.bookingFieldsResponses,
-            name: inputBooking.attendee.name,
-            email: inputBooking.attendee.email ?? "",
-            attendeePhoneNumber: inputBooking.attendee.phoneNumber,
-            guests,
-          }
-        : {
-            name: inputBooking.attendee.name,
-            email: inputBooking.attendee.email ?? "",
-            attendeePhoneNumber: inputBooking.attendee.phoneNumber,
-            guests,
-          },
+      responses: {
+        ...(inputBooking.bookingFieldsResponses || {}),
+        name: inputBooking.attendee.name,
+        email: attendeeEmail ?? "",
+        attendeePhoneNumber: inputBooking.attendee.phoneNumber,
+        guests,
+        location,
+      },
     };
   }
 
@@ -201,26 +201,28 @@ export class InputBookingsService_2024_08_13 {
 
   async createRecurringBookingRequest(
     request: Request,
-    body: CreateRecurringBookingInput_2024_08_13
+    body: CreateRecurringBookingInput_2024_08_13,
+    eventType: EventTypeWithOwnerAndTeam
   ): Promise<BookingRequest> {
+    const oAuthClientParams = await this.platformBookingsService.getOAuthClientParamsForEventType(eventType);
     // note(Lauris): update to this.transformInputCreate when rescheduling is implemented
-    const bodyTransformed = await this.transformInputCreateRecurringBooking(body);
-    const oAuthClientParams = await this.getOAuthClientParams(body.eventTypeId);
+    const bodyTransformed = await this.transformInputCreateRecurringBooking(
+      body,
+      eventType,
+      oAuthClientParams?.platformClientId
+    );
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
 
-    const location = request.body.location || request.body.meetingUrl;
-
     if (oAuthClientParams) {
       Object.assign(newRequest, {
         userId,
         ...oAuthClientParams,
-        platformBookingLocation: location,
         noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
       });
     } else {
-      Object.assign(newRequest, { userId, platformBookingLocation: location });
+      Object.assign(newRequest, { userId });
     }
 
     newRequest.body = bodyTransformed.map((event) => ({
@@ -228,16 +230,158 @@ export class InputBookingsService_2024_08_13 {
       creationSource: CreationSource.API_V2,
     }));
 
-    return newRequest as unknown as BookingRequest;
+    return {
+      ...newRequest,
+      headers: {
+        hostname: request.headers["host"] || "",
+        forcedSlug: request.headers["x-cal-force-slug"] as string | undefined,
+      },
+    } as unknown as BookingRequest;
   }
 
-  async transformInputCreateRecurringBooking(inputBooking: CreateRecurringBookingInput_2024_08_13) {
-    const eventType = await this.eventTypesRepository.getEventTypeByIdWithOwnerAndTeam(
-      inputBooking.eventTypeId
-    );
-    if (!eventType) {
-      throw new NotFoundException(`Event type with id=${inputBooking.eventTypeId} not found`);
+  transformLocation(location: string | BookingInputLocation_2024_08_13): {
+    value: string;
+    optionValue: string;
+  } {
+    if (typeof location === "string") {
+      // note(Lauris): this is for backwards compatibility because before switching to booking location objects
+      // we only received a string. If someone is complaining that their location is not displaying as a URL
+      // or whatever check that they are not providing a string for bookign location but one of the input objects.
+      if (isURL(location, { require_protocol: false }) || location.startsWith("www.")) {
+        return {
+          value: "link",
+          optionValue: location,
+        };
+      }
+
+      if (isPhoneNumber(location)) {
+        return {
+          value: "phone",
+          optionValue: location,
+        };
+      }
+
+      return {
+        value: "somewhereElse",
+        optionValue: location,
+      };
     }
+
+    if (location.type === "integration") {
+      const integration = apiToInternalintegrationsMapping[location.integration];
+      if (!integration) {
+        throw new BadRequestException(`Invalid integration: ${location.integration}`);
+      }
+      return {
+        value: integration,
+        optionValue: "",
+      };
+    }
+
+    if (location.type === "address") {
+      return {
+        value: "inPerson",
+        optionValue: "",
+      };
+    }
+
+    if (location.type === "attendeeAddress") {
+      return {
+        value: "attendeeInPerson",
+        optionValue: location.address,
+      };
+    }
+
+    if (location.type === "link") {
+      return {
+        value: "link",
+        optionValue: "",
+      };
+    }
+
+    if (location.type === "phone") {
+      return {
+        value: "userPhone",
+        optionValue: "",
+      };
+    }
+
+    if (location.type === "organizersDefaultApp") {
+      return {
+        value: "conferencing",
+        optionValue: "",
+      };
+    }
+
+    if (location.type === "attendeePhone") {
+      return {
+        value: "phone",
+        optionValue: location.phone,
+      };
+    }
+
+    if (location.type === "attendeeDefined") {
+      return {
+        value: "somewhereElse",
+        optionValue: location.location,
+      };
+    }
+
+    throw new BadRequestException(
+      `Booking location with type ${(location as BookingInputLocation_2024_08_13).type} not valid.`
+    );
+  }
+
+  private isBookingLocationWithEventTypeLocations(
+    inputBookingLocation: undefined | string | BookingInputLocation_2024_08_13,
+    dbEventType: EventType
+  ) {
+    if (!inputBookingLocation || typeof inputBookingLocation === "string") {
+      // note(Lauris): for backwards compatibility because we had string locations before so let them pass.
+      return true;
+    }
+
+    const eventTypeLocations = this.outputEventTypesService.transformLocations(dbEventType.locations);
+    const allowedLocationTypes = eventTypeLocations.map((location) => location.type);
+
+    const isAllowed = allowedLocationTypes.includes(inputBookingLocation.type);
+    if (!isAllowed) {
+      throw new BadRequestException(
+        `Booking location with type ${inputBookingLocation.type} not valid for event type with id=${
+          dbEventType.id
+        }. The event type has following location types: ${allowedLocationTypes.join(
+          ", "
+        )}, and only these types are allowed for booking location.`
+      );
+    }
+
+    if (inputBookingLocation.type === "integration" && "integration" in inputBookingLocation) {
+      const allowedIntegrations = eventTypeLocations
+        .filter((location) => location.type === "integration")
+        .map((location) => location.integration);
+
+      const isAllowedIntegration = allowedIntegrations.includes(inputBookingLocation.integration);
+      if (!isAllowedIntegration) {
+        throw new BadRequestException(
+          `Booking location with integration ${
+            inputBookingLocation.integration
+          } not valid for event type with id=${
+            dbEventType.id
+          }. The event type has following integrations: ${allowedIntegrations.join(
+            ", "
+          )}, and only these integrations are allowed for booking location.`
+        );
+      }
+    }
+
+    return true;
+  }
+
+  async transformInputCreateRecurringBooking(
+    inputBooking: CreateRecurringBookingInput_2024_08_13,
+    eventType: EventTypeWithOwnerAndTeam,
+    platformClientId?: string
+  ) {
     if (!eventType.recurringEvent) {
       throw new NotFoundException(`Event type with id=${inputBooking.eventTypeId} is not a recurring event`);
     }
@@ -261,7 +405,21 @@ export class InputBookingsService_2024_08_13 {
       inputBooking.attendee.timeZone
     );
 
-    const guests = inputBooking.guests;
+    const guests =
+      inputBooking.guests && platformClientId
+        ? await this.platformBookingsService.getPlatformAttendeesEmails(inputBooking.guests, platformClientId)
+        : inputBooking.guests;
+    const attendeeEmail =
+      inputBooking.attendee.email && platformClientId
+        ? await this.platformBookingsService.getPlatformAttendeeEmail(
+            inputBooking.attendee.email,
+            platformClientId
+          )
+        : inputBooking.attendee.email;
+
+    const inputLocation = inputBooking.location || inputBooking.meetingUrl;
+    this.isBookingLocationWithEventTypeLocations(inputLocation, eventType);
+    const location = inputLocation ? this.transformLocation(inputLocation) : undefined;
 
     for (let i = 0; i < repeatsTimes; i++) {
       const endTime = startTime.plus({ minutes: eventType.length });
@@ -277,14 +435,14 @@ export class InputBookingsService_2024_08_13 {
         hasHashedBookingLink: false,
         guests,
         // note(Lauris): responses with name and email are required by the handleNewBooking
-        responses: inputBooking.bookingFieldsResponses
-          ? {
-              ...inputBooking.bookingFieldsResponses,
-              name: inputBooking.attendee.name,
-              email: inputBooking.attendee.email,
-              guests,
-            }
-          : { name: inputBooking.attendee.name, email: inputBooking.attendee.email, guests },
+        responses: {
+          ...(inputBooking.bookingFieldsResponses || {}),
+          name: inputBooking.attendee.name,
+          email: attendeeEmail,
+          attendeePhoneNumber: inputBooking.attendee.phoneNumber,
+          guests,
+          location,
+        },
         schedulingType: eventType.schedulingType,
       });
 
@@ -315,10 +473,29 @@ export class InputBookingsService_2024_08_13 {
       ? await this.transformInputRescheduleSeatedBooking(bookingUid, body)
       : await this.transformInputRescheduleBooking(bookingUid, body);
 
-    const oAuthClientParams = await this.getOAuthClientParams(bodyTransformed.eventTypeId);
+    const oAuthClientParams = await this.platformBookingsService.getOAuthClientParams(
+      bodyTransformed.eventTypeId
+    );
 
     const newRequest = { ...request };
-    const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
+    let userId: number | undefined = undefined;
+
+    if (
+      oAuthClientParams &&
+      request.body.rescheduledBy &&
+      !request.body.rescheduledBy.includes(oAuthClientParams.platformClientId)
+    ) {
+      request.body.rescheduledBy = OAuthClientUsersService.getOAuthUserEmail(
+        oAuthClientParams.platformClientId,
+        request.body.rescheduledBy
+      );
+    }
+
+    if (request.body.rescheduledBy) {
+      if (request.body.rescheduledBy !== bodyTransformed.responses.email) {
+        userId = (await this.usersRepository.findByEmail(request.body.rescheduledBy))?.id;
+      }
+    }
 
     const location = await this.getRescheduleBookingLocation(bookingUid);
     if (oAuthClientParams) {
@@ -401,8 +578,19 @@ export class InputBookingsService_2024_08_13 {
       throw new NotFoundException(`Event type with id=${booking.eventTypeId} not found`);
     }
 
-    const bookingResponses = bookingResponsesSchema.parse(booking.responses);
-    const attendee = booking.attendees.find((attendee) => attendee.email === bookingResponses.email);
+    const bookingResponses = safeParse(
+      bookingResponsesSchema,
+      booking.responses,
+      defaultBookingResponses,
+      false
+    );
+    const bookingResponsesMissing =
+      bookingResponses.name === defaultBookingResponses.name &&
+      bookingResponses.email === defaultBookingResponses.email;
+
+    const attendee = bookingResponsesMissing
+      ? booking.attendees[0]
+      : booking.attendees.find((attendee) => attendee.email === bookingResponses.email);
 
     if (!attendee) {
       throw new NotFoundException(
@@ -410,6 +598,12 @@ export class InputBookingsService_2024_08_13 {
       );
     }
 
+    if (bookingResponsesMissing) {
+      bookingResponses.name = attendee.name;
+      bookingResponses.email = attendee.email;
+      bookingResponses.attendeePhoneNumber = attendee.phoneNumber || undefined;
+    }
+
     const startTime = DateTime.fromISO(inputBooking.start, { zone: "utc" }).setZone(attendee.timeZone);
     const endTime = startTime.plus({ minutes: eventType.length });
 
@@ -446,7 +640,8 @@ export class InputBookingsService_2024_08_13 {
           return keyData?.userId;
         } else {
           // Access Token
-          return this.oAuthFlowService.getOwnerId(bearerToken);
+          const ownerId = await this.oAuthFlowService.getOwnerId(bearerToken);
+          return ownerId;
         }
       }
     } catch (err) {
@@ -465,6 +660,8 @@ export class InputBookingsService_2024_08_13 {
         queryParams.eventTypeIds || (queryParams.eventTypeId ? [queryParams.eventTypeId] : undefined),
       afterUpdatedDate: queryParams.afterUpdatedAt,
       beforeUpdatedDate: queryParams.beforeUpdatedAt,
+      afterCreatedDate: queryParams.afterCreatedAt,
+      beforeCreatedDate: queryParams.beforeCreatedAt,
     };
   }
 
@@ -501,7 +698,7 @@ export class InputBookingsService_2024_08_13 {
     }
 
     const oAuthClientParams = booking.eventTypeId
-      ? await this.getOAuthClientParams(booking.eventTypeId)
+      ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;
 
     const newRequest = { ...request };

apps/api/v2/src/ee/bookings/2024-08-13/services/output.service.ts

@@ -27,6 +27,7 @@ import { Booking, BookingSeat } from "@calcom/prisma/client";
 export const bookingResponsesSchema = z
   .object({
     email: z.string(),
+    attendeePhoneNumber: z.string().optional(),
     name: z.union([
       z.string(),
       z.object({
@@ -45,6 +46,7 @@ export const seatedBookingDataSchema = z
     responses: z
       .object({
         email: z.string(),
+        attendeePhoneNumber: z.string().optional(),
         name: z.union([
           z.string(),
           z.object({
@@ -134,6 +136,7 @@ export class OutputBookingsService_2024_08_13 {
       createdAt: databaseBooking.createdAt,
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
+      icsUid: databaseBooking.iCalUID,
     };
 
     const bookingTransformed = plainToClass(BookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
@@ -229,6 +232,7 @@ export class OutputBookingsService_2024_08_13 {
       createdAt: databaseBooking.createdAt,
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
+      icsUid: databaseBooking.iCalUID,
     };
 
     const bookingTransformed = plainToClass(RecurringBookingOutput_2024_08_13, booking, {
@@ -277,6 +281,7 @@ export class OutputBookingsService_2024_08_13 {
       createdAt: databaseBooking.createdAt,
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
+      icsUid: databaseBooking.iCalUID,
     };
 
     const parsed = plainToClass(GetSeatedBookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
@@ -386,6 +391,7 @@ export class OutputBookingsService_2024_08_13 {
       createdAt: databaseBooking.createdAt,
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
+      icsUid: databaseBooking.iCalUID,
     };
 
     const parsed = plainToClass(GetRecurringSeatedBookingOutput_2024_08_13, booking, {

apps/api/v2/src/ee/bookings/shared/platform-bookings.service.ts

@@ -0,0 +1,86 @@
+import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
+import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import { PlatformOAuthClient } from "@calcom/prisma/client";
+
+@Injectable()
+export class PlatformBookingsService {
+  constructor(
+    private readonly usersRepository: UsersRepository,
+    private readonly eventTypesRepository: EventTypesRepository_2024_06_14,
+    private readonly oAuthClientRepository: OAuthClientRepository
+  ) {}
+
+  async getPlatformAttendeesEmails(guestsEmails: string[], platformClientId: string) {
+    return Promise.all(
+      guestsEmails.map((guestEmail) => this.getPlatformAttendeeEmail(guestEmail, platformClientId))
+    );
+  }
+
+  async getPlatformAttendeeEmail(attendeeEmail: string, platformClientId: string) {
+    if (!attendeeEmail.includes(platformClientId)) {
+      // note(Lauris): we need to do this when managed user is booking another managed user and the managed user doing the booking entered their email without oAuth client id
+      // or if one of the guests added are managed users without oAuth client id in their email.
+      const oAuthUserEmail = OAuthClientUsersService.getOAuthUserEmail(platformClientId, attendeeEmail);
+      const oAuthUser = await this.usersRepository.findByEmail(oAuthUserEmail);
+      if (oAuthUser) {
+        return oAuthUserEmail;
+      }
+    }
+    return attendeeEmail;
+  }
+
+  async getOAuthClientParams(eventTypeId: number) {
+    const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeId);
+
+    let oAuthClient: PlatformOAuthClient | null = null;
+    if (eventType?.userId) {
+      oAuthClient = await this.oAuthClientRepository.getByUserId(eventType.userId);
+    } else if (eventType?.teamId) {
+      oAuthClient = await this.oAuthClientRepository.getByTeamId(eventType.teamId);
+    }
+    // Last resort check the hosts of the event-type
+    if (!oAuthClient && eventType?.teamId) {
+      oAuthClient = await this.oAuthClientRepository.getByEventTypeHosts(eventTypeId);
+    }
+
+    if (oAuthClient) {
+      return {
+        platformClientId: oAuthClient.id,
+        platformCancelUrl: oAuthClient.bookingCancelRedirectUri,
+        platformRescheduleUrl: oAuthClient.bookingRescheduleRedirectUri,
+        platformBookingUrl: oAuthClient.bookingRedirectUri,
+        arePlatformEmailsEnabled: oAuthClient.areEmailsEnabled,
+      };
+    }
+
+    return undefined;
+  }
+
+  async getOAuthClientParamsForEventType(eventType: {
+    userId: number | null | undefined;
+    teamId: number | null | undefined;
+  }) {
+    let oAuthClient: PlatformOAuthClient | null = null;
+    if (eventType.userId) {
+      oAuthClient = await this.oAuthClientRepository.getByUserId(eventType.userId);
+    } else if (eventType.teamId) {
+      oAuthClient = await this.oAuthClientRepository.getByTeamId(eventType.teamId);
+    }
+
+    if (oAuthClient) {
+      return {
+        platformClientId: oAuthClient.id,
+        platformCancelUrl: oAuthClient.bookingCancelRedirectUri,
+        platformRescheduleUrl: oAuthClient.bookingRescheduleRedirectUri,
+        platformBookingUrl: oAuthClient.bookingRedirectUri,
+        arePlatformEmailsEnabled: oAuthClient.areEmailsEnabled,
+      };
+    }
+
+    return undefined;
+  }
+}

apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts

@@ -31,7 +31,7 @@ import {
 } from "@calcom/platform-constants";
 import { OFFICE_365_CALENDAR_ID, OFFICE_365_CALENDAR_TYPE } from "@calcom/platform-constants";
 import { ICS_CALENDAR } from "@calcom/platform-constants/apps";
-import { IcsFeedCalendarService } from "@calcom/platform-libraries";
+import { IcsFeedCalendarService } from "@calcom/platform-libraries/app-store";
 
 const CLIENT_REDIRECT_URI = "http://localhost:5555";