chore: v4.4.4 (#16372)

* Remove use of location from FormBuilder

* Add tests

* Improve error message in test

* Bust cache

.env.example

@@ -18,6 +18,10 @@
 
 # To enable enterprise-only features please add your envrionment 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
+CAL_SIGNATURE_TOKEN=
+# The route to the Cal.com License API
 CALCOM_PRIVATE_API_ROUTE="https://goblin.cal.com"
 # ***********************************************************************************************************
 
@@ -255,6 +259,8 @@ NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
 # This variable should only be set to 1 or true if you are in a non-prod environment and you want to
 # use organizations
 ORGANIZATIONS_ENABLED=
+NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=30
+NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE=3700 # $37.00 per seat
 
 # This variable should only be set to 1 or true if you want to autolink external provider sing-ups with
 # existing organizations based on email domain address
@@ -356,10 +362,13 @@ TASKER_ENABLE_EMAILS=0
 # Ratelimiting via unkey
 UNKEY_ROOT_KEY=
 
-
 # Used for Cal.ai Enterprise Voice AI Agents
 # https://retellai.com
 RETELL_AI_KEY=
 
 # Used to disallow emails as being added as guests on bookings
 BLACKLISTED_GUEST_EMAILS=
+
+# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
+NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
+NEXT_PUBLIC_WEBSITE_TERMS_URL=

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,41 +1,56 @@
+---
 name: Feature request
-description: "Suggest an idea for this project \U0001F680"
+about: Suggest a feature or idea
 title: ""
-labels: ["✨ feature", "🚨 needs approval"], 
+labels: ["✨ feature", "🚨 needs approval"]
-assignees: []
+assignees: ""
-body:
+---
-  - type: textarea
-    id: problem-description
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    id: solution-description
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: alternate-solution-description
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
-  - type: markdown
-    id: cal-info
-    attributes:
-      value: |
-        ### How we code at Cal.com
 
-        - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
+### 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/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@
 ## Mandatory Tasks (DO NOT REMOVE)
 
 - [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
-- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com). If N/A, write N/A here and check the checkbox.
+- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com/docs). If N/A, write N/A here and check the checkbox.
 - [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
 
 ## How should this be tested?

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

@@ -37,8 +37,6 @@ runs:
       with:
         path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
         key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-download-cache-
 
     # Invalidated on yarn.lock changes
     - name: Restore node_modules

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

@@ -3,6 +3,10 @@ description: "Install playwright, cache and restore if necessary"
 runs:
   using: "composite"
   steps:
+    - name: Get installed Playwright version
+      shell: bash
+      id: playwright-version
+      run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
     - name: Cache playwright binaries
       id: playwright-cache
       uses: buildjet/cache@v4
@@ -11,9 +15,7 @@ runs:
           ~/Library/Caches/ms-playwright
           ~/.cache/ms-playwright
           ${{ github.workspace }}/node_modules/playwright
-        key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
-        restore-keys: cache-playwright-
     - name: Yarn playwright install
       shell: bash
-      if: steps.playwright-cache.outputs.cache-hit != 'true'
+      run: yarn playwright install --with-deps
-      run: yarn playwright install

.github/workflows/all-checks.yml

@@ -34,6 +34,11 @@ jobs:
     uses: ./.github/workflows/api-v2-production-build.yml
     secrets: inherit
 
+  build-atoms:
+    name: Production builds
+    uses: ./.github/workflows/atoms-production-build.yml
+    secrets: inherit
+
   build:
     name: Production builds
     uses: ./.github/workflows/production-build-without-database.yml
@@ -69,12 +74,6 @@ jobs:
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
-  analyze:
-    name: Analyze Build
-    needs: [build]
-    uses: ./.github/workflows/nextjs-bundle-analysis.yml
-    secrets: inherit
-
   required:
     needs: [lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     if: always()

.github/workflows/atoms-production-build.yml

@@ -0,0 +1,40 @@
+name: Atoms production Build
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    name: Build atoms
+    permissions:
+      contents: read
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - name: Cache atoms production build
+        uses: buildjet/cache@v4
+        id: cache-atoms-build
+        env:
+          cache-name: atoms-build
+          key-1: ${{ hashFiles('yarn.lock') }}
+          key-2: ${{ hashFiles('packages/platform/atoms/**.[jt]s', 'packages/platform/atoms/**.[jt]sx', '!**/node_modules') }}
+          key-3: ${{ github.event.pull_request.number || github.ref }}
+          # Ensures production-build.yml will always be fresh
+          key-4: ${{ github.sha }}
+        with:
+          path: |
+            **/dist/**
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
+      - run: |
+          export NODE_OPTIONS="--max_old_space_size=8192"
+          if [ ${{ steps.cache-atoms-build.outputs.cache-hit }} == 'true' ]; then
+            echo "Cache hit for atoms build. Skipping build."
+          else
+            rm -rf packages/platform/atoms/node_modules
+            yarn install
+            yarn workspace @calcom/atoms run build
+          fi
+        shell: bash

.github/workflows/cleanup.yml

@@ -0,0 +1,65 @@
+name: Delete
+
+on:
+  delete:
+    branches-ignore: [main, gh-pages]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+# ensures that currently running Playwright workflow of deleted branch gets cancelled
+concurrency:
+  group: ${{ github.event.ref }}
+  cancel-in-progress: true
+
+jobs:
+  delete_reports:
+    name: Delete Reports
+    runs-on: ubuntu-latest
+    env:
+      # Contains all reports for deleted branch
+      BRANCH_REPORTS_DIR: reports/${{ github.event.ref }}
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v2
+        with:
+          repository: calcom/test-results
+          ref: gh-pages
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+      - name: Set Git User
+        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Check for workflow reports
+        run: |
+          if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
+            echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
+          else
+            echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
+          fi
+      - name: Delete reports from repo for branch
+        if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
+        timeout-minutes: 3
+        run: |
+          cd $BRANCH_REPORTS_DIR/..
+
+          rm -rf ${{ github.event.ref }}
+          git add .
+          git commit -m "workflow: remove all reports for branch ${{ github.event.ref }}"
+
+          while true; do
+            git pull --rebase
+            if [ $? -ne 0 ]; then
+              echo "Failed to rebase. Please review manually."
+              exit 1
+            fi
+
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Successfully pushed HTML reports to repo."
+              exit 0
+            fi
+          done

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

@@ -45,6 +45,9 @@ jobs:
           - 5432:5432
       redis:
         image: redis:latest
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
         ports:
           - 6379:6379
         options: >-

.github/workflows/e2e-app-store.yml

@@ -98,5 +98,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: app-store-results
+          name: blob-report-app-store
-          path: test-results
+          path: blob-report

.github/workflows/e2e-embed-react.yml

@@ -85,5 +85,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-react-results
+          name: blob-report-embed-react
-          path: test-results
+          path: blob-report

.github/workflows/e2e-embed.yml

@@ -91,5 +91,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-core-results
+          name: blob-report-embed-core
-          path: test-results
+          path: blob-report

.github/workflows/e2e.yml

@@ -89,8 +89,9 @@ jobs:
       - name: Run Tests
         run: yarn e2e --shard=${{ matrix.shard }}/${{ strategy.job-total }}
       - name: Upload Test Results
-        if: ${{ always() }}
         uses: actions/upload-artifact@v4
+        if: always()
         with:
-          name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
+          name: blob-report-${{ matrix.shard }}
-          path: test-results
+          path: blob-report
+          retention-days: 30

.github/workflows/merge-reports.yml

@@ -0,0 +1,25 @@
+# https://playwright.dev/docs/test-sharding#merging-reports-from-multiple-shards
+on:
+  workflow_call:
+jobs:
+  merge-reports:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install
+      - name: Download blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-blob-reports
+          pattern: blob-report-*
+          merge-multiple: true
+      - name: Merge into HTML Report
+        run: yarn playwright merge-reports --reporter html ./all-blob-reports
+      - name: Upload HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
+          path: playwright-report
+          retention-days: 14

.github/workflows/nextjs-bundle-analysis-annotation.yml

@@ -0,0 +1,81 @@
+name: "Next.js Bundle Analysis Annotation"
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  actions: read
+  contents: read
+  pull-requests: write
+
+jobs:
+  annotate:
+    if: always()
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/cache-build
+      - name: Download base branch bundle stats
+        uses: dawidd6/action-download-artifact@v2
+        if: success()
+        with:
+          workflow: nextjs-bundle-analysis.yml
+          branch: ${{ github.event.pull_request.base.ref }}
+          path: apps/web/.next/analyze/base
+
+      # And here's the second place - this runs after we have both the current and
+      # base branch bundle stats, and will compare them to determine what changed.
+      # There are two configurable arguments that come from package.json:
+      #
+      # - budget: optional, set a budget (bytes) against which size changes are measured
+      #           it's set to 350kb here by default, as informed by the following piece:
+      #           https://infrequently.org/2021/03/the-performance-inequality-gap/
+      #
+      # - red-status-percentage: sets the percent size increase where you get a red
+      #                          status indicator, defaults to 20%
+      #
+      # Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
+      # entry in your package.json file.
+
+      - name: Compare with base branch bundle
+        if: success()
+        run: |
+          cd apps/web
+          ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
+
+      - name: Get comment body
+        id: get-comment-body
+        if: success() && github.event.number
+        run: |
+          cd apps/web
+          body=$(cat .next/analyze/__bundle_analysis_comment.txt)
+          body="${body//'%'/'%25'}"
+          body="${body//$'\n'/'%0A'}"
+          body="${body//$'\r'/'%0D'}"
+          echo ::set-output name=body::$body
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        if: success() && github.event.number
+        id: fc
+        with:
+          issue-number: ${{ github.event.number }}
+          body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
+
+      - name: Create Comment
+        uses: peter-evans/create-or-update-comment@v3
+        if: success() && github.event.number && steps.fc.outputs.comment-id == 0
+        with:
+          issue-number: ${{ github.event.number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v3
+        if: success() && github.event.number && steps.fc.outputs.comment-id != 0
+        with:
+          issue-number: ${{ github.event.number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace

.github/workflows/nextjs-bundle-analysis.yml

@@ -67,65 +67,3 @@ jobs:
         with:
           name: bundle
           path: apps/web/.next/analyze/__bundle_analysis.json
-
-      - name: Download base branch bundle stats
-        uses: dawidd6/action-download-artifact@v2
-        if: success()
-        with:
-          workflow: nextjs-bundle-analysis.yml
-          branch: ${{ github.event.pull_request.base.ref }}
-          path: apps/web/.next/analyze/base
-
-      # And here's the second place - this runs after we have both the current and
-      # base branch bundle stats, and will compare them to determine what changed.
-      # There are two configurable arguments that come from package.json:
-      #
-      # - budget: optional, set a budget (bytes) against which size changes are measured
-      #           it's set to 350kb here by default, as informed by the following piece:
-      #           https://infrequently.org/2021/03/the-performance-inequality-gap/
-      #
-      # - red-status-percentage: sets the percent size increase where you get a red
-      #                          status indicator, defaults to 20%
-      #
-      # Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
-      # entry in your package.json file.
-      - name: Compare with base branch bundle
-        if: success()
-        run: |
-          cd apps/web
-          ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
-
-      - name: Get comment body
-        id: get-comment-body
-        if: success() && github.event.number
-        run: |
-          cd apps/web
-          body=$(cat .next/analyze/__bundle_analysis_comment.txt)
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}"
-          echo ::set-output name=body::$body
-
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        if: success() && github.event.number
-        id: fc
-        with:
-          issue-number: ${{ github.event.number }}
-          body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
-
-      - name: Create Comment
-        uses: peter-evans/create-or-update-comment@v3
-        if: success() && github.event.number && steps.fc.outputs.comment-id == 0
-        with:
-          issue-number: ${{ github.event.number }}
-          body: ${{ steps.get-comment-body.outputs.body }}
-
-      - name: Update Comment
-        uses: peter-evans/create-or-update-comment@v3
-        if: success() && github.event.number && steps.fc.outputs.comment-id != 0
-        with:
-          issue-number: ${{ github.event.number }}
-          body: ${{ steps.get-comment-body.outputs.body }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace

.github/workflows/pr-review.yml

@@ -7,11 +7,22 @@ on:
 jobs:
   label-pr:
     runs-on: ubuntu-latest
-
+    permissions:
+      actions: read
+      issues: write
+      pull-requests: write
     steps:
       - name: Label PR as ready for E2E
         if: github.event.review.state == 'approved'
-        uses: actions-ecosystem/action-add-labels@v1
+        uses: actions/github-script@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: process.env.labels.split(', '),
+            })
+        env:
+          github_token: ${{ secrets.READY_FOR_E2E_PAT }}
           labels: 'ready-for-e2e'

.github/workflows/pr.yml

@@ -91,44 +91,57 @@ jobs:
             console.log('Found the label?', labelFound);
             core.setOutput('run-e2e', labelFound);
 
+  deps:
+    name: Install dependencies
+    needs: [changes, check-label]
+    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/yarn-install.yml
+
   type-check:
     name: Type check
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/check-types.yml
     secrets: inherit
 
   lint:
     name: Linters
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/lint.yml
     secrets: inherit
 
   unit-test:
     name: Tests
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/unit-tests.yml
     secrets: inherit
 
   build-api-v1:
     name: Production builds
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/api-v1-production-build.yml
     secrets: inherit
 
   build-api-v2:
     name: Production builds
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/api-v2-production-build.yml
     secrets: inherit
+  
+  build-atoms:
+    name: Production builds
+    needs: [changes, check-label, deps]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/atoms-production-build.yml
+    secrets: inherit
 
   build:
     name: Production builds
-    needs: [changes, check-label]
+    needs: [changes, check-label, deps]
     if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/production-build-without-database.yml
     secrets: inherit
@@ -181,8 +194,42 @@ jobs:
     uses: ./.github/workflows/nextjs-bundle-analysis.yml
     secrets: inherit
 
+  merge-reports:
+    name: Merge reports
+    if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    uses: ./.github/workflows/merge-reports.yml
+    secrets: inherit
+
+  publish-report:
+    name: Publish HTML report
+    if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    needs: [changes, check-label, merge-reports]
+    uses: ./.github/workflows/publish-report.yml
+    secrets: inherit
+
   required:
-    needs: [changes, lint, type-check, unit-test, integration-test, check-label, build, build-api-v1, build-api-v2, e2e, e2e-api-v2, e2e-embed, e2e-embed-react, e2e-app-store]
+    needs:
+      [
+        changes,
+        lint,
+        type-check,
+        unit-test,
+        integration-test,
+        check-label,
+        build,
+        build-api-v1,
+        build-api-v2,
+        e2e,
+        e2e-api-v2,
+        e2e-embed,
+        e2e-embed-react,
+        e2e-app-store,
+      ]
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:

.github/workflows/publish-report.yml

@@ -0,0 +1,98 @@
+on:
+  workflow_call:
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+jobs:
+  publish-report:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      # Unique URL path for each workflow run attempt
+      HTML_REPORT_URL_PATH: reports/${{ github.head_ref }}/${{ github.run_id }}/${{ github.run_attempt }}
+      BRANCH_REPORTS_DIR: reports/${{ github.head_ref }}
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v4
+        with:
+          repository: calcom/test-results
+          ref: gh-pages
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+      - name: Set Git User
+        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Check for workflow reports
+        run: |
+          if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
+            echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
+          else
+            echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
+          fi
+      - name: Cleanup old HTML reports
+        if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
+        timeout-minutes: 3
+        run: |
+          rm -rf $BRANCH_REPORTS_DIR
+          git add .
+          git commit -m "workflow: remove all reports for branch ${{ github.head_ref }}"
+      - name: Download zipped HTML report
+        uses: actions/download-artifact@v4
+        with:
+          name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
+          path: ${{ env.HTML_REPORT_URL_PATH }}
+      - name: Push HTML Report
+        timeout-minutes: 3
+        # commit report, then try push-rebase-loop until it's able to merge the HTML report to the gh-pages branch
+        # this is necessary when this job running at least twice at the same time (e.g. through two pushes at the same time)
+        run: |
+          git add .
+          git commit -m "workflow: add HTML report for run-id ${{ github.run_id }} (attempt:  ${{ github.run_attempt }})"
+
+          while true; do
+            git pull --rebase
+            if [ $? -ne 0 ]; then
+              echo "Failed to rebase. Please review manually."
+              exit 1
+            fi
+
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Successfully pushed HTML report to repo."
+              exit 0
+            fi
+          done
+      - name: Output Report URL as Workflow Annotation
+        id: url
+        run: |
+          FULL_HTML_REPORT_URL=https://calcom.github.io/test-results/$HTML_REPORT_URL_PATH
+          echo "::notice title=📋 Published Playwright Test Report::$FULL_HTML_REPORT_URL"
+          echo "link=$FULL_HTML_REPORT_URL" >> $GITHUB_OUTPUT
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: <!-- GENERATED-E2E-RESULTS -->
+      - name: Create comment
+        if: steps.fc.outputs.comment-id == ''
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            <!-- GENERATED-E2E-RESULTS -->
+            ## E2E results are ready!
+            - [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})
+      - name: Update comment
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            <!-- GENERATED-E2E-RESULTS -->
+            ## E2E results are ready!
+            - [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})

.github/workflows/yarn-install.yml

@@ -15,3 +15,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install

README.md

@@ -12,7 +12,7 @@
     <a href="https://cal.com"><strong>Learn more »</strong></a>
     <br />
     <br />
-    <a href="https://go.cal.com/discord">Discord</a>
+    <a href="https://github.com/calcom/cal.com/discussions">Discussions</a>
     ·
     <a href="https://cal.com">Website</a>
     ·
@@ -23,7 +23,6 @@
 </p>
 
 <p align="center">
-   <a href="https://go.cal.com/discord"><img src="https://img.shields.io/badge/Discord-go.cal.com%2Fdiscord-%234A154B" alt="Join Cal.com Discord"></a>
    <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>
    <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>
@@ -37,7 +36,6 @@
    <a href="https://twitch.tv/calcomtv"><img src="https://img.shields.io/twitch/status/calcomtv?style=flat"></a>
    <a href="https://github.com/calcom/cal.com/issues?q=is:issue+is:open+label:%22%F0%9F%99%8B%F0%9F%8F%BB%E2%80%8D%E2%99%82%EF%B8%8Fhelp+wanted%22"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
    <a href="https://cal.com/figma"><img src="https://img.shields.io/badge/Figma-Design%20System-blueviolet"></a>
-   <a href="https://discord.com/channels/1125390093386010654/1125398231585661040"><img src="https://img.shields.io/badge/translations-contribute-brightgreen" /></a>
    <a href="https://contributor-covenant.org/version/1/4/code-of-conduct/ "><img src="https://img.shields.io/badge/Contributor%20Covenant-1.4-purple" /></a>
    <a href="https://console.algora.io/org/cal/bounties?status=open"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Fcal%2Fbounties%3Fstatus%3Dopen" /></a>
 </p>
@@ -382,7 +380,7 @@ Currently Vercel Pro Plan is required to be able to Deploy this application with
 
 ### Elestio
 
-[![Deploy on Elestio](https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png)](https://elest.io/open-source/cal.com)
+[![Deploy on Elestio](https://elest.io/images/logos/deploy-to-elestio-btn.png)](https://elest.io/open-source/cal.com)
 
 <!-- ROADMAP -->
 
@@ -461,7 +459,7 @@ We have a list of [help wanted](https://github.com/calcom/cal.com/issues?q=is:is
 
 ### Translations
 
-Don't code but still want to contribute? Join our [discord](https://go.cal.com/discord) and join the [#Translate channel](https://discord.com/channels/1125390093386010654/1125398231585661040) and let us know what language you want to translate.
+Don't code but still want to contribute? Join our [Discussions](https://github.com/calcom/cal.com/discussions) and join the [#Translate channel](https://github.com/calcom/cal.com/discussions/categories/translations) and let us know what language you want to translate.
 
 ![ar translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ar&style=flat&logo=crowdin&query=%24.progress.0.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![bg translation](https://img.shields.io/badge/dynamic/json?color=blue&label=bg&style=flat&logo=crowdin&query=%24.progress.1.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![cs translation](https://img.shields.io/badge/dynamic/json?color=blue&label=cs&style=flat&logo=crowdin&query=%24.progress.2.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![de translation](https://img.shields.io/badge/dynamic/json?color=blue&label=de&style=flat&logo=crowdin&query=%24.progress.3.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![el translation](https://img.shields.io/badge/dynamic/json?color=blue&label=el&style=flat&logo=crowdin&query=%24.progress.4.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress.5.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![es translation](https://img.shields.io/badge/dynamic/json?color=blue&label=es&style=flat&logo=crowdin&query=%24.progress.6.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![es-419 translation](https://img.shields.io/badge/dynamic/json?color=blue&label=es-419&style=flat&logo=crowdin&query=%24.progress.7.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![fr translation](https://img.shields.io/badge/dynamic/json?color=blue&label=fr&style=flat&logo=crowdin&query=%24.progress.8.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![he translation](https://img.shields.io/badge/dynamic/json?color=blue&label=he&style=flat&logo=crowdin&query=%24.progress.9.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![hu translation](https://img.shields.io/badge/dynamic/json?color=blue&label=hu&style=flat&logo=crowdin&query=%24.progress.10.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![it translation](https://img.shields.io/badge/dynamic/json?color=blue&label=it&style=flat&logo=crowdin&query=%24.progress.11.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress.12.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress.13.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![nl translation](https://img.shields.io/badge/dynamic/json?color=blue&label=nl&style=flat&logo=crowdin&query=%24.progress.14.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![no translation](https://img.shields.io/badge/dynamic/json?color=blue&label=no&style=flat&logo=crowdin&query=%24.progress.15.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![pl translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pl&style=flat&logo=crowdin&query=%24.progress.16.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![pt translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt&style=flat&logo=crowdin&query=%24.progress.17.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![pt-BR translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-BR&style=flat&logo=crowdin&query=%24.progress.18.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![ro translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ro&style=flat&logo=crowdin&query=%24.progress.19.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress.20.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![sr translation](https://img.shields.io/badge/dynamic/json?color=blue&label=sr&style=flat&logo=crowdin&query=%24.progress.21.data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-200011276-1.json) ![sv translation](https://img.shields.io/badge/dynamic/json?color=blue&label=sv&style=flat&logo=crowdin&query=%Line truncated
 

apps/ai/.env.example

@@ -1,21 +0,0 @@
-BACKEND_URL=http://localhost:3002/api
-# BACKEND_URL=https://api.cal.com/v1
-FRONTEND_URL=http://localhost:3000
-# FRONTEND_URL=https://cal.com
-
-APP_ID=cal-ai
-APP_URL=http://localhost:3000/apps/cal-ai
-
-# This is for the onboard route. Which domain should we send emails from?
-SENDER_DOMAIN=cal.ai
-
-# Used to verify requests from sendgrid. You can generate a new one with: `openssl rand -hex 32`
-PARSE_KEY=
-
-OPENAI_API_KEY=
-
-# Optionally trace completions at https://smith.langchain.com
-# LANGCHAIN_TRACING_V2=true
-# LANGCHAIN_ENDPOINT=
-# LANGCHAIN_API_KEY=
-# LANGCHAIN_PROJECT=

apps/ai/README.md

@@ -1,68 +0,0 @@
-# Cal.ai
-
-Welcome to [Cal.ai](https://cal.ai)!
-
-This app lets you chat with your calendar via email:
-
-- Turn informal emails into bookings eg. forward "wanna meet tmrw at 2pm?"
-- List and rearrange your bookings eg. "clear my afternoon"
-- Answer basic questions about your busiest times eg. "how does my Tuesday look?"
-
-The core logic is contained in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts). Here, a [LangChain Agent Executor](https://docs.langchain.com/docs/components/agents/agent-executor) is tasked with following your instructions. Given your last-known timezone, working hours, and busy times, it attempts to CRUD your bookings.
-
-_The AI agent can only choose from a set of tools, without ever seeing your API key._
-
-Emails are cleaned and routed in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts) using [MailParser](https://nodemailer.com/extras/mailparser/).
-
-Incoming emails are routed by email address. Addresses are verified by [DKIM record](https://support.google.com/a/answer/174124?hl=en), making them hard to spoof.
-
-## Recognition
-
-<a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=419860&theme=light&period=daily" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=419860&theme=light" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## Getting Started
-
-### Development
-
-If you haven't yet, please run the [root setup](/README.md) steps.
-
-Before running the app, please see [env.mjs](./src/env.mjs) for all required environment variables. Run `cp .env.example .env` in this folder to get started. You'll need:
-
-- An [OpenAI API key](https://platform.openai.com/account/api-keys) with access to GPT-4
-- A [SendGrid API key](https://app.sendgrid.com/settings/api_keys)
-- A default sender email (for example, `me@dev.example.com`)
-- The Cal.ai app's ID and URL (see [add.ts](/packages/app-store/cal-ai/api/index.ts))
-- A unique value for `PARSE_KEY` with `openssl rand -hex 32`
-
-To stand up the API and AI apps simultaneously, simply run `yarn dev:ai`.
-
-### Agent Architecture
-
-The scheduling agent in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts) calls an LLM (in this case, GPT-4) in a loop to accomplish a multi-step task. We use an [OpenAI Functions agent](https://js.langchain.com/docs/modules/agents/agent_types/openai_functions_agent), which is fine-tuned to output text suited for passing to tools.
-
-Tools (eg. [`createBooking`](/apps/ai/src/tools/createBooking.ts)) are simply JavaScript methods wrapped by Zod schemas, telling the agent what format to output.
-
-Here is the full architecture:
-
-![Cal.ai architecture](/apps/ai/src/public/architecture.png)
-
-### Email Router
-
-To expose the AI app, you can use either [Tunnelmole](https://github.com/robbie-cahill/tunnelmole-client), an open source tunnelling tool; or [nGrok](https://ngrok.com/), a popular closed source tunnelling tool. 
-
-For Tunnelmole, run `tmole 3005` (or the AI app's port number) in a new terminal. Please replace `3005` with the port number if it is different. In the output, you'll see two URLs, one http and a https (we recommend using the https url for privacy and security). To install Tunnelmole, use `curl -O https://install.tunnelmole.com/8dPBw/install && sudo bash install`. (On Windows, download [tmole.exe](https://tunnelmole.com/downloads/tmole.exe))
-
-For nGrok, run `ngrok http 3005` (or the AI app's port number) in a new terminal. You may need to install nGrok first.
-
-To forward incoming emails to the serverless function at `/agent`, we use [SendGrid's Inbound Parse](https://docs.sendgrid.com/for-developers/parsing-email/setting-up-the-inbound-parse-webhook).
-
-1.  Ensure you have a [SendGrid account](https://signup.sendgrid.com/)
-2.  Ensure you have an authenticated domain. Go to Settings > Sender Authentication > Authenticate. For DNS host, select `I'm not sure`. Click Next and add your domain, eg. `example.com`. Choose Manual Setup. You'll be given three CNAME records to add to your DNS settings, eg. in [Vercel Domains](https://vercel.com/dashboard/domains). After adding those records, click Verify. To troubleshoot, see the [full instructions](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-domain-authentication).
-3.  Authorize your domain for email with MX records: one with name `[your domain].com` and value `mx.sendgrid.net.`, and another with name `bounces.[your domain].com` and value `feedback-smtp.us-east-1.amazonses.com`. Set the priority to `10` if prompted.
-4.  Go to Settings > [Inbound Parse](https://app.sendgrid.com/settings/parse) > Add Host & URL. Choose your authenticated domain.
-5.  In the Destination URL field, use the Tunnelmole or ngrok URL from above along with the path, `/api/receive`, and one param, `parseKey`, which lives in [this app's .env](/apps/ai/.env.example) under `PARSE_KEY`. The full URL should look like `https://abc.tunnelmole.net/api/receive?parseKey=ABC-123` or `https://abc.ngrok.io/api/receive?parseKey=ABC-123`.
-6.  Activate "POST the raw, full MIME message".
-7.  Send an email to `[anyUsername]@example.com`. You should see a ping on the Tunnelmole or ngrok listener and server.
-8.  Adjust the logic in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts), save to hot-reload, and send another email to test the behaviour.
-
-Please feel free to improve any part of this architecture!

apps/ai/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.

apps/ai/next.config.js

@@ -1,24 +0,0 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer");
-
-const plugins = [];
-plugins.push(withBundleAnalyzer({ enabled: process.env.ANALYZE === "true" }));
-
-/** @type {import("next").NextConfig} */
-const nextConfig = {
-  async redirects() {
-    return [
-      {
-        source: "/",
-        destination: "https://cal.com/ai",
-        permanent: true,
-      },
-    ];
-  },
-  i18n: {
-    defaultLocale: "en",
-    locales: ["en"],
-  },
-  reactStrictMode: true,
-};
-
-module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);

apps/ai/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "@calcom/ai",
-  "version": "1.2.1",
-  "private": true,
-  "author": "Cal.com Inc.",
-  "dependencies": {
-    "@calcom/prisma": "*",
-    "@langchain/core": "^0.1.26",
-    "@langchain/openai": "^0.0.14",
-    "@t3-oss/env-nextjs": "^0.6.1",
-    "langchain": "^0.1.17",
-    "mailparser": "^3.6.5",
-    "next": "^13.5.4",
-    "supports-color": "8.1.1",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@types/mailparser": "^3.4.0"
-  },
-  "scripts": {
-    "build": "next build",
-    "dev": "next dev -p 3005",
-    "format": "npx prettier . --write",
-    "lint": "eslint . --ext .ts,.js,.tsx,.jsx",
-    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
-    "start": "next start"
-  }
-}

apps/ai/src/app/api/agent/route.ts

@@ -1,55 +0,0 @@
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import agent from "../../../utils/agent";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow agent loop to run for up to 5 minutes
-export const maxDuration = 300;
-
-/**
- * Launches a LangChain agent to process an incoming email,
- * then sends the response to the user.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const json = await request.json();
-
-  const { apiKey, userId, message, subject, user, users, replyTo: agentEmail } = json;
-
-  if ((!message && !subject) || !user) {
-    return new NextResponse("Missing fields", { status: 400 });
-  }
-
-  try {
-    const response = await agent(`${subject}\n\n${message}`, { ...user }, users, apiKey, userId, agentEmail);
-
-    // Send response to user
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: response.replace(/(?:\r\n|\r|\n)/g, "\n"),
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse("ok");
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! We're experiencing high demand and can't currently process your request. Please try again later.",
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse(
-      (error as Error).message || "Something went wrong. Please try again or reach out for help.",
-      { status: 500 }
-    );
-  }
-};

apps/ai/src/app/api/onboard/route.ts

@@ -1,44 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import sendEmail from "../../../utils/sendEmail";
-
-export const POST = async (request: NextRequest) => {
-  const { userId } = await request.json();
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      name: true,
-      username: true,
-    },
-    where: {
-      id: userId,
-    },
-  });
-
-  if (!user) {
-    return new Response("User not found", { status: 404 });
-  }
-
-  await sendEmail({
-    subject: "Welcome to Cal AI",
-    to: user.email,
-    from: `${user.username}@${env.SENDER_DOMAIN}`,
-    text: `Hi ${
-      user.name || `@${user.username}`
-    },\n\nI'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.\n\nHere are some things you can ask me:\n\n- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)\n- "What meetings do I have today?" (I'll show you your schedule)\n- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)\n\nI'm still learning, so if you have any feedback, please tweet it to @calcom!\n\nRemember, you can always reach me here, at ${
-      user.username
-    }@${
-      env.SENDER_DOMAIN
-    }.\n\nLooking forward to working together (:\n\n- Cal AI, Your personal booking assistant`,
-    html: `Hi ${
-      user.name || `@${user.username}`
-    },<br><br>I'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.<br><br>Here are some things you can ask me:<br><br>- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)<br>- "What meetings do I have today?" (I'll show you your schedule)<br>- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)<br><br>I'm still learning, so if you have any feedback, please send it to <a href="https://twitter.com/calcom">@calcom</a> on X!<br><br>Remember, you can always reach me here, at ${
-      user.username
-    }@${env.SENDER_DOMAIN}.<br><br>Looking forward to working together (:<br><br>- Cal AI`,
-  });
-  return new Response("OK", { status: 200 });
-};

apps/ai/src/app/api/receive/route.ts

@@ -1,186 +0,0 @@
-import type { ParsedMail, Source } from "mailparser";
-import { simpleParser } from "mailparser";
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import { fetchAvailability } from "../../../tools/getAvailability";
-import { fetchEventTypes } from "../../../tools/getEventTypes";
-import { extractUsers } from "../../../utils/extractUsers";
-import getHostFromHeaders from "../../../utils/host";
-import now from "../../../utils/now";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow receive loop to run for up to 30 seconds
-// Why so long? the rate determining API call (getAvailability, getEventTypes) can take up to 15 seconds at peak times so we give it a little extra time to complete.
-export const maxDuration = 30;
-
-/**
- * Verifies email signature and app authorization,
- * then hands off to booking agent.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const formData = await request.formData();
-  const body = Object.fromEntries(formData);
-  const envelope = JSON.parse(body.envelope as string);
-
-  const aiEmail = envelope.to[0];
-  const subject = body.subject || "";
-
-  try {
-    await checkRateLimitAndThrowError({
-      identifier: `ai:email:${envelope.from}`,
-      rateLimitingType: "ai",
-    });
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! You've reached your daily limit. Please try again tomorrow.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("Exceeded rate limit", { status: 200 }); // Don't return 429 to avoid triggering retry logic in SendGrid
-  }
-
-  // Parse email from mixed MIME type
-  const parsed: ParsedMail = await simpleParser(body.email as Source);
-
-  if (!parsed.text && !parsed.subject) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! It looks like you forgot to include a message. Please try again.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-    return new NextResponse("Email missing text and subject", { status: 400 });
-  }
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      id: true,
-      username: true,
-      timeZone: true,
-      credentials: {
-        select: {
-          appId: true,
-          key: true,
-        },
-      },
-    },
-    where: { email: envelope.from },
-  });
-
-  // body.dkim looks like {@domain-com.22222222.gappssmtp.com : pass}
-  const signature = (body.dkim as string).includes(" : pass");
-
-  // User is not a cal.com user or is using an unverified email.
-  if (!signature || !user) {
-    await sendEmail({
-      html: `Thanks for your interest in Cal.ai! To get started, Make sure you have a <a href="https://cal.com/signup" target="_blank">cal.com</a> account with this email address and then install Cal.ai here: <a href="https://go.cal.com/ai" target="_blank">go.cal.com/ai</a>.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for your interest in Cal.ai! To get started, Make sure you have a cal.com account with this email address. You can sign up for an account at: https://cal.com/signup`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const credential = user.credentials.find((c) => c.appId === env.APP_ID)?.key;
-
-  // User has not installed the app from the app store. Direct them to install it.
-  if (!(credential as { apiKey: string })?.apiKey) {
-    const url = env.APP_URL;
-
-    await sendEmail({
-      html: `Thanks for using Cal.ai! To get started, the app must be installed. <a href=${url} target="_blank">Click this link</a> to install it.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for using Cal.ai! To get started, the app must be installed. Click this link to install the Cal.ai app: ${url}`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const { apiKey } = credential as { apiKey: string };
-
-  // Pre-fetch data relevant to most bookings.
-  const [eventTypes, availability, users] = await Promise.all([
-    fetchEventTypes({
-      apiKey,
-    }),
-    fetchAvailability({
-      apiKey,
-      userId: user.id,
-      dateFrom: now(user.timeZone),
-      dateTo: now(user.timeZone),
-    }),
-    extractUsers(`${parsed.text} ${parsed.subject}`),
-  ]);
-
-  if ("error" in availability) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your availability. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(availability.error);
-    return new NextResponse("Error fetching availability. Please try again.", { status: 400 });
-  }
-
-  if ("error" in eventTypes) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your event types. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(eventTypes.error);
-    return new NextResponse("Error fetching event types. Please try again.", { status: 400 });
-  }
-
-  const { workingHours } = availability;
-
-  const appHost = getHostFromHeaders(request.headers);
-
-  // Hand off to long-running agent endpoint to handle the email. (don't await)
-  fetch(`${appHost}/api/agent?parseKey=${env.PARSE_KEY}`, {
-    body: JSON.stringify({
-      apiKey,
-      userId: user.id,
-      message: parsed.text || "",
-      subject: parsed.subject || "",
-      replyTo: aiEmail,
-      user: {
-        email: user.email,
-        eventTypes,
-        username: user.username,
-        timeZone: user.timeZone,
-        workingHours,
-      },
-      users,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  await new Promise((r) => setTimeout(r, 1000));
-
-  return new NextResponse("ok");
-};

apps/ai/src/env.mjs

@@ -1,47 +0,0 @@
-import { createEnv } from "@t3-oss/env-nextjs";
-import { z } from "zod";
-
-export const env = createEnv({
-  /**
-   * Specify your client-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars. To expose them to the client, prefix them with
-   * `NEXT_PUBLIC_`.
-   */
-  client: {
-    // NEXT_PUBLIC_CLIENTVAR: z.string().min(1),
-  },
-
-  /**
-   * You can't destruct `process.env` as a regular object in the Next.js edge runtimes (e.g.
-   * middlewares) or client-side so we need to destruct manually.
-   */
-  runtimeEnv: {
-    BACKEND_URL: process.env.BACKEND_URL,
-    FRONTEND_URL: process.env.FRONTEND_URL,
-    APP_ID: process.env.APP_ID,
-    APP_URL: process.env.APP_URL,
-    SENDER_DOMAIN: process.env.SENDER_DOMAIN,
-    PARSE_KEY: process.env.PARSE_KEY,
-    NODE_ENV: process.env.NODE_ENV,
-    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
-    SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
-    DATABASE_URL: process.env.DATABASE_URL,
-  },
-
-  /**
-   * Specify your server-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars.
-   */
-  server: {
-    BACKEND_URL: z.string().url(),
-    FRONTEND_URL: z.string().url(),
-    APP_ID: z.string().min(1),
-    APP_URL: z.string().url(),
-    SENDER_DOMAIN: z.string().min(1),
-    PARSE_KEY: z.string().min(1),
-    NODE_ENV: z.enum(["development", "test", "production"]),
-    OPENAI_API_KEY: z.string().min(1),
-    SENDGRID_API_KEY: z.string().min(1),
-    DATABASE_URL: z.string().url(),
-  },
-});

apps/ai/src/tools/createBooking.ts

@@ -1,121 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import type { UserList } from "~/src/types/user";
-
-import { env } from "../env.mjs";
-
-/**
- * Creates a booking for a user by event type, times, and timezone.
- */
-const createBooking = async ({
-  apiKey,
-  userId,
-  users,
-  eventTypeId,
-  start,
-  end,
-  timeZone,
-  language,
-  invite,
-}: {
-  apiKey: string;
-  userId: number;
-  users: UserList;
-  eventTypeId: number;
-  start: string;
-  end: string;
-  timeZone: string;
-  language: string;
-  invite: number;
-  title?: string;
-  status?: string;
-}): Promise<string | Error | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const user = users.find((u) => u.id === invite);
-
-  if (!user) {
-    return { error: `User with id ${invite} not found to invite` };
-  }
-
-  const responses = {
-    id: invite.toString(),
-    name: user.username,
-    email: user.email,
-  };
-
-  const response = await fetch(url, {
-    body: JSON.stringify({
-      end,
-      eventTypeId,
-      language,
-      metadata: {},
-      responses,
-      start,
-      timeZone,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  // Let GPT handle this. This will happen when wrong event type id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return {
-      error: data.message,
-    };
-  }
-
-  return "Booking created";
-};
-
-const createBookingTool = (apiKey: string, userId: number, users: UserList) => {
-  return new DynamicStructuredTool({
-    description: "Creates a booking on the primary user's calendar.",
-    func: async ({ eventTypeId, start, end, timeZone, language, invite, title, status }) => {
-      return JSON.stringify(
-        await createBooking({
-          apiKey,
-          userId,
-          users,
-          end,
-          eventTypeId,
-          language,
-          invite,
-          start,
-          status,
-          timeZone,
-          title,
-        })
-      );
-    },
-    name: "createBooking",
-    schema: z.object({
-      end: z
-        .string()
-        .describe("This should correspond to the event type's length, unless otherwise specified."),
-      eventTypeId: z.number(),
-      language: z.string(),
-      invite: z.number().describe("External user id to invite."),
-      start: z.string(),
-      status: z.string().optional().describe("ACCEPTED, PENDING, CANCELLED or REJECTED"),
-      timeZone: z.string(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default createBookingTool;

apps/ai/src/tools/deleteBooking.ts

@@ -1,66 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Cancels a booking for a user by ID with reason.
- */
-const cancelBooking = async ({
-  apiKey,
-  id,
-  reason,
-}: {
-  apiKey: string;
-  id: string;
-  reason: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}/cancel?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ reason }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "DELETE",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking cancelled";
-};
-
-const cancelBookingTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Cancel a booking",
-    func: async ({ id, reason }) => {
-      return JSON.stringify(
-        await cancelBooking({
-          apiKey,
-          id,
-          reason,
-        })
-      );
-    },
-    name: "cancelBooking",
-    schema: z.object({
-      id: z.string(),
-      reason: z.string(),
-    }),
-  });
-};
-
-export default cancelBookingTool;

apps/ai/src/tools/getAvailability.ts

@@ -1,77 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Availability } from "../types/availability";
-
-/**
- * Fetches availability for a user by date range and event type.
- */
-export const fetchAvailability = async ({
-  apiKey,
-  userId,
-  dateFrom,
-  dateTo,
-}: {
-  apiKey: string;
-  userId: number;
-  dateFrom: string;
-  dateTo: string;
-}): Promise<Partial<Availability> | { error: string }> => {
-  const params: { [k: string]: string } = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom,
-    dateTo,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/availability?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return {
-    busy: data.busy,
-    dateRanges: data.dateRanges,
-    timeZone: data.timeZone,
-    workingHours: data.workingHours,
-  };
-};
-
-const getAvailabilityTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get availability of users within range.",
-    func: async ({ userIds, dateFrom, dateTo }) => {
-      return JSON.stringify(
-        await Promise.all(
-          userIds.map(
-            async (userId) =>
-              await fetchAvailability({
-                userId: userId,
-                apiKey,
-                dateFrom,
-                dateTo,
-              })
-          )
-        )
-      );
-    },
-    name: "getAvailability",
-    schema: z.object({
-      userIds: z.array(z.number()).describe("The users to fetch availability for."),
-      dateFrom: z.string(),
-      dateTo: z.string(),
-    }),
-  });
-};
-
-export default getAvailabilityTool;

apps/ai/src/tools/getBookings.ts

@@ -1,75 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Booking } from "../types/booking";
-import { BOOKING_STATUS } from "../types/booking";
-
-/**
- * Fetches bookings for a user by date range.
- */
-const fetchBookings = async ({
-  apiKey,
-  userId,
-  from,
-  to,
-}: {
-  apiKey: string;
-  userId: number;
-  from: string;
-  to: string;
-}): Promise<Booking[] | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom: from,
-    dateTo: to,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  const bookings: Booking[] = data.bookings
-    .filter((booking: Booking) => {
-      const notCancelled = booking.status !== BOOKING_STATUS.CANCELLED;
-
-      return notCancelled;
-    })
-    .map(({ endTime, eventTypeId, id, startTime, status, title }: Booking) => ({
-      endTime,
-      eventTypeId,
-      id,
-      startTime,
-      status,
-      title,
-    }));
-
-  return bookings;
-};
-
-const getBookingsTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Get bookings for the primary user between two dates.",
-    func: async ({ from, to }) => {
-      return JSON.stringify(await fetchBookings({ apiKey, userId, from, to }));
-    },
-    name: "getBookings",
-    schema: z.object({
-      from: z.string().describe("ISO 8601 datetime string"),
-      to: z.string().describe("ISO 8601 datetime string"),
-    }),
-  });
-};
-
-export default getBookingsTool;

apps/ai/src/tools/getEventTypes.ts

@@ -1,59 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { EventType } from "../types/eventType";
-
-/**
- * Fetches event types by user ID.
- */
-export const fetchEventTypes = async ({ apiKey, userId }: { apiKey: string; userId?: number }) => {
-  const params: Record<string, string> = {
-    apiKey,
-  };
-
-  if (userId) {
-    params["userId"] = userId.toString();
-  }
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/event-types?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return data.event_types.map((eventType: EventType) => ({
-    id: eventType.id,
-    slug: eventType.slug,
-    length: eventType.length,
-    title: eventType.title,
-  }));
-};
-
-const getEventTypesTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get a user's event type IDs. Usually necessary to book a meeting.",
-    func: async ({ userId }) => {
-      return JSON.stringify(
-        await fetchEventTypes({
-          apiKey,
-          userId,
-        })
-      );
-    },
-    name: "getEventTypes",
-    schema: z.object({
-      userId: z.number().optional().describe("The user ID. Defaults to the primary user's ID."),
-    }),
-  });
-};
-
-export default getEventTypesTool;

apps/ai/src/tools/sendBookingEmail.ts

@@ -1,124 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "~/src/env.mjs";
-import type { User, UserList } from "~/src/types/user";
-import sendEmail from "~/src/utils/sendEmail";
-
-export const sendBookingEmail = async ({
-  user,
-  agentEmail,
-  subject,
-  to,
-  message,
-  eventTypeSlug,
-  slots,
-  date,
-}: {
-  apiKey: string;
-  user: User;
-  users: UserList;
-  agentEmail: string;
-  subject: string;
-  to: string;
-  message: string;
-  eventTypeSlug: string;
-  slots?: {
-    time: string;
-    text: string;
-  }[];
-  date: {
-    date: string;
-    text: string;
-  };
-}) => {
-  // const url = `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date}`;
-  const timeUrls = slots?.map(({ time, text }) => {
-    return {
-      url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?slot=${time}`,
-      text,
-    };
-  });
-
-  const dateUrl = {
-    url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date.date}`,
-    text: date.text,
-  };
-
-  await sendEmail({
-    subject,
-    to,
-    cc: user.email,
-    from: agentEmail,
-    text: message
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `${text}: ${url}`).join("\n"))
-      .split("[[[Link]]]")
-      .join(`${dateUrl.text}: ${dateUrl.url}`),
-    html: message
-      .split("\n")
-      .join("<br>")
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `<a href="${url}">${text}</a>`).join("<br>"))
-      .split("[[[Link]]]")
-      .join(`<a href="${dateUrl.url}">${dateUrl.text}</a>`),
-  });
-
-  return "Booking link sent";
-};
-
-const sendBookingEmailTool = (apiKey: string, user: User, users: UserList, agentEmail: string) => {
-  return new DynamicStructuredTool({
-    description:
-      "Send a booking link via email. Useful for scheduling with non cal users. Be confident, suggesting a good date/time with a fallback to a link to select a date/time.",
-    func: async ({ message, subject, to, eventTypeSlug, slots, date }) => {
-      return JSON.stringify(
-        await sendBookingEmail({
-          apiKey,
-          user,
-          users,
-          agentEmail,
-          subject,
-          to,
-          message,
-          eventTypeSlug,
-          slots,
-          date,
-        })
-      );
-    },
-    name: "sendBookingEmail",
-
-    schema: z.object({
-      message: z
-        .string()
-        .describe(
-          "A polite and professional email with an intro and signature at the end. Specify you are the AI booking assistant of the primary user. Use [[[Slots]]] and a fallback [[[Link]]] to inject good times and 'see all times' into messages"
-        ),
-      subject: z.string(),
-      to: z
-        .string()
-        .describe("email address to send the booking link to. Primary user is automatically CC'd"),
-      eventTypeSlug: z.string().describe("the slug of the event type to book"),
-      slots: z
-        .array(
-          z.object({
-            time: z.string().describe("YYYY-MM-DDTHH:mm in UTC"),
-            text: z.string().describe("minimum readable label. Ex. 4pm."),
-          })
-        )
-        .optional()
-        .describe("Time slots the external user can click"),
-      date: z
-        .object({
-          date: z.string().describe("YYYY-MM-DD"),
-          text: z.string().describe('"See all times" or similar'),
-        })
-        .describe(
-          "A booking link that allows the external user to select a date / time. Should be a fallback to time slots"
-        ),
-    }),
-  });
-};
-
-export default sendBookingEmailTool;

apps/ai/src/tools/updateBooking.ts

@@ -1,85 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Edits a booking for a user by booking ID with new times, title, description, or status.
- */
-const editBooking = async ({
-  apiKey,
-  userId,
-  id,
-  startTime, // In the docs it says start, but it's startTime: https://cal.com/docs/enterprise-features/api/api-reference/bookings#edit-an-existing-booking.
-  endTime, // Same here: it says end but it's endTime.
-  title,
-  description,
-  status,
-}: {
-  apiKey: string;
-  userId: number;
-  id: string;
-  startTime?: string;
-  endTime?: string;
-  title?: string;
-  description?: string;
-  status?: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ description, endTime, startTime, status, title }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "PATCH",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking edited";
-};
-
-const editBookingTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Edit a booking",
-    func: async ({ description, endTime, id, startTime, status, title }) => {
-      return JSON.stringify(
-        await editBooking({
-          apiKey,
-          userId,
-          description,
-          endTime,
-          id,
-          startTime,
-          status,
-          title,
-        })
-      );
-    },
-    name: "editBooking",
-    schema: z.object({
-      description: z.string().optional(),
-      endTime: z.string().optional(),
-      id: z.string(),
-      startTime: z.string().optional(),
-      status: z.string().optional(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default editBookingTool;

apps/ai/src/types/availability.ts

@@ -1,25 +0,0 @@
-export type Availability = {
-  busy: {
-    start: string;
-    end: string;
-    title?: string;
-  }[];
-  timeZone: string;
-  dateRanges: {
-    start: string;
-    end: string;
-  }[];
-  workingHours: {
-    days: number[];
-    startTime: number;
-    endTime: number;
-    userId: number;
-  }[];
-  dateOverrides: {
-    date: string;
-    startTime: number;
-    endTime: number;
-    userId: number;
-  };
-  currentSeats: number;
-};

apps/ai/src/types/booking.ts

@@ -1,23 +0,0 @@
-export enum BOOKING_STATUS {
-  ACCEPTED = "ACCEPTED",
-  PENDING = "PENDING",
-  CANCELLED = "CANCELLED",
-  REJECTED = "REJECTED",
-}
-
-export type Booking = {
-  id: number;
-  userId: number;
-  description: string | null;
-  eventTypeId: number;
-  uid: string;
-  title: string;
-  startTime: string;
-  endTime: string;
-  attendees: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  user: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  payment: { id: number; success: boolean; paymentOption: string }[];
-  metadata: object | null;
-  status: BOOKING_STATUS;
-  responses: { email: string; name: string; location: string } | null;
-};

apps/ai/src/types/eventType.ts

@@ -1,13 +0,0 @@
-export type EventType = {
-  id: number;
-  title: string;
-  length: number;
-  metadata: object;
-  slug: string;
-  hosts: {
-    userId: number;
-    isFixed: boolean;
-  }[];
-  hidden: boolean;
-  // ...
-};

apps/ai/src/types/user.ts

@@ -1,18 +0,0 @@
-import type { EventType } from "./eventType";
-import type { WorkingHours } from "./workingHours";
-
-export type User = {
-  id: number;
-  email: string;
-  username: string;
-  timeZone: string;
-  eventTypes: EventType[];
-  workingHours: WorkingHours[];
-};
-
-export type UserList = {
-  id?: number;
-  email?: string;
-  username?: string;
-  type: "fromUsername" | "fromEmail";
-}[];

apps/ai/src/types/workingHours.ts

@@ -1,5 +0,0 @@
-export type WorkingHours = {
-  days: number[];
-  startTime: number;
-  endTime: number;
-};

apps/ai/src/utils/agent.ts

@@ -1,122 +0,0 @@
-import { ChatPromptTemplate } from "@langchain/core/prompts";
-import { ChatOpenAI } from "@langchain/openai";
-import { AgentExecutor, createOpenAIFunctionsAgent } from "langchain/agents";
-
-import { env } from "../env.mjs";
-import createBookingIfAvailable from "../tools/createBooking";
-import deleteBooking from "../tools/deleteBooking";
-import getAvailability from "../tools/getAvailability";
-import getBookings from "../tools/getBookings";
-import sendBookingEmail from "../tools/sendBookingEmail";
-import updateBooking from "../tools/updateBooking";
-import type { EventType } from "../types/eventType";
-import type { User, UserList } from "../types/user";
-import type { WorkingHours } from "../types/workingHours";
-import now from "./now";
-
-const gptModel = "gpt-4-0125-preview";
-
-/**
- * Core of the Cal.ai booking agent: a LangChain Agent Executor.
- * Uses a toolchain to book meetings, list available slots, etc.
- * Uses OpenAI functions to better enforce JSON-parsable output from the LLM.
- */
-const agent = async (
-  input: string,
-  user: User,
-  users: UserList,
-  apiKey: string,
-  userId: number,
-  agentEmail: string
-) => {
-  const tools = [
-    // getEventTypes(apiKey),
-    getAvailability(apiKey),
-    getBookings(apiKey, userId),
-    createBookingIfAvailable(apiKey, userId, users),
-    updateBooking(apiKey, userId),
-    deleteBooking(apiKey),
-    sendBookingEmail(apiKey, user, users, agentEmail),
-  ];
-
-  const model = new ChatOpenAI({
-    modelName: gptModel,
-    openAIApiKey: env.OPENAI_API_KEY,
-    temperature: 0,
-  });
-
-  /**
-   * Initialize the agent executor with arguments.
-   */
-  const prompt =
-    ChatPromptTemplate.fromTemplate(`You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
-  Make sure your final answers are definitive, complete and well formatted.
-  Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
-  Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
-  In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
-  If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
-  
-  The primary user's id is: ${userId}
-  The primary user's username is: ${user.username}
-  The current time in the primary user's timezone is: ${now(user.timeZone, {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-    hour: "numeric",
-    minute: "numeric",
-  })}
-  The primary user's time zone is: ${user.timeZone}
-  The primary user's event types are: ${user.eventTypes
-    .map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
-    .join("\n")}
-  The primary user's working hours are: ${user.workingHours
-    .map(
-      (w: WorkingHours) =>
-        `Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
-          w.startTime
-        }, End Time (minutes in UTC): ${w.endTime};`
-    )
-    .join("\n")}
-  ${
-    users.length
-      ? `The email references the following @usernames and emails: ${users
-          .map(
-            (u) =>
-              `${
-                (u.id ? `, id: ${u.id}` : "id: (non user)") +
-                (u.username
-                  ? u.type === "fromUsername"
-                    ? `, username: @${u.username}`
-                    : ", username: REDACTED"
-                  : ", (no username)") +
-                (u.email
-                  ? u.type === "fromEmail"
-                    ? `, email: ${u.email}`
-                    : ", email: REDACTED"
-                  : ", (no email)")
-              };`
-          )
-          .join("\n")}`
-      : ""
-  }`);
-  const agent = await createOpenAIFunctionsAgent({
-    llm: model,
-    prompt,
-    tools,
-  });
-
-  const executor = new AgentExecutor({
-    agent,
-    tools,
-    returnIntermediateSteps: env.NODE_ENV === "development",
-    verbose: env.NODE_ENV === "development",
-  });
-
-  const result = await executor.invoke({ input });
-  const { output } = result;
-
-  return output;
-};
-
-export default agent;

apps/ai/src/utils/context.ts

@@ -1 +0,0 @@
-export const context = { apiKey: "", userId: "" };

apps/ai/src/utils/extractUsers.ts

@@ -1,85 +0,0 @@
-import prisma from "@calcom/prisma";
-
-import type { UserList } from "../types/user";
-
-/*
- * Extracts usernames (@Example) and emails (hi@example.com) from a string
- */
-export const extractUsers = async (text: string) => {
-  const usernames = text
-    .match(/(?<![a-zA-Z0-9_.])@[a-zA-Z0-9_]+/g)
-    ?.map((username) => username.slice(1).toLowerCase());
-  const emails = text
-    .match(/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/g)
-    ?.map((email) => email.toLowerCase());
-
-  const dbUsersFromUsernames = usernames
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          username: true,
-          email: true,
-        },
-        where: {
-          username: {
-            in: usernames,
-          },
-        },
-      })
-    : [];
-
-  const usersFromUsernames = usernames
-    ? usernames.map((username) => {
-        const user = dbUsersFromUsernames.find((u) => u.username === username);
-        return user
-          ? {
-              username,
-              id: user.id,
-              email: user.email,
-              type: "fromUsername",
-            }
-          : {
-              username,
-              id: null,
-              email: null,
-              type: "fromUsername",
-            };
-      })
-    : [];
-
-  const dbUsersFromEmails = emails
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          email: true,
-          username: true,
-        },
-        where: {
-          email: {
-            in: emails,
-          },
-        },
-      })
-    : [];
-
-  const usersFromEmails = emails
-    ? emails.map((email) => {
-        const user = dbUsersFromEmails.find((u) => u.email === email);
-        return user
-          ? {
-              email,
-              id: user.id,
-              username: user.username,
-              type: "fromEmail",
-            }
-          : {
-              email,
-              id: null,
-              username: null,
-              type: "fromEmail",
-            };
-      })
-    : [];
-
-  return [...usersFromUsernames, ...usersFromEmails] as UserList;
-};

apps/ai/src/utils/host.ts

@@ -1,7 +0,0 @@
-import type { NextRequest } from "next/server";
-
-const getHostFromHeaders = (headers: NextRequest["headers"]): string => {
-  return `https://${headers.get("host")}`;
-};
-
-export default getHostFromHeaders;

apps/ai/src/utils/now.ts

@@ -1,6 +0,0 @@
-export default function now(timeZone: string, options: Intl.DateTimeFormatOptions = {}) {
-  return new Date().toLocaleString("en-US", {
-    timeZone,
-    ...options,
-  });
-}

apps/ai/src/utils/sendEmail.ts

@@ -1,43 +0,0 @@
-import mail from "@sendgrid/mail";
-
-const sendgridAPIKey = process.env.SENDGRID_API_KEY as string;
-
-/**
- * Simply send an email by address, subject, and body.
- */
-const send = async ({
-  subject,
-  to,
-  cc,
-  from,
-  text,
-  html,
-}: {
-  subject: string;
-  to: string | string[];
-  cc?: string | string[];
-  from: string;
-  text: string;
-  html?: string;
-}): Promise<boolean> => {
-  mail.setApiKey(sendgridAPIKey);
-
-  const msg = {
-    to,
-    cc,
-    from: {
-      email: from,
-      name: "Cal.ai",
-    },
-    text,
-    html,
-    subject,
-  };
-
-  const res = await mail.send(msg);
-  const success = !!res;
-
-  return success;
-};
-
-export default send;

apps/ai/src/utils/verifyParseKey.ts

@@ -1,13 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import { env } from "../env.mjs";
-
-/**
- * Verifies that the request contains the correct parse key.
- * env.PARSE_KEY must be configured as a query param in the sendgrid inbound parse settings.
- */
-export const verifyParseKey = (url: NextRequest["url"]) => {
-  const verified = new URL(url).searchParams.get("parseKey") === env.PARSE_KEY;
-
-  return verified;
-};

apps/ai/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "extends": "@calcom/tsconfig/nextjs.json",
-  "compilerOptions": {
-    "strict": true,
-    "jsx": "preserve",
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["*"]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ]
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    "../../packages/types/window.d.ts"
-  ],
-  "exclude": ["node_modules"]
-}

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

@@ -1,6 +1,6 @@
 import type { NextMiddleware } from "next-api-middleware";
 
-import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
+import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
 import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
@@ -18,7 +18,7 @@ export const dateNotInPast = function (date: Date) {
 
 // This verifies the apiKey and sets the user if it is valid.
 export const verifyApiKey: NextMiddleware = async (req, res, next) => {
-  const licenseKeyService = await LicenseKeyService.create();
+  const licenseKeyService = await LicenseKeySingleton.getInstance();
   const hasValidLicense = await licenseKeyService.checkLicense();
 
   if (!hasValidLicense && IS_PRODUCTION) {

apps/api/v1/lib/utils/isAdmin.ts

@@ -19,6 +19,9 @@ export const isAdminGuard = async (req: NextApiRequest) => {
       accepted: true,
       team: {
         isOrganization: true,
+        organizationSettings: {
+          isAdminAPIEnabled: true,
+        },
       },
       OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }],
     },

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

@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { _BookingModel as Booking, _AttendeeModel, _UserModel, _PaymentModel } from "@calcom/prisma/zod";
+import { _AttendeeModel, _BookingModel as Booking, _PaymentModel, _UserModel } from "@calcom/prisma/zod";
 import { extendedBookingCreateBody, iso8601 } from "@calcom/prisma/zod-utils";
 
 import { schemaQueryUserId } from "./shared/queryUserId";
@@ -14,6 +14,8 @@ const schemaBookingBaseBodyParams = Booking.pick({
   startTime: true,
   endTime: true,
   status: true,
+  rescheduledBy: true,
+  cancelledBy: true,
 }).partial();
 
 export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(schemaQueryUserId.partial());
@@ -23,13 +25,18 @@ export const schemaBookingGetParams = z.object({
   dateTo: iso8601.optional(),
   order: z.enum(["asc", "desc"]).default("asc"),
   sortBy: z.enum(["createdAt", "updatedAt"]).optional(),
+  status: z.enum(["upcoming"]).optional(),
 });
 
+export type Status = z.infer<typeof schemaBookingGetParams>["status"];
+
 const schemaBookingEditParams = z
   .object({
     title: z.string().optional(),
     startTime: iso8601.optional(),
     endTime: iso8601.optional(),
+    cancelledBy: z.string().email({ message: "Invalid Email" }).optional(),
+    rescheduledBy: z.string().email({ message: "Invalid Email" }).optional(),
     // Not supporting responses in edit as that might require re-triggering emails
     // responses
   })
@@ -85,4 +92,6 @@ export const schemaBookingReadPublic = Booking.extend({
   status: true,
   responses: true,
   fromReschedule: true,
+  cancelledBy: true,
+  rescheduledBy: true,
 });

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

@@ -1,5 +1,12 @@
 import { _PaymentModel as Payment } from "@calcom/prisma/zod";
 
-// FIXME: Payment seems a delicate endpoint, do we need to remove anything here?
+export const schemaPaymentPublic = Payment.pick({
-export const schemaPaymentBodyParams = Payment.omit({ id: true });
+  id: true,
-export const schemaPaymentPublic = Payment.omit({ externalId: true });
+  amount: true,
+  success: true,
+  refunded: true,
+  fee: true,
+  paymentOption: true,
+  currency: true,
+  bookingId: true,
+});

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

@@ -9,6 +9,7 @@ export const schemaTeamBaseBodyParams = Team.omit({ id: true, createdAt: true })
   isOrganization: true,
   isPlatform: true,
   smsLockState: true,
+  smsLockReviewedByAdmin: true,
 });
 
 const schemaTeamRequiredParams = z.object({

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

@@ -27,7 +27,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability removed successfully

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

@@ -28,7 +28,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       200:
  *         description: OK

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

@@ -63,7 +63,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability edited successfully

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

@@ -62,7 +62,7 @@ import {
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability created

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

@@ -63,6 +63,25 @@ import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/que
  *         schema:
  *          type: string
  *          enum: [createdAt, updatedAt]
+ *       - in: query
+ *         name: status
+ *         required: false
+ *         schema:
+ *          type: string
+ *          enum: [upcoming]
+ *          description: Filter bookings by status, it will overwrite dateFrom and dateTo filters
+ *       - in: query
+ *         name: dateFrom
+ *         required: false
+ *         schema:
+ *          type: string
+ *          description: ISO 8601 date string to filter bookings by start time
+ *       - in: query
+ *         name: dateTo
+ *         required: false
+ *         schema:
+ *          type: string
+ *          description: ISO 8601 date string to filter bookings by end time
  *     operationId: listBookings
  *     tags:
  *     - bookings
@@ -130,6 +149,7 @@ type GetAdminArgsType = {
   requestedUserIds: number[];
   userId: number;
 };
+
 /**
  * Constructs the WHERE clause for Prisma booking findMany operation.
  *
@@ -148,7 +168,9 @@ function buildWhereClause(
 ) {
   const filterByAttendeeEmails = attendeeEmails.length > 0;
   const userFilter = userIds.length > 0 ? { userId: { in: userIds } } : !!userId ? { userId } : {};
+
   let whereClause = {};
+
   if (filterByAttendeeEmails) {
     whereClause = {
       AND: [
@@ -177,9 +199,7 @@ function buildWhereClause(
     };
   }
 
-  return {
+  return whereClause;
-    ...whereClause,
-  };
 }
 
 export async function handler(req: NextApiRequest) {
@@ -189,7 +209,7 @@ export async function handler(req: NextApiRequest) {
     isOrganizationOwnerOrAdmin,
     pagination: { take, skip },
   } = req;
-  const { dateFrom, dateTo, order, sortBy } = schemaBookingGetParams.parse(req.query);
+  const { dateFrom, dateTo, order, sortBy, status } = schemaBookingGetParams.parse(req.query);
 
   const args: Prisma.BookingFindManyArgs = {};
   if (req.query.take && req.query.page) {
@@ -275,6 +295,19 @@ export async function handler(req: NextApiRequest) {
     };
   }
 
+  if (status) {
+    switch (status) {
+      case "upcoming":
+        args.where = {
+          ...args.where,
+          startTime: { gte: new Date().toISOString() },
+        };
+        break;
+      default:
+        throw new HttpError({ message: "Invalid status", statusCode: 400 });
+    }
+  }
+
   const data = await prisma.booking.findMany(args);
   return { bookings: data.map((booking) => schemaBookingReadPublic.parse(booking)) };
 }

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

@@ -47,6 +47,10 @@ import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
  *                 type: string
  *                 format: date-time
  *                 description: 'End time of the Event'
+ *               rescheduleUid:
+ *                 type: string
+ *                 format: UID
+ *                 description: 'Uid of the booking to reschedule'
  *               responses:
  *                 type: object
  *                 required:

apps/api/v1/pages/api/docs.ts

@@ -11,8 +11,8 @@ const swaggerHandler = withSwagger({
       { url: "https://api.cal.com/v1" },
     ],
     externalDocs: {
-      url: "https://docs.cal.com",
+      url: "https://docs.cal.com/docs",
-      description: "Find more info at our main docs: https://docs.cal.com/",
+      description: "Find more info at our main docs: https://docs.cal.com/docs/",
     },
     info: {
       title: `${pjson.name}: ${pjson.description}`,

apps/api/v1/pages/api/event-types/[id]/_delete.ts

@@ -28,7 +28,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, eventType removed successfully

apps/api/v1/pages/api/event-types/[id]/_get.ts

@@ -34,7 +34,7 @@ import getCalLink from "../_utils/getCalLink";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

apps/api/v1/pages/api/event-types/[id]/_patch.ts

@@ -194,7 +194,7 @@ import checkTeamEventEditPermission from "../_utils/checkTeamEventEditPermission
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, eventType edited successfully

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

@@ -33,7 +33,7 @@ import getCalLink from "./_utils/getCalLink";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

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

@@ -255,7 +255,7 @@ import ensureOnlyMembersAsHosts from "./_utils/ensureOnlyMembersAsHosts";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, event type created
@@ -278,8 +278,8 @@ async function postHandler(req: NextApiRequest) {
 
   let data: Prisma.EventTypeCreateArgs["data"] = {
     ...parsedBody,
-    userId,
+    userId: !!parsedBody.teamId ? null : userId,
-    users: { connect: { id: userId } },
+    users: !!parsedBody.teamId ? undefined : { connect: { id: userId } },
     bookingLimits: bookingLimits === null ? Prisma.DbNull : bookingLimits,
     durationLimits: durationLimits === null ? Prisma.DbNull : durationLimits,
   };
@@ -291,7 +291,7 @@ async function postHandler(req: NextApiRequest) {
     await checkUserMembership(req);
   }
 
-  if (isSystemWideAdmin && parsedBody.userId) {
+  if (isSystemWideAdmin && parsedBody.userId && !parsedBody.teamId) {
     data = { ...parsedBody, users: { connect: { id: parsedBody.userId } } };
   }
 

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

@@ -125,6 +125,7 @@ export async function patchHandler(req: NextApiRequest) {
     metadata: NonNullable<typeof data.metadata> | undefined;
   } = {
     ...data,
+    smsLockReviewedByAdmin: false,
     metadata: data.metadata === null ? {} : data.metadata || undefined,
   };
   const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });

apps/api/v1/pages/api/teams/[teamId]/event-types/_get.ts

@@ -32,7 +32,7 @@ const querySchema = z.object({
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

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

@@ -69,6 +69,9 @@ import { schemaTeamCreateBodyParams, schemaTeamReadPublic } from "~/lib/validati
  *                ownerId:
  *                  type: number
  *                  description: ID of the team owner - only admins can set this.
+ *                parentId:
+ *                  type: number
+ *                  description: ID of the parent organization.
  *     tags:
  *     - teams
  *     responses:
@@ -99,7 +102,7 @@ async function postHandler(req: NextApiRequest) {
     if (alreadyExist) throw new HttpError({ statusCode: 409, message: "Team slug already exists" });
   }
 
-  // Check if parentId is related to this user
+  // Check if parentId is related to this user and is an organization
   if (data.parentId) {
     const parentTeam = await prisma.team.findFirst({
       where: { id: data.parentId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
@@ -107,7 +110,13 @@ async function postHandler(req: NextApiRequest) {
     if (!parentTeam)
       throw new HttpError({
         statusCode: 401,
-        message: "Unauthorized: Invalid parent id. You can only use parent id of your own teams.",
+        message: "Unauthorized: Invalid parent id. You can only use parent id if you are org owner or admin.",
+      });
+
+    if (parentTeam.parentId)
+      throw new HttpError({
+        statusCode: 400,
+        message: "parentId must be of an organization, not a team.",
       });
   }
 
@@ -116,10 +125,11 @@ async function postHandler(req: NextApiRequest) {
     metadata: NonNullable<typeof data.metadata> | undefined;
   } = {
     ...data,
+    smsLockReviewedByAdmin: false,
     metadata: data.metadata === null ? {} : data.metadata || undefined,
   };
 
-  if (!IS_TEAM_BILLING_ENABLED) {
+  if (!IS_TEAM_BILLING_ENABLED || data.parentId) {
     const team = await prisma.team.create({
       data: {
         ...cloneData,
@@ -135,7 +145,7 @@ async function postHandler(req: NextApiRequest) {
     return {
       team: schemaTeamReadPublic.parse(team),
       owner: schemaMembershipPublic.parse(team.members[0]),
-      message: `Team created successfully. We also made user with ID=${ownerId} the owner of this team.`,
+      message: `Team created successfully. We also made user with ID=${effectiveUserId} the owner of this team.`,
     };
   }
 

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

@@ -27,7 +27,7 @@ import { schemaQueryIdAsString } from "~/lib/validations/shared/queryIdString";
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       201:
  *         description: OK, hook removed successfully

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

@@ -28,7 +28,7 @@ import { schemaWebhookReadPublic } from "~/lib/validations/webhook";
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       200:
  *         description: OK

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

@@ -58,7 +58,7 @@ import { schemaWebhookEditBodyParams, schemaWebhookReadPublic } from "~/lib/vali
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       201:
  *         description: OK, webhook edited successfully

apps/api/v1/pages/api/webhooks/_get.ts

@@ -24,7 +24,7 @@ import { schemaWebhookReadPublic } from "~/lib/validations/webhook";
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       200:
  *         description: OK

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

@@ -56,7 +56,7 @@ import { schemaWebhookCreateBodyParams, schemaWebhookReadPublic } from "~/lib/va
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       201:
  *         description: OK, webhook created

apps/api/v1/test/lib/bookings/_get.integration-test.ts

@@ -105,4 +105,87 @@ describe("GET /api/bookings", async () => {
     expect(responseData.bookings.find((b) => b.id === proUserBooking.id)).toBeUndefined();
     expect(groupedUsers.size).toBeGreaterThanOrEqual(2);
   });
+
+  describe("Upcoming bookings feature", () => {
+    it("Returns only upcoming bookings when status=upcoming for regular user", async () => {
+      const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "GET",
+        query: {
+          status: "upcoming",
+        },
+        pagination: DefaultPagination,
+      });
+
+      req.userId = proUser.id;
+
+      const responseData = await handler(req);
+      responseData.bookings.forEach((booking) => {
+        expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
+      });
+    });
+
+    it("Returns all bookings when status not specified for regular user", async () => {
+      const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "GET",
+        pagination: DefaultPagination,
+      });
+
+      req.userId = proUser.id;
+
+      const responseData = await handler(req);
+      expect(responseData.bookings.find((b) => b.id === proUserBooking.id)).toBeDefined();
+
+      const { req: req2 } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "GET",
+        pagination: DefaultPagination,
+      });
+
+      req2.userId = proUser.id;
+
+      const responseData2 = await handler(req2);
+      expect(responseData2.bookings.find((b) => b.id === proUserBooking.id)).toBeDefined();
+    });
+
+    it("Returns only upcoming bookings when status=upcoming for system-wide admin", async () => {
+      const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
+      const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "GET",
+        query: {
+          status: "upcoming",
+        },
+        pagination: {
+          take: 100,
+          skip: 0,
+        },
+      });
+
+      req.isSystemWideAdmin = true;
+      req.userId = adminUser.id;
+
+      const responseData = await handler(req);
+      responseData.bookings.forEach((booking) => {
+        console.log(booking);
+        expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
+      });
+    });
+
+    it("Returns only upcoming bookings when status=upcoming for org admin", async () => {
+      const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
+      const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "GET",
+        query: {
+          status: "upcoming",
+        },
+        pagination: DefaultPagination,
+      });
+
+      req.userId = adminUser.id;
+      req.isOrganizationOwnerOrAdmin = true;
+
+      const responseData = await handler(req);
+      responseData.bookings.forEach((booking) => {
+        expect(new Date(booking.startTime).getTime()).toBeGreaterThanOrEqual(new Date().getTime());
+      });
+    });
+  });
 });

apps/api/v1/test/lib/bookings/_post.test.ts

@@ -11,6 +11,7 @@ import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { buildBooking, buildEventType, buildWebhook } from "@calcom/lib/test/builder";
 import prisma from "@calcom/prisma";
+import type { Booking } from "@calcom/prisma";
 
 import handler from "../../../pages/api/bookings/_post";
 
@@ -157,6 +158,7 @@ describe.skipIf(true)("POST /api/bookings", () => {
 
   describe("Success", () => {
     describe("Regular event-type", () => {
+      let createdBooking: Booking;
       test("Creates one single booking", async () => {
         const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
           method: "POST",
@@ -181,9 +183,43 @@ describe.skipIf(true)("POST /api/bookings", () => {
 
         await handler(req, res);
         console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
-
+        createdBooking = JSON.parse(res._getData());
         expect(prismaMock.booking.create).toHaveBeenCalledTimes(1);
       });
+
+      test("Reschedule created booking", async () => {
+        const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+          method: "POST",
+          body: {
+            name: "testReschedule",
+            start: dayjs().add(2, "day").format(),
+            end: dayjs().add(3, "day").format(),
+            eventTypeId: 2,
+            email: "test@example.com",
+            location: "Cal.com Video",
+            timeZone: "America/Montevideo",
+            language: "en",
+            customInputs: [],
+            metadata: {},
+            userId: 4,
+            rescheduleUid: createdBooking.uid,
+          },
+          prisma,
+        });
+
+        prismaMock.eventType.findUniqueOrThrow.mockResolvedValue(buildEventType());
+        prismaMock.booking.findMany.mockResolvedValue([]);
+
+        await handler(req, res);
+        console.log({ statusCode: res._getStatusCode(), data: JSON.parse(res._getData()) });
+        const rescheduledBooking = JSON.parse(res._getData()) as Booking;
+        expect(prismaMock.booking.create).toHaveBeenCalledTimes(1);
+        expect(rescheduledBooking.fromReschedule).toEqual(createdBooking.uid);
+        const previousBooking = await prisma.booking.findUnique({
+          where: { uid: createdBooking.uid },
+        });
+        expect(previousBooking?.status).toBe("cancelled");
+      });
     });
 
     describe("Recurring event-type", () => {

apps/api/v1/test/lib/event-types/_post.test.ts

@@ -0,0 +1,157 @@
+import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";
+
+import type { Request, Response } from "express";
+import type { NextApiRequest, NextApiResponse } from "next";
+import { createMocks } from "node-mocks-http";
+import { describe, expect, test, vi, afterEach } from "vitest";
+
+import { buildEventType } from "@calcom/lib/test/builder";
+
+import handler from "../../../pages/api/event-types/_post";
+import checkParentEventOwnership from "../../../pages/api/event-types/_utils/checkParentEventOwnership";
+import checkTeamEventEditPermission from "../../../pages/api/event-types/_utils/checkTeamEventEditPermission";
+import checkUserMembership from "../../../pages/api/event-types/_utils/checkUserMembership";
+import ensureOnlyMembersAsHosts from "../../../pages/api/event-types/_utils/ensureOnlyMembersAsHosts";
+import { canUserAccessTeamWithRole } from "../../../pages/api/teams/[teamId]/_auth-middleware";
+
+type CustomNextApiRequest = NextApiRequest & Request;
+type CustomNextApiResponse = NextApiResponse & Response;
+
+const adminUserId = 1;
+const memberUserId = 10;
+
+vi.mock("../../../pages/api/teams/[teamId]/_auth-middleware", () => ({
+  canUserAccessTeamWithRole: vi.fn(),
+}));
+
+vi.mock("../../../pages/api/event-types/_utils/checkUserMembership", () => ({
+  default: vi.fn(),
+}));
+vi.mock("../../../pages/api/event-types/_utils/checkParentEventOwnership", () => ({
+  default: vi.fn(),
+}));
+vi.mock("../../../pages/api/event-types/_utils/checkTeamEventEditPermission", () => ({
+  default: vi.fn(),
+}));
+vi.mock("../../../pages/api/event-types/_utils/ensureOnlyMembersAsHosts", () => ({
+  default: vi.fn(),
+}));
+
+afterEach(() => {
+  vi.resetAllMocks();
+});
+
+describe("POST /api/event-types", () => {
+  describe("Errors", () => {
+    test("should throw 401 if a non-admin user tries to create an event type with userId", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          title: "Tennis class",
+          slug: "tennis-class-{{$guid}}",
+          length: 60,
+          hidden: true,
+          userId: memberUserId,
+        },
+      });
+
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(401);
+      expect(JSON.parse(res._getData()).message).toBe("ADMIN required for `userId`");
+    });
+    test("should throw 401 if not system-wide admin and user cannot access teamId with required roles", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          title: "Tennis class",
+          slug: "tennis-class-{{$guid}}",
+          length: 60,
+          hidden: true,
+          teamId: 9999,
+        },
+      });
+      req.userId = memberUserId;
+      vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
+
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(401);
+      expect(JSON.parse(res._getData()).message).toBe("ADMIN required for `teamId`");
+    });
+    test("should throw 400 if system-wide admin but neither userId nor teamId provided", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          title: "Tennis class",
+          slug: "tennis-class-{{$guid}}",
+          length: 60,
+          hidden: true,
+        },
+      });
+      req.isSystemWideAdmin = true;
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(400);
+      expect(JSON.parse(res._getData()).message).toBe("`userId` or `teamId` required");
+    });
+  });
+
+  describe("Success", () => {
+    test("should call checkParentEventOwnership and checkUserMembership if parentId is present", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          title: "Tennis class",
+          slug: "tennis-class-{{$guid}}",
+          length: 60,
+          hidden: true,
+          userId: memberUserId,
+          parentId: 9999,
+          teamId: 9999,
+        },
+      });
+      req.isSystemWideAdmin = true;
+      req.userId = adminUserId;
+
+      vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
+
+      await handler(req, res);
+      expect(checkParentEventOwnership).toHaveBeenCalled();
+      expect(checkUserMembership).toHaveBeenCalled();
+    });
+
+    test("should create event type successfully if all conditions are met", async () => {
+      const eventTypeTest = buildEventType();
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          title: "test title",
+          slug: "test-slug",
+          length: 60,
+          hidden: true,
+          userId: memberUserId,
+          parentId: 9999,
+          teamId: 9999,
+        },
+      });
+      req.isSystemWideAdmin = true;
+      req.userId = adminUserId;
+
+      vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => true);
+      vi.mocked(checkParentEventOwnership).mockImplementationOnce(async () => undefined);
+      vi.mocked(checkUserMembership).mockImplementationOnce(async () => undefined);
+      vi.mocked(checkTeamEventEditPermission).mockImplementationOnce(async () => undefined);
+      vi.mocked(ensureOnlyMembersAsHosts).mockImplementationOnce(async () => undefined);
+
+      prismaMock.eventType.create.mockResolvedValue(eventTypeTest);
+
+      await handler(req, res);
+      const data = JSON.parse(res._getData());
+
+      expect(prismaMock.eventType.create).toHaveBeenCalledTimes(1);
+      expect(res.statusCode).toBe(200);
+      expect(data.message).toBe("Event type created successfully");
+    });
+  });
+});

apps/api/v1/test/lib/utils/isAdmin.integration-test.ts

@@ -58,7 +58,7 @@ describe("isAdmin guard", () => {
     expect(scope).toBe(ScopeOfAdmin.SystemWide);
   });
 
-  it("Returns org-wide admin when user is set as such", async () => {
+  it("Returns org-wide admin when user is set as such & admin API access is granted", async () => {
     const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {},
@@ -67,10 +67,21 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
 
     req.userId = adminUser.id;
-
     const { isAdmin, scope } = await isAdminGuard(req);
-
     expect(isAdmin).toBe(true);
     expect(scope).toBe(ScopeOfAdmin.OrgOwnerOrAdmin);
   });
+
+  it("Returns no admin when user is set as org admin but admin API access is revoked", async () => {
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "POST",
+      body: {},
+    });
+
+    const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-dunder@example.com" } });
+
+    req.userId = adminUser.id;
+    const { isAdmin } = await isAdminGuard(req);
+    expect(isAdmin).toBe(false);
+  });
 });

apps/api/v2/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
+  <a href="http://nestjs.com/" target="blank"><img src="https://github.com/user-attachments/assets/ce7c2ecf-6097-469a-8512-c846a9fb665d" height="200" alt="Nest Logo" /></a>
 </p>
 
 [circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
@@ -24,7 +24,7 @@
 
 ## Description
 
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+Cal.com is using the [Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
 
 ## Installation
 

apps/api/v2/package.json

@@ -10,7 +10,7 @@
     "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-utils build && yarn workspace @calcom/platform-types build",
+    "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 && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node ./dist/apps/api/v2/src/main.js",
@@ -25,8 +25,9 @@
   },
   "dependencies": {
     "@calcom/platform-constants": "*",
+    "@calcom/platform-enums": "*",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.30",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
-    "@calcom/platform-libraries-0.0.21": "npm:@calcom/platform-libraries@0.0.21",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",

apps/api/v2/src/app.module.ts

@@ -14,8 +14,8 @@ import { RedisService } from "@/modules/redis/redis.service";
 import { BullModule } from "@nestjs/bull";
 import { MiddlewareConsumer, Module, NestModule, RequestMethod } from "@nestjs/common";
 import { ConfigModule } from "@nestjs/config";
-import { APP_INTERCEPTOR, RouterModule } from "@nestjs/core";
+import { APP_GUARD, APP_INTERCEPTOR } from "@nestjs/core";
-import { seconds, ThrottlerModule } from "@nestjs/throttler";
+import { seconds, ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
 import { ThrottlerStorageRedisService } from "nestjs-throttler-storage-redis";
 
 import { AppController } from "./app.controller";
@@ -29,15 +29,8 @@ import { AppController } from "./app.controller";
     }),
 
     RedisModule,
-    BullModule.forRootAsync({
+    BullModule.forRoot({
-      imports: [RedisModule],
+      redis: `${process.env.REDIS_URL}${process.env.NODE_ENV === "production" ? "?tls=true" : ""}`,
-      useFactory: async (redisService: RedisService) => ({
-        redis: {
-          host: redisService.redis.options.host,
-          port: redisService.redis.options.port,
-        },
-      }),
-      inject: [RedisService],
     }),
     ThrottlerModule.forRootAsync({
       imports: [RedisModule],
@@ -45,14 +38,9 @@ import { AppController } from "./app.controller";
       useFactory: (redisService: RedisService) => ({
         throttlers: [
           {
-            name: "short",
+            name: "long",
-            ttl: seconds(10),
+            ttl: seconds(60), // Time to live for the long period in seconds
-            limit: 3,
+            limit: 120, // Maximum number of requests within the long ttl
-          },
-          {
-            name: "medium",
-            ttl: seconds(30),
-            limit: 10,
           },
         ],
         storage: new ThrottlerStorageRedisService(redisService.redis),
@@ -69,6 +57,10 @@ import { AppController } from "./app.controller";
       provide: APP_INTERCEPTOR,
       useClass: ResponseInterceptor,
     },
+    {
+      provide: APP_GUARD,
+      useClass: ThrottlerGuard,
+    },
   ],
 })
 export class AppModule implements NestModule {

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

@@ -1,5 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
+import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
 import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output";
 import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
@@ -19,7 +20,7 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
-import { handleNewBooking } from "@calcom/platform-libraries-0.0.21";
+import { handleNewBooking } from "@calcom/platform-libraries";
 import { ApiSuccessResponse, ApiResponse } from "@calcom/platform-types";
 
 describe("Bookings Endpoints", () => {
@@ -90,7 +91,10 @@ describe("Bookings Endpoints", () => {
       const bookingTimeZone = "Europe/London";
       const bookingLanguage = "en";
       const bookingHashedLink = "";
-      const bookingMetadata = {};
+      const bookingMetadata = {
+        timeFormat: "12",
+        meetingType: "organizer-phone",
+      };
       const bookingResponses = {
         name: "tester",
         email: "tester@example.com",
@@ -102,7 +106,7 @@ describe("Bookings Endpoints", () => {
         guests: [],
       };
 
-      const body = {
+      const body: CreateBookingInput = {
         start: bookingStart,
         end: bookingEnd,
         eventTypeId: bookingEventTypeId,
@@ -135,6 +139,64 @@ describe("Bookings Endpoints", () => {
         });
     });
 
+    describe("should reschedule a booking", () => {
+      it("should reschedule with updated start time, end time & metadata", async () => {
+        const newBookingStart = "2040-05-21T12:30:00.000Z";
+        const newBookingEnd = "2040-05-21T13:30:00.000Z";
+        const bookingEventTypeId = eventTypeId;
+        const bookingTimeZone = "Europe/London";
+        const bookingLanguage = "en";
+        const bookingHashedLink = "";
+        const newBookingMetadata = {
+          timeFormat: "24",
+          meetingType: "attendee-phone",
+        };
+        const bookingResponses = {
+          name: "tester",
+          email: "tester@example.com",
+          location: {
+            value: "link",
+            optionValue: "",
+          },
+          notes: "test",
+          guests: [],
+        };
+
+        const body: CreateBookingInput = {
+          rescheduleUid: createdBooking.uid,
+          start: newBookingStart,
+          end: newBookingEnd,
+          eventTypeId: bookingEventTypeId,
+          timeZone: bookingTimeZone,
+          language: bookingLanguage,
+          metadata: newBookingMetadata,
+          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(newBookingStart);
+            expect(responseBody.data.eventTypeId).toEqual(bookingEventTypeId);
+            expect(responseBody.data.user.timeZone).toEqual(bookingTimeZone);
+            expect(responseBody.data.metadata).toEqual(newBookingMetadata);
+
+            createdBooking = responseBody.data;
+          });
+      });
+    });
+
     it("should get bookings", async () => {
       return request(app.getHttpServer())
         .get("/v2/bookings?filters[status]=upcoming")

apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts

@@ -46,7 +46,7 @@ import {
   getBookingInfo,
   handleCancelBooking,
   getBookingForReschedule,
-} from "@calcom/platform-libraries-0.0.21";
+} from "@calcom/platform-libraries";
 import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
 import { ApiResponse } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
@@ -211,6 +211,7 @@ export class BookingsController {
   @Permissions([BOOKING_WRITE])
   @UseGuards(ApiAuthGuard)
   async markNoShow(
+    @GetUser("id") userId: number,
     @Body() body: MarkNoShowInput,
     @Param("bookingUid") bookingUid: string
   ): Promise<MarkNoShowOutput> {
@@ -219,6 +220,7 @@ export class BookingsController {
         bookingUid: bookingUid,
         attendees: body.attendees,
         noShowHost: body.noShowHost,
+        userId,
       });
 
       return { status: SUCCESS_STATUS, data: markNoShowResponse };

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

@@ -1,7 +1,7 @@
 import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
 import { IsBoolean, IsNumber, IsOptional } from "class-validator";
 
-import type { AppsStatus } from "@calcom/platform-libraries-0.0.21";
+import type { AppsStatus } from "@calcom/platform-libraries";
 
 export class CreateRecurringBookingInput extends CreateBookingInput {
   @IsBoolean()

apps/api/v2/src/ee/bookings/outputs/mark-no-show.output.ts

@@ -20,10 +20,6 @@ class HandleMarkNoShowData {
   @IsOptional()
   noShowHost?: boolean;
 
-  @IsString()
-  @IsOptional()
-  messageKey?: string;
-
   @ValidateNested()
   @Type(() => Attendee)
   @IsArray()

apps/api/v2/src/ee/calendars/outputs/connected-calendars.output.ts

@@ -105,7 +105,7 @@ class Primary {
   credentialId!: number;
 }
 
-class Calendar {
+export class Calendar {
   @IsEmail()
   externalId!: string;
 
@@ -135,7 +135,7 @@ class Calendar {
   credentialId!: number;
 }
 
-class ConnectedCalendar {
+export class ConnectedCalendar {
   @ValidateNested()
   @IsObject()
   integration!: Integration;

apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts

@@ -5,7 +5,7 @@ import { BadRequestException, UnauthorizedException } from "@nestjs/common";
 import { Injectable } from "@nestjs/common";
 
 import { SUCCESS_STATUS, APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants";
-import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.21";
+import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries";
 
 @Injectable()
 export class AppleCalendarService implements CredentialSyncCalendarApp {

apps/api/v2/src/ee/calendars/services/calendars.service.ts

@@ -18,7 +18,7 @@ import { User } from "@prisma/client";
 import { DateTime } from "luxon";
 import { z } from "zod";
 
-import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.21";
+import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries";
 import { Calendar } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
 

apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts

@@ -35,7 +35,7 @@ import {
   EventTypesPublic,
   eventTypeBookingFields,
   eventTypeLocations,
-} from "@calcom/platform-libraries-0.0.21";
+} from "@calcom/platform-libraries";
 import { ApiSuccessResponse } from "@calcom/platform-types";
 
 describe("Event types Endpoints", () => {

apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.ts

@@ -40,7 +40,6 @@ import { ApiTags as DocsTags } from "@nestjs/swagger";
 
 import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
 import { getPublicEvent, getEventTypesByViewer } from "@calcom/platform-libraries-0.0.2";
-
 import { PrismaClient } from "@calcom/prisma";
 
 @Controller({

apps/api/v2/src/ee/event-types/event-types_2024_04_15/event-types.repository.ts

@@ -1,15 +1,20 @@
 import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
-import { getEventTypeById } from "@calcom/platform-libraries-0.0.21";
+import { getEventTypeById } from "@calcom/platform-libraries";
 import type { PrismaClient } from "@calcom/prisma";
 
 @Injectable()
 export class EventTypesRepository_2024_04_15 {
-  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+  constructor(
+    private readonly dbRead: PrismaReadService,
+    private readonly dbWrite: PrismaWriteService,
+    private usersService: UsersService
+  ) {}
 
   async createUserEventType(
     userId: number,
@@ -46,7 +51,7 @@ export class EventTypesRepository_2024_04_15 {
     eventTypeId: number
   ) {
     return await getEventTypeById({
-      currentOrganizationId: user.movedToProfile?.organizationId || user.organizationId,
+      currentOrganizationId: this.usersService.getUserMainOrgId(user),
       eventTypeId,
       userId: user.id,
       prisma: this.dbRead.prisma as unknown as PrismaClient,

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input.ts

@@ -177,6 +177,10 @@ export class BookingField_2024_04_15 {
   @ValidateNested({ each: true })
   @Type(() => Source)
   sources?: Source[];
+
+  @IsOptional()
+  @IsBoolean()
+  disableOnPrefill?: boolean;
 }
 
 export class RecurringEvent_2024_04_15 {

apps/api/v2/src/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output.ts

@@ -87,6 +87,10 @@ class BookingField {
   @Type(() => Source)
   @IsOptional()
   sources?: Source[];
+
+  @IsOptional()
+  @IsBoolean()
+  disableOnPrefill?: boolean;
 }
 
 class Organization {

apps/api/v2/src/ee/event-types/event-types_2024_04_15/services/event-types.service.ts

@@ -6,6 +6,7 @@ import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
+import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
 
@@ -14,7 +15,7 @@ import {
   updateEventType,
   EventTypesPublic,
   getEventTypesPublic,
-} from "@calcom/platform-libraries-0.0.21";
+} from "@calcom/platform-libraries";
 import { EventType } from "@calcom/prisma/client";
 
 @Injectable()
@@ -24,7 +25,8 @@ export class EventTypesService_2024_04_15 {
     private readonly membershipsRepository: MembershipsRepository,
     private readonly usersRepository: UsersRepository,
     private readonly selectedCalendarsRepository: SelectedCalendarsRepository,
-    private readonly dbWrite: PrismaWriteService
+    private readonly dbWrite: PrismaWriteService,
+    private usersService: UsersService
   ) {}
 
   async createUserEventType(
@@ -53,11 +55,11 @@ export class EventTypesService_2024_04_15 {
   }
 
   async getUserToCreateEvent(user: UserWithProfile) {
-    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+    const organizationId = this.usersService.getUserMainOrgId(user);
     const isOrgAdmin = organizationId
       ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
       : false;
-    const profileId = user.movedToProfile?.id || null;
+    const profileId = this.usersService.getUserMainProfile(user)?.id || null;
     return {
       id: user.id,
       role: user.role,
@@ -80,7 +82,7 @@ export class EventTypesService_2024_04_15 {
   }
 
   async getUserEventTypeForAtom(user: UserWithProfile, eventTypeId: number) {
-    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+    const organizationId = this.usersService.getUserMainOrgId(user);
 
     const isUserOrganizationAdmin = organizationId
       ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
@@ -153,7 +155,7 @@ export class EventTypesService_2024_04_15 {
   }
 
   async getUserToUpdateEvent(user: UserWithProfile) {
-    const profileId = user.movedToProfile?.id || null;
+    const profileId = this.usersService.getUserMainProfile(user)?.id || null;
     const selectedCalendars = await this.selectedCalendarsRepository.getUserSelectedCalendars(user.id);
     return { ...user, profile: { id: profileId }, selectedCalendars };
   }

apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts

@@ -1,5 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
@@ -19,12 +20,14 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants";
+import { BookingWindowPeriodInputTypeEnum_2024_06_14, FrequencyInput } from "@calcom/platform-enums";
 import {
   ApiSuccessResponse,
   CreateEventTypeInput_2024_06_14,
   EventTypeOutput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
 } from "@calcom/platform-types";
+import { SchedulingType } from "@calcom/prisma/enums";
 
 describe("Event types Endpoints", () => {
   describe("Not authenticated", () => {
@@ -212,6 +215,26 @@ describe("Event types Endpoints", () => {
           },
         ],
         scheduleId: firstSchedule.id,
+        bookingLimitsCount: {
+          day: 2,
+          week: 5,
+        },
+        onlyShowFirstAvailableSlot: true,
+        bookingLimitsDuration: {
+          day: 60,
+          week: 100,
+        },
+        offsetStart: 30,
+        bookingWindow: {
+          type: BookingWindowPeriodInputTypeEnum_2024_06_14.calendarDays,
+          value: 30,
+          rolling: true,
+        },
+        recurrence: {
+          frequency: FrequencyInput.weekly,
+          interval: 2,
+          occurrences: 10,
+        },
       };
 
       return request(app.getHttpServer())
@@ -230,7 +253,12 @@ describe("Event types Endpoints", () => {
           expect(createdEventType.bookingFields).toEqual(body.bookingFields);
           expect(createdEventType.ownerId).toEqual(user.id);
           expect(createdEventType.scheduleId).toEqual(firstSchedule.id);
-
+          expect(createdEventType.bookingLimitsCount).toEqual(body.bookingLimitsCount);
+          expect(createdEventType.onlyShowFirstAvailableSlot).toEqual(body.onlyShowFirstAvailableSlot);
+          expect(createdEventType.bookingLimitsDuration).toEqual(body.bookingLimitsDuration);
+          expect(createdEventType.offsetStart).toEqual(body.offsetStart);
+          expect(createdEventType.bookingWindow).toEqual(body.bookingWindow);
+          expect(createdEventType.recurrence).toEqual(body.recurrence);
           eventType = responseBody.data;
         });
     });
@@ -241,6 +269,26 @@ describe("Event types Endpoints", () => {
       const body: UpdateEventTypeInput_2024_06_14 = {
         title: newTitle,
         scheduleId: secondSchedule.id,
+        bookingLimitsCount: {
+          day: 4,
+          week: 10,
+        },
+        onlyShowFirstAvailableSlot: true,
+        bookingLimitsDuration: {
+          day: 100,
+          week: 200,
+        },
+        offsetStart: 50,
+        bookingWindow: {
+          type: BookingWindowPeriodInputTypeEnum_2024_06_14.businessDays,
+          value: 40,
+          rolling: false,
+        },
+        recurrence: {
+          frequency: FrequencyInput.monthly,
+          interval: 4,
+          occurrences: 10,
+        },
       };
 
       return request(app.getHttpServer())
@@ -261,9 +309,21 @@ describe("Event types Endpoints", () => {
           expect(updatedEventType.bookingFields).toEqual(eventType.bookingFields);
           expect(updatedEventType.ownerId).toEqual(user.id);
           expect(updatedEventType.scheduleId).toEqual(secondSchedule.id);
+          expect(updatedEventType.bookingLimitsCount).toEqual(body.bookingLimitsCount);
+          expect(updatedEventType.onlyShowFirstAvailableSlot).toEqual(body.onlyShowFirstAvailableSlot);
+          expect(updatedEventType.bookingLimitsDuration).toEqual(body.bookingLimitsDuration);
+          expect(updatedEventType.offsetStart).toEqual(body.offsetStart);
+          expect(updatedEventType.bookingWindow).toEqual(body.bookingWindow);
+          expect(updatedEventType.recurrence).toEqual(body.recurrence);
 
           eventType.title = newTitle;
           eventType.scheduleId = secondSchedule.id;
+          eventType.bookingLimitsCount = updatedEventType.bookingLimitsCount;
+          eventType.onlyShowFirstAvailableSlot = updatedEventType.onlyShowFirstAvailableSlot;
+          eventType.bookingLimitsDuration = updatedEventType.bookingLimitsDuration;
+          eventType.offsetStart = updatedEventType.offsetStart;
+          eventType.bookingWindow = updatedEventType.bookingWindow;
+          eventType.recurrence = updatedEventType.recurrence;
         });
     });
 
@@ -299,6 +359,12 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType.locations).toEqual(eventType.locations);
       expect(fetchedEventType.bookingFields).toEqual(eventType.bookingFields);
       expect(fetchedEventType.ownerId).toEqual(user.id);
+      expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
+      expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
+      expect(fetchedEventType.bookingLimitsDuration).toEqual(eventType.bookingLimitsDuration);
+      expect(fetchedEventType.offsetStart).toEqual(eventType.offsetStart);
+      expect(fetchedEventType.bookingWindow).toEqual(eventType.bookingWindow);
+      expect(fetchedEventType.recurrence).toEqual(eventType.recurrence);
     });
 
     it(`/GET/even-types by username`, async () => {
@@ -324,6 +390,12 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
       expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
       expect(fetchedEventType?.ownerId).toEqual(user.id);
+      expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
+      expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
+      expect(fetchedEventType.bookingLimitsDuration).toEqual(eventType.bookingLimitsDuration);
+      expect(fetchedEventType.offsetStart).toEqual(eventType.offsetStart);
+      expect(fetchedEventType.bookingWindow).toEqual(eventType.bookingWindow);
+      expect(fetchedEventType.recurrence).toEqual(eventType.recurrence);
     });
 
     it(`/GET/event-types by username and eventSlug`, async () => {
@@ -344,6 +416,12 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
       expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
       expect(fetchedEventType?.ownerId).toEqual(user.id);
+      expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
+      expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
+      expect(fetchedEventType.bookingLimitsDuration).toEqual(eventType.bookingLimitsDuration);
+      expect(fetchedEventType.offsetStart).toEqual(eventType.offsetStart);
+      expect(fetchedEventType.bookingWindow).toEqual(eventType.bookingWindow);
+      expect(fetchedEventType.recurrence).toEqual(eventType.recurrence);
     });
 
     it(`/GET/:id not existing`, async () => {
@@ -380,4 +458,329 @@ describe("Event types Endpoints", () => {
       await app.close();
     });
   });
+
+  describe("Handle legacy event-types booking fields", () => {
+    let app: INestApplication;
+
+    let oAuthClient: PlatformOAuthClient;
+    let organization: Team;
+    let userRepositoryFixture: UserRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+
+    const userEmail = "legacy-event-types-test-e2e@api.com";
+    const name = "bob-the-builder";
+    const username = name;
+    let user: User;
+    let legacyEventTypeId1: number;
+    let legacyEventTypeId2: number;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          providers: [PrismaExceptionFilter, HttpExceptionFilter],
+          imports: [AppModule, UsersModule, EventTypesModule_2024_06_14, TokensModule],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+
+      organization = await teamRepositoryFixture.create({ name: "organization" });
+      oAuthClient = await createOAuthClient(organization.id);
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        name,
+        username,
+      });
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["redirect-uri"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should be defined", () => {
+      expect(oauthClientRepositoryFixture).toBeDefined();
+      expect(userRepositoryFixture).toBeDefined();
+      expect(oAuthClient).toBeDefined();
+      expect(user).toBeDefined();
+    });
+
+    it("should not allow creating an event type with input of event-types version 2024_04_15", async () => {
+      const body: CreateEventTypeInput_2024_04_15 = {
+        title: "Coding class",
+        slug: "coding-class",
+        description: "Let's learn how to code like a pro.",
+        length: 60,
+        locations: [{ type: "integrations:daily" }],
+      };
+
+      return request(app.getHttpServer())
+        .post("/api/v2/event-types")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should return empty bookingFields if system fields are the only one in database", async () => {
+      const legacyEventTypeInput = {
+        title: "legacy event type",
+        description: "legacy event type description",
+        length: 40,
+        hidden: false,
+        slug: "legacy-event-type",
+        locations: [],
+        schedulingType: SchedulingType.ROUND_ROBIN,
+        bookingFields: [
+          {
+            name: "name",
+            type: "name",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: true,
+            defaultLabel: "your_name",
+          },
+          {
+            name: "email",
+            type: "email",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: true,
+            defaultLabel: "email_address",
+          },
+          {
+            name: "location",
+            type: "radioInput",
+            label: "",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: false,
+            placeholder: "",
+            defaultLabel: "location",
+            getOptionsAt: "locations",
+            optionsInputs: {
+              phone: { type: "phone", required: true, placeholder: "" },
+              attendeeInPerson: { type: "address", required: true, placeholder: "" },
+            },
+            hideWhenJustOneOption: true,
+          },
+          {
+            name: "title",
+            type: "text",
+            hidden: true,
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: true,
+            defaultLabel: "what_is_this_meeting_about",
+            defaultPlaceholder: "",
+          },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
+          {
+            name: "guests",
+            type: "multiemail",
+            hidden: false,
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_guests",
+            defaultPlaceholder: "email",
+          },
+          {
+            name: "rescheduleReason",
+            type: "textarea",
+            views: [{ id: "reschedule", label: "Reschedule View" }],
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "reason_for_reschedule",
+            defaultPlaceholder: "reschedule_placeholder",
+          },
+        ],
+      };
+      const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
+      legacyEventTypeId1 = legacyEventType.id;
+
+      return request(app.getHttpServer())
+        .get(`/api/v2/event-types/${legacyEventTypeId1}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+          const fetchedEventType = responseBody.data;
+          expect(fetchedEventType.bookingFields).toEqual([]);
+        });
+    });
+
+    it("should return user created bookingFields among system fields in the database", async () => {
+      const userDefinedBookingField = {
+        name: "team",
+        type: "textarea",
+        label: "your team",
+        sources: [
+          {
+            id: "user",
+            type: "user",
+            label: "User",
+            fieldRequired: true,
+          },
+        ],
+        editable: "user",
+        required: true,
+        placeholder: "FC Barcelona",
+      };
+
+      const legacyEventTypeInput = {
+        title: "legacy event type two",
+        description: "legacy event type description two",
+        length: 40,
+        hidden: false,
+        slug: "legacy-event-type-two",
+        locations: [],
+        schedulingType: SchedulingType.ROUND_ROBIN,
+        bookingFields: [
+          userDefinedBookingField,
+          {
+            name: "name",
+            type: "name",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: true,
+            defaultLabel: "your_name",
+          },
+          {
+            name: "email",
+            type: "email",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: true,
+            defaultLabel: "email_address",
+          },
+          {
+            name: "location",
+            type: "radioInput",
+            label: "",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: false,
+            placeholder: "",
+            defaultLabel: "location",
+            getOptionsAt: "locations",
+            optionsInputs: {
+              phone: { type: "phone", required: true, placeholder: "" },
+              attendeeInPerson: { type: "address", required: true, placeholder: "" },
+            },
+            hideWhenJustOneOption: true,
+          },
+          {
+            name: "title",
+            type: "text",
+            hidden: true,
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: true,
+            defaultLabel: "what_is_this_meeting_about",
+            defaultPlaceholder: "",
+          },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
+          {
+            name: "guests",
+            type: "multiemail",
+            hidden: false,
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_guests",
+            defaultPlaceholder: "email",
+          },
+          {
+            name: "rescheduleReason",
+            type: "textarea",
+            views: [{ id: "reschedule", label: "Reschedule View" }],
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "reason_for_reschedule",
+            defaultPlaceholder: "reschedule_placeholder",
+          },
+        ],
+      };
+      const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
+      legacyEventTypeId2 = legacyEventType.id;
+
+      return request(app.getHttpServer())
+        .get(`/api/v2/event-types/${legacyEventTypeId2}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+          const fetchedEventType = responseBody.data;
+
+          expect(fetchedEventType.bookingFields).toEqual([
+            {
+              type: userDefinedBookingField.type,
+              slug: userDefinedBookingField.name,
+              label: userDefinedBookingField.label,
+              required: userDefinedBookingField.required,
+              placeholder: userDefinedBookingField.placeholder,
+            },
+          ]);
+        });
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      try {
+        await eventTypesRepositoryFixture.delete(legacyEventTypeId1);
+        await eventTypesRepositoryFixture.delete(legacyEventTypeId2);
+      } catch (e) {
+        // Event type might have been deleted by the test
+      }
+      try {
+        await userRepositoryFixture.delete(user.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
+      await app.close();
+    });
+  });
 });

apps/api/v2/src/ee/event-types/event-types_2024_06_14/event-types.repository.ts

@@ -1,5 +1,6 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
@@ -7,13 +8,25 @@ import {
   getEventTypeById,
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.21";
+} from "@calcom/platform-libraries";
 import { CreateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 import type { PrismaClient } from "@calcom/prisma";
 
 type InputEventTransformed = Omit<
   CreateEventTypeInput_2024_06_14,
-  "lengthInMinutes" | "locations" | "bookingFields"
+  | "lengthInMinutes"
+  | "locations"
+  | "bookingFields"
+  | "bookingLimitsCount"
+  | "onlyShowFirstAvailableSlot"
+  | "bookingLimitsDuration"
+  | "offsetStart"
+  | "periodType"
+  | "periodDays"
+  | "periodCountCalendarDays"
+  | "periodStartDate"
+  | "periodEndDate"
+  | "recurrence"
 > & {
   length: number;
   slug: string;
@@ -23,7 +36,11 @@ type InputEventTransformed = Omit<
 
 @Injectable()
 export class EventTypesRepository_2024_06_14 {
-  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+  constructor(
+    private readonly dbRead: PrismaReadService,
+    private readonly dbWrite: PrismaWriteService,
+    private usersService: UsersService
+  ) {}
 
   async createUserEventType(userId: number, body: InputEventTransformed) {
     return this.dbWrite.prisma.eventType.create({
@@ -69,7 +86,7 @@ export class EventTypesRepository_2024_06_14 {
     eventTypeId: number
   ) {
     return await getEventTypeById({
-      currentOrganizationId: user.movedToProfile?.organizationId || user.organizationId,
+      currentOrganizationId: this.usersService.getUserMainOrgId(user),
       eventTypeId,
       userId: user.id,
       prisma: this.dbRead.prisma as unknown as PrismaClient,

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/event-types.service.ts

@@ -10,9 +10,9 @@ import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
 
-import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.21";
+import { createEventType, updateEventType } from "@calcom/platform-libraries";
-import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.21";
+import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries";
-import { dynamicEvent } from "@calcom/platform-libraries-0.0.21";
+import { dynamicEvent } from "@calcom/platform-libraries";
 import {
   CreateEventTypeInput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
@@ -38,7 +38,17 @@ export class EventTypesService_2024_06_14 {
   async createUserEventType(user: UserWithProfile, body: CreateEventTypeInput_2024_06_14) {
     await this.checkCanCreateEventType(user.id, body);
     const eventTypeUser = await this.getUserToCreateEvent(user);
-    const bodyTransformed = this.inputEventTypesService.transformInputCreateEventType(body);
+    const {
+      bookingLimits,
+      durationLimits,
+      periodType = undefined,
+      periodDays = undefined,
+      periodCountCalendarDays = undefined,
+      periodStartDate = undefined,
+      periodEndDate = undefined,
+      recurrence = undefined,
+      ...bodyTransformed
+    } = this.inputEventTypesService.transformInputCreateEventType(body);
     const { eventType: eventTypeCreated } = await createEventType({
       input: bodyTransformed,
       ctx: {
@@ -49,6 +59,27 @@ export class EventTypesService_2024_06_14 {
       },
     });
 
+    await updateEventType({
+      input: {
+        id: eventTypeCreated.id,
+        bookingLimits,
+        durationLimits,
+        periodType,
+        periodDays,
+        periodCountCalendarDays,
+        periodStartDate,
+        periodEndDate,
+        recurrence,
+        ...bodyTransformed,
+      },
+      ctx: {
+        user: eventTypeUser,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        prisma: this.dbWrite.prisma,
+      },
+    });
+
     const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeCreated.id);
 
     if (!eventType) {
@@ -90,18 +121,21 @@ export class EventTypesService_2024_06_14 {
   }
 
   async getUserToCreateEvent(user: UserWithProfile) {
-    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+    const organizationId = this.usersService.getUserMainOrgId(user);
     const isOrgAdmin = organizationId
       ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
       : false;
-    const profileId = user.movedToProfile?.id || null;
+    const profileId = this.usersService.getUserMainProfile(user)?.id || null;
+    const selectedCalendars = await this.selectedCalendarsRepository.getUserSelectedCalendars(user.id);
     return {
       id: user.id,
       role: user.role,
+      username: user.username,
       organizationId: user.organizationId,
       organization: { isOrgAdmin },
       profile: { id: profileId },
       metadata: user.metadata,
+      selectedCalendars,
     };
   }
 
@@ -127,7 +161,7 @@ export class EventTypesService_2024_06_14 {
   }
 
   async getUserEventTypeForAtom(user: UserWithProfile, eventTypeId: number) {
-    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+    const organizationId = this.usersService.getUserMainOrgId(user);
 
     const isUserOrganizationAdmin = organizationId
       ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
@@ -238,7 +272,7 @@ export class EventTypesService_2024_06_14 {
   }
 
   async getUserToUpdateEvent(user: UserWithProfile) {
-    const profileId = user.movedToProfile?.id || null;
+    const profileId = this.usersService.getUserMainProfile(user)?.id || null;
     const selectedCalendars = await this.selectedCalendarsRepository.getUserSelectedCalendars(user.id);
     return { ...user, profile: { id: profileId }, selectedCalendars };
   }

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts

@@ -3,7 +3,10 @@ import { Injectable } from "@nestjs/common";
 import {
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.21";
+  transformApiEventTypeIntervalLimits,
+  transformApiEventTypeFutureBookingLimits,
+  transformApiEventTypeRecurrence,
+} from "@calcom/platform-libraries";
 import { CreateEventTypeInput_2024_06_14, UpdateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 
 @Injectable()
@@ -16,20 +19,45 @@ export class InputEventTypesService_2024_06_14 {
       },
     ];
 
-    const { lengthInMinutes, locations, bookingFields, ...rest } = inputEventType;
+    const {
+      lengthInMinutes,
+      locations,
+      bookingFields,
+      bookingLimitsCount,
+      bookingLimitsDuration,
+      bookingWindow,
+      recurrence,
+      ...rest
+    } = inputEventType;
 
     const eventType = {
       ...rest,
       length: lengthInMinutes,
       locations: this.transformInputLocations(locations || defaultLocations),
       bookingFields: this.transformInputBookingFields(bookingFields),
+      bookingLimits: bookingLimitsCount ? this.transformInputIntervalLimits(bookingLimitsCount) : undefined,
+      durationLimits: bookingLimitsDuration
+        ? this.transformInputIntervalLimits(bookingLimitsDuration)
+        : undefined,
+      ...this.transformInputBookingWindow(bookingWindow),
+      recurringEvent: recurrence ? this.transformInputRecurrignEvent(recurrence) : undefined,
     };
 
     return eventType;
   }
 
   transformInputUpdateEventType(inputEventType: UpdateEventTypeInput_2024_06_14) {
-    const { lengthInMinutes, locations, bookingFields, scheduleId, ...rest } = inputEventType;
+    const {
+      lengthInMinutes,
+      locations,
+      bookingFields,
+      scheduleId,
+      bookingLimitsCount,
+      bookingLimitsDuration,
+      bookingWindow,
+      recurrence,
+      ...rest
+    } = inputEventType;
 
     const eventType = {
       ...rest,
@@ -37,6 +65,12 @@ export class InputEventTypesService_2024_06_14 {
       locations: locations ? this.transformInputLocations(locations) : undefined,
       bookingFields: bookingFields ? this.transformInputBookingFields(bookingFields) : undefined,
       schedule: scheduleId,
+      bookingLimits: bookingLimitsCount ? this.transformInputIntervalLimits(bookingLimitsCount) : undefined,
+      durationLimits: bookingLimitsDuration
+        ? this.transformInputIntervalLimits(bookingLimitsDuration)
+        : undefined,
+      ...this.transformInputBookingWindow(bookingWindow),
+      recurringEvent: recurrence ? this.transformInputRecurrignEvent(recurrence) : undefined,
     };
 
     return eventType;
@@ -49,4 +83,17 @@ export class InputEventTypesService_2024_06_14 {
   transformInputBookingFields(inputBookingFields: CreateEventTypeInput_2024_06_14["bookingFields"]) {
     return transformApiEventTypeBookingFields(inputBookingFields);
   }
+
+  transformInputIntervalLimits(inputBookingFields: CreateEventTypeInput_2024_06_14["bookingLimitsCount"]) {
+    return transformApiEventTypeIntervalLimits(inputBookingFields);
+  }
+
+  transformInputBookingWindow(inputBookingWindow: CreateEventTypeInput_2024_06_14["bookingWindow"]) {
+    const res = transformApiEventTypeFutureBookingLimits(inputBookingWindow);
+    return !!res ? res : {};
+  }
+
+  transformInputRecurrignEvent(recurrence: CreateEventTypeInput_2024_06_14["recurrence"]) {
+    return transformApiEventTypeRecurrence(recurrence);
+  }
 }