chore: Release v4.3.6 (#16136)

* use singleton

* fix typo

* Fix getInstance call

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>

.env.example

@@ -15,10 +15,14 @@
 # - You can not repackage or sell the codebase
 # - Acquire a commercial license to remove these terms by visiting: cal.com/sales
 #
-# To enable enterprise-only features, as an admin, go to /auth/setup to select your license and follow
-# instructions. This environment variable is deprecated although still supported for backward compatibility.
-# @see https://console.cal.com
+
+# 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"
 # ***********************************************************************************************************
 
 # - DATABASE ************************************************************************************************
@@ -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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug report
-description: "Found a bug? Please fill out the sections below. \U0001F44D"
-title: ""
-labels: 🐛 bug
+description: "Please make sure you have checked for any duplicate issues."
+title: "(bug)"
+labels: ["🐛 bug"]
 assignees: []
 body:
 - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: https://go.cal.com/discord
-    about: Ask a general question about the project on our discord community
+    url: https://github.com/calcom/cal.com/discussions
+    about: Need help selfhosting or ask a general question about the project? Open a discussion

.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"], 
-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
+labels: ["✨ feature", "🚨 needs approval"]
+assignees: ""
+---
 
-        - 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/workflows/all-checks.yml

@@ -69,12 +69,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/api-v1-production-build.yml

@@ -3,6 +3,9 @@ name: Production Builds
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}

.github/workflows/api-v2-production-build.yml

@@ -10,6 +10,8 @@ env:
 jobs:
   build:
     name: Build API v2
+    permissions:
+      contents: read
     runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 30
     services:

.github/workflows/check-types.yml

@@ -3,6 +3,8 @@ on:
   workflow_call:
 env:
   NODE_OPTIONS: --max-old-space-size=4096
+permissions:
+  contents: read
 jobs:
   check-types:
     runs-on: buildjet-4vcpu-ubuntu-2204

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

@@ -0,0 +1,79 @@
+name: E2E
+on:
+  workflow_call:
+env:
+  ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
+  API_KEY_PREFIX: ${{ secrets.CI_API_KEY_PREFIX }}
+  API_PORT: ${{ vars.CI_API_V2_PORT }}
+  CALCOM_LICENSE_KEY: ${{ secrets.CI_CALCOM_LICENSE_KEY }}
+  DAILY_API_KEY: ${{ secrets.CI_DAILY_API_KEY }}
+  DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_READ_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_WRITE_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
+  GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
+  IS_E2E: true
+  NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}
+  NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
+  NODE_OPTIONS: --max-old-space-size=4096
+  REDIS_URL: "redis://localhost:6379"
+  STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
+  STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
+jobs:
+  e2e:
+    timeout-minutes: 20
+    name: E2E API v2
+    runs-on: buildjet-8vcpu-ubuntu-2204
+    services:
+      postgres:
+        image: postgres:13
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: calendso
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:latest
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install
+      - uses: ./.github/actions/cache-db
+      - name: Run Tests
+        working-directory: apps/api/v2
+        run: |
+          yarn test:e2e
+          EXIT_CODE=$?
+          echo "yarn test:e2e command exit code: $EXIT_CODE"
+          exit $EXIT_CODE
+      - name: Upload Test Results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-api-v2
+          path: test-results

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

@@ -1,6 +1,9 @@
 name: E2E App Store Tests
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}

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

@@ -1,6 +1,9 @@
 name: E2E Embed React tests and booking flow (for non-embed as well)
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}

.github/workflows/e2e-embed.yml

@@ -1,6 +1,9 @@
 name: E2E Embed Core tests and booking flow (for non-embed as well)
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}

.github/workflows/e2e.yml

@@ -1,6 +1,9 @@
 name: E2E
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}

.github/workflows/integration-tests.yml

@@ -1,6 +1,8 @@
 name: Integration
 on:
   workflow_call:
+permissions:
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}

.github/workflows/lint.yml

@@ -1,6 +1,9 @@
 name: Lint
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 jobs:
   lint:
     runs-on: buildjet-4vcpu-ubuntu-2204
@@ -16,13 +19,6 @@ jobs:
       - name: Merge lint reports
         run: jq -s '[.[]]|flatten' lint-results/*.json &> lint-results/eslint_report.json
 
-      - name: Annotate Code Linting Results
-        uses: ataylorme/eslint-annotate-action@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          report-json: "lint-results/eslint_report.json"
-          only-pr-files: false
-
       - name: Upload ESLint report
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

.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

@@ -7,6 +7,10 @@ on:
     branches:
       - main
 
+permissions:
+  actions: write
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
@@ -63,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.yml

@@ -8,6 +8,10 @@ on:
       - gh-actions-test-branch
   workflow_dispatch:
 
+permissions:
+  actions: write
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -39,6 +43,8 @@ jobs:
     needs: [changes]
     runs-on: buildjet-2vcpu-ubuntu-2204
     name: Check for E2E label
+    permissions:
+      pull-requests: read
     outputs:
       run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' && (github.event.action != 'labeled' || (github.event.action == 'labeled' && github.event.label.name == 'ready-for-e2e')) }}
     steps:
@@ -141,6 +147,13 @@ jobs:
     uses: ./.github/workflows/e2e.yml
     secrets: inherit
 
+  e2e-api-v2:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e-api-v2.yml
+    secrets: inherit
+
   e2e-app-store:
     name: Tests
     needs: [changes, check-label, build, build-api-v1, build-api-v2]
@@ -169,7 +182,7 @@ jobs:
     secrets: inherit
 
   required:
-    needs: [changes, lint, type-check, unit-test, integration-test, check-label, build, build-api-v1, build-api-v2, e2e, 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/pre-release.yml

@@ -1,77 +0,0 @@
-name: Pre-release checks
-
-on:
-  workflow_dispatch:
-
-jobs:
-  changes:
-    name: Detect changes
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    permissions:
-      pull-requests: read
-    outputs:
-      app-store: ${{ steps.filter.outputs.app-store }}
-      embed: ${{ steps.filter.outputs.embed }}
-      embed-react: ${{ steps.filter.outputs.embed-react }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/dangerous-git-checkout
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            app-store:
-              - 'apps/web/**'
-              - 'packages/app-store/**'
-              - 'playwright.config.ts'
-            embed:
-              - 'apps/web/**'
-              - 'packages/embeds/**'
-              - 'playwright.config.ts'
-            embed-react:
-              - 'apps/web/**'
-              - 'packages/embeds/**'
-              - 'playwright.config.ts'
-
-  lint:
-    name: Linters
-    uses: ./.github/workflows/lint.yml
-    secrets: inherit
-
-  build:
-    name: Production builds
-    uses: ./.github/workflows/production-build-without-database.yml
-    secrets: inherit
-
-  e2e:
-    name: E2E tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e.yml
-    secrets: inherit
-
-  e2e-app-store:
-    name: E2E App Store tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-app-store.yml
-    secrets: inherit
-
-  e2e-embed:
-    name: E2E embeds tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-embed.yml
-    secrets: inherit
-
-  e2e-embed-react:
-    name: E2E React embeds tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-embed-react.yml
-    secrets: inherit
-
-  required:
-    needs: [changes, lint, build, e2e, e2e-app-store, e2e-embed, e2e-embed-react]
-    if: always()
-    runs-on: buildjet-2vcpu-ubuntu-2204
-    steps:
-      - name: fail if conditional jobs failed
-        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')
-        run: exit 1

.github/workflows/production-build-without-database.yml

@@ -2,6 +2,9 @@ name: Production Builds
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}

.github/workflows/unit-tests.yml

@@ -1,9 +1,8 @@
 name: Unit
 on:
   workflow_call:
-  workflow_run:
-    workflows: [Crowdin Action]
-    types: [completed]
+permissions:
+  contents: read
 jobs:
   test:
     name: Unit
@@ -13,7 +12,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
-      # Should be an 8GB machine as per https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
       - run: yarn test
       # We could add different timezones here that we need to run our tests in
       - run: TZ=America/Los_Angeles yarn test -- --timeZoneDependentTestsOnly
+      - name: Run API v2 tests
+        working-directory: apps/api/v2
+        run: |
+          export NODE_OPTIONS="--max_old_space_size=8192"
+          yarn test

.github/workflows/yarn-install.yml

@@ -3,6 +3,9 @@ name: Yarn install
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 jobs:
   setup:
     name: Yarn install & cache

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,7 +1,7 @@
 import type { NextMiddleware } from "next-api-middleware";
 
+import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
 import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
-import checkLicense from "@calcom/features/ee/common/server/checkLicense";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
@@ -18,9 +18,12 @@ 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 hasValidLicense = await checkLicense(prisma);
-  if (!hasValidLicense && IS_PRODUCTION)
+  const licenseKeyService = await LicenseKeySingleton.getInstance();
+  const hasValidLicense = await licenseKeyService.checkLicense();
+
+  if (!hasValidLicense && IS_PRODUCTION) {
     return res.status(401).json({ error: "Invalid or missing CALCOM_LICENSE_KEY environment variable" });
+  }
   // Check if the apiKey query param is provided.
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
   // remove the prefix from the user provided api_key. If no env set default to "cal_"

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";
@@ -23,8 +23,11 @@ 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(),

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 {
-    ...whereClause,
-  };
+  return 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/event-types/_post.ts

@@ -278,8 +278,8 @@ async function postHandler(req: NextApiRequest) {
 
   let data: Prisma.EventTypeCreateArgs["data"] = {
     ...parsedBody,
-    userId,
-    users: { connect: { id: userId } },
+    userId: !!parsedBody.teamId ? null : 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/_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.",
       });
   }
 
@@ -119,7 +128,7 @@ async function postHandler(req: NextApiRequest) {
     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 +144,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/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/middleware/verifyApiKey.test.ts

@@ -3,9 +3,9 @@ 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, vi, it, expect, afterEach } from "vitest";
+import { describe, vi, it, expect, afterEach, beforeEach } from "vitest";
 
-import checkLicense from "@calcom/features/ee/common/server/checkLicense";
+import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
 import prisma from "@calcom/prisma";
 
 import { isAdminGuard } from "~/lib/utils/isAdmin";
@@ -20,20 +20,21 @@ afterEach(() => {
   vi.resetAllMocks();
 });
 
-vi.mock("@calcom/features/ee/common/server/checkLicense", () => {
-  return {
-    default: vi.fn(),
-  };
-});
-
-vi.mock("~/lib/utils/isAdmin", () => {
-  return {
-    isAdminGuard: vi.fn(),
-  };
-});
+vi.mock("@calcom/prisma");
+vi.mock("~/lib/utils/isAdmin", () => ({
+  isAdminGuard: vi.fn(),
+}));
 
 describe("Verify API key", () => {
-  it("It should throw an error if the api key is not valid", async () => {
+  let service: LicenseKeyService;
+
+  beforeEach(async () => {
+    service = await LicenseKeyService.create();
+
+    vi.spyOn(service, "checkLicense");
+  });
+
+  it("should throw an error if the api key is not valid", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {},
@@ -43,7 +44,7 @@ describe("Verify API key", () => {
       fn: verifyApiKey,
     };
 
-    vi.mocked(checkLicense).mockResolvedValue(false);
+    vi.mocked(service.checkLicense).mockResolvedValue(false);
     vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
@@ -53,9 +54,11 @@ describe("Verify API key", () => {
     await middleware.fn(req, res, serverNext);
 
     expect(middlewareSpy).toBeCalled();
+
     expect(res.statusCode).toBe(401);
   });
-  it("It should throw an error if no api key is provided", async () => {
+
+  it("should throw an error if no api key is provided", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {},
@@ -65,7 +68,7 @@ describe("Verify API key", () => {
       fn: verifyApiKey,
     };
 
-    vi.mocked(checkLicense).mockResolvedValue(true);
+    vi.mocked(service.checkLicense).mockResolvedValue(true);
     vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
@@ -75,10 +78,11 @@ describe("Verify API key", () => {
     await middleware.fn(req, res, serverNext);
 
     expect(middlewareSpy).toBeCalled();
+
     expect(res.statusCode).toBe(401);
   });
 
-  it("It should set correct permissions for system-wide admin", async () => {
+  it("should set correct permissions for system-wide admin", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {},
@@ -97,7 +101,7 @@ describe("Verify API key", () => {
       fn: verifyApiKey,
     };
 
-    vi.mocked(checkLicense).mockResolvedValue(true);
+    vi.mocked(service.checkLicense).mockResolvedValue(true);
     vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.SystemWide });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
@@ -107,11 +111,12 @@ describe("Verify API key", () => {
     await middleware.fn(req, res, serverNext);
 
     expect(middlewareSpy).toBeCalled();
+
     expect(req.isSystemWideAdmin).toBe(true);
     expect(req.isOrganizationOwnerOrAdmin).toBe(false);
   });
 
-  it("It should set correct permissions for org-level admin", async () => {
+  it("should set correct permissions for org-level admin", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {},
@@ -130,7 +135,7 @@ describe("Verify API key", () => {
       fn: verifyApiKey,
     };
 
-    vi.mocked(checkLicense).mockResolvedValue(true);
+    vi.mocked(service.checkLicense).mockResolvedValue(true);
     vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
@@ -140,6 +145,7 @@ describe("Verify API key", () => {
     await middleware.fn(req, res, serverNext);
 
     expect(middlewareSpy).toBeCalled();
+
     expect(req.isSystemWideAdmin).toBe(false);
     expect(req.isOrganizationOwnerOrAdmin).toBe(true);
   });

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

@@ -0,0 +1,121 @@
+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 } from "vitest";
+
+import { HttpError } from "@calcom/lib/http-error";
+
+import handler from "../../../pages/api/selected-calendars/_post";
+
+type CustomNextApiRequest = NextApiRequest & Request;
+type CustomNextApiResponse = NextApiResponse & Response;
+
+describe("POST /api/selected-calendars", () => {
+  describe("Errors", () => {
+    test("Returns 403 if non-admin user tries to set userId in body", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          integration: "google",
+          externalId: "ext123",
+          userId: 444444,
+        },
+      });
+
+      req.userId = 333333;
+
+      try {
+        await handler(req, res);
+      } catch (e) {
+        expect(e).toBeInstanceOf(HttpError);
+        expect((e as HttpError).statusCode).toBe(403);
+        expect((e as HttpError).message).toBe("ADMIN required for userId");
+      }
+    });
+
+    test("Returns 400 if request body is invalid", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          integration: "google",
+        },
+      });
+
+      req.userId = 333333;
+      req.isSystemWideAdmin = true;
+
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(400);
+      expect(JSON.parse(res._getData()).message).toBe("invalid_type in 'externalId': Required");
+    });
+  });
+
+  describe("Success", () => {
+    test("Creates selected calendar if user is admin and sets bodyUserId", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        query: {
+          apiKey: "validApiKey",
+        },
+        body: {
+          integration: "google",
+          externalId: "ext123",
+          userId: 444444,
+        },
+      });
+
+      req.userId = 333333;
+      req.isSystemWideAdmin = true;
+
+      prismaMock.user.findFirstOrThrow.mockResolvedValue({
+        id: 444444,
+      } as any);
+
+      prismaMock.selectedCalendar.create.mockResolvedValue({
+        credentialId: 1,
+        integration: "google",
+        externalId: "ext123",
+        userId: 444444,
+      });
+
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(200);
+      const responseData = JSON.parse(res._getData());
+      expect(responseData.selected_calendar.credentialId).toBe(1);
+      expect(responseData.message).toBe("Selected Calendar created successfully");
+    });
+
+    test("Creates selected calendar if user is non-admin and does not set bodyUserId", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        query: {
+          apiKey: "validApiKey",
+        },
+        body: {
+          integration: "google",
+          externalId: "ext123",
+        },
+      });
+
+      req.userId = 333333;
+
+      prismaMock.selectedCalendar.create.mockResolvedValue({
+        credentialId: 1,
+        integration: "google",
+        externalId: "ext123",
+        userId: 333333,
+      });
+
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(200);
+      const responseData = JSON.parse(res._getData());
+      expect(responseData.selected_calendar.credentialId).toBe(1);
+      expect(responseData.message).toBe("Selected Calendar 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/.env.example

@@ -14,8 +14,11 @@ NEXT_PUBLIC_SENTRY_DSN=
 
 # Stripe Billing
 STRIPE_PRICE_ID_STARTER=
+STRIPE_PRICE_ID_STARTER_OVERAGE=
 STRIPE_PRICE_ID_ESSENTIALS=
+STRIPE_PRICE_ID_ESSENTIALS_OVERAGE=
 STRIPE_PRICE_ID_ENTERPRISE=
+STRIPE_PRICE_ID_ENTERPRISE_OVERAGE=
 STRIPE_API_KEY=
 STRIPE_WEBHOOK_SECRET=
 

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/jest-e2e.json

@@ -10,5 +10,6 @@
   "transform": {
     "^.+\\.(t|j)s$": "ts-jest"
   },
-  "setupFiles": ["<rootDir>/test/setEnvVars.ts"]
+  "setupFiles": ["<rootDir>/test/setEnvVars.ts"],
+  "reporters": ["default", "jest-summarizing-reporter"]
 }

apps/api/v2/package.json

@@ -18,7 +18,7 @@
     "test:watch": "yarn dev:build && jest --watch",
     "test:cov": "yarn dev:build && jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "yarn dev:build && jest --runInBand --config ./jest-e2e.json",
+    "test:e2e": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json",
     "prisma": "yarn workspace @calcom/prisma prisma",
     "generate-schemas": "yarn prisma generate && yarn prisma format",
     "copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts"
@@ -26,12 +26,13 @@
   "dependencies": {
     "@calcom/platform-constants": "*",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
-    "@calcom/platform-libraries-0.0.20": "npm:@calcom/platform-libraries@0.0.20",
+    "@calcom/platform-libraries-0.0.23": "npm:@calcom/platform-libraries@0.0.23",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",
     "@golevelup/ts-jest": "^0.4.0",
     "@microsoft/microsoft-graph-types-beta": "^0.42.0-preview",
+    "@nestjs/bull": "^10.1.1",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",
@@ -42,6 +43,7 @@
     "@nestjs/throttler": "^5.1.2",
     "@sentry/node": "^8.8.0",
     "body-parser": "^1.20.2",
+    "bull": "^4.12.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "cookie-parser": "^1.4.6",

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

@@ -11,10 +11,11 @@ import { JwtModule } from "@/modules/jwt/jwt.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 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 { seconds, ThrottlerModule } from "@nestjs/throttler";
+import { APP_GUARD, APP_INTERCEPTOR } from "@nestjs/core";
+import { seconds, ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
 import { ThrottlerStorageRedisService } from "nestjs-throttler-storage-redis";
 
 import { AppController } from "./app.controller";
@@ -26,21 +27,20 @@ import { AppController } from "./app.controller";
       isGlobal: true,
       load: [appConfig],
     }),
+
     RedisModule,
+    BullModule.forRoot({
+      redis: `${process.env.REDIS_URL}${process.env.NODE_ENV === "production" ? "?tls=true" : ""}`,
+    }),
     ThrottlerModule.forRootAsync({
       imports: [RedisModule],
       inject: [RedisService],
       useFactory: (redisService: RedisService) => ({
         throttlers: [
           {
-            name: "short",
-            ttl: seconds(10),
-            limit: 3,
-          },
-          {
-            name: "medium",
-            ttl: seconds(30),
-            limit: 10,
+            name: "long",
+            ttl: seconds(60), // Time to live for the long period in seconds
+            limit: 120, // Maximum number of requests within the long ttl
           },
         ],
         storage: new ThrottlerStorageRedisService(redisService.redis),
@@ -57,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.20";
+import { handleNewBooking } from "@calcom/platform-libraries-0.0.23";
 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.20";
+} from "@calcom/platform-libraries-0.0.23";
 import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
 import { ApiResponse } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
@@ -150,17 +150,21 @@ export class BookingsController {
     @Req() req: BookingRequest,
     @Body() body: CreateBookingInput,
     @Headers(X_CAL_CLIENT_ID) clientId?: string
-  ): Promise<ApiResponse<unknown>> {
+  ): Promise<ApiResponse<Partial<BookingResponse>>> {
     const oAuthClientId = clientId?.toString();
-
     const { orgSlug, locationUrl } = body;
     req.headers["x-cal-force-slug"] = orgSlug;
     try {
       const booking = await handleNewBooking(
         await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl)
       );
-
-      void (await this.billingService.increaseUsageByClientId(oAuthClientId!));
+      if (booking.userId && booking.uid && booking.startTime) {
+        void (await this.billingService.increaseUsageByUserId(booking.userId, {
+          uid: booking.uid,
+          startTime: booking.startTime,
+          fromReschedule: booking.fromReschedule,
+        }));
+      }
       return {
         status: SUCCESS_STATUS,
         data: booking,
@@ -177,14 +181,22 @@ export class BookingsController {
     @Param("bookingId") bookingId: string,
     @Body() _: CancelBookingInput,
     @Headers(X_CAL_CLIENT_ID) clientId?: string
-  ): Promise<ApiResponse> {
+  ): Promise<ApiResponse<{ bookingId: number; bookingUid: string; onlyRemovedAttendee: boolean }>> {
     const oAuthClientId = clientId?.toString();
     if (bookingId) {
       try {
         req.body.id = parseInt(bookingId);
-        await handleCancelBooking(await this.createNextApiBookingRequest(req, oAuthClientId));
+        const res = await handleCancelBooking(await this.createNextApiBookingRequest(req, oAuthClientId));
+        if (!res.onlyRemovedAttendee) {
+          void (await this.billingService.cancelUsageByBookingUid(res.bookingUid));
+        }
         return {
           status: SUCCESS_STATUS,
+          data: {
+            bookingId: res.bookingId,
+            bookingUid: res.bookingUid,
+            onlyRemovedAttendee: res.onlyRemovedAttendee,
+          },
         };
       } catch (err) {
         this.handleBookingErrors(err);
@@ -199,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> {
@@ -207,6 +220,7 @@ export class BookingsController {
         bookingUid: bookingUid,
         attendees: body.attendees,
         noShowHost: body.noShowHost,
+        userId,
       });
 
       return { status: SUCCESS_STATUS, data: markNoShowResponse };
@@ -228,7 +242,14 @@ export class BookingsController {
         await this.createNextApiBookingRequest(req, oAuthClientId)
       );
 
-      void (await this.billingService.increaseUsageByClientId(oAuthClientId!));
+      createdBookings.forEach(async (booking) => {
+        if (booking.userId && booking.uid && booking.startTime) {
+          void (await this.billingService.increaseUsageByUserId(booking.userId, {
+            uid: booking.uid,
+            startTime: booking.startTime,
+          }));
+        }
+      });
 
       return {
         status: SUCCESS_STATUS,
@@ -253,7 +274,15 @@ export class BookingsController {
         await this.createNextApiBookingRequest(req, oAuthClientId)
       );
 
-      void (await this.billingService.increaseUsageByClientId(oAuthClientId!));
+      if (instantMeeting.userId && instantMeeting.bookingUid) {
+        const now = new Date();
+        // add a 10 secondes delay to the usage incrementation to give some time to cancel the booking if needed
+        now.setSeconds(now.getSeconds() + 10);
+        void (await this.billingService.increaseUsageByUserId(instantMeeting.userId, {
+          uid: instantMeeting.bookingUid,
+          startTime: now,
+        }));
+      }
 
       return {
         status: SUCCESS_STATUS,

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.20";
+import type { AppsStatus } from "@calcom/platform-libraries-0.0.23";
 
 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/controllers/calendars.controller.e2e-spec.ts

@@ -107,15 +107,16 @@ describe("Platform Calendars Endpoints", () => {
       .expect(401);
   });
 
-  it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar oauth with valid access token `, async () => {
-    const response = await request(app.getHttpServer())
-      .get(`/v2/calendars/${OFFICE_365_CALENDAR}/connect`)
-      .set("Authorization", `Bearer ${accessTokenSecret}`)
-      .set("Origin", CLIENT_REDIRECT_URI)
-      .expect(200);
-    const data = response.body.data;
-    expect(data.authUrl).toBeDefined();
-  });
+  // TODO: Uncomment this once CI is ready to run proper Office365 tests
+  // it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar oauth with valid access token `, async () => {
+  //   const response = await request(app.getHttpServer())
+  //     .get(`/v2/calendars/${OFFICE_365_CALENDAR}/connect`)
+  //     .set("Authorization", `Bearer ${accessTokenSecret}`)
+  //     .set("Origin", CLIENT_REDIRECT_URI)
+  //     .expect(200);
+  //   const data = response.body.data;
+  //   expect(data.authUrl).toBeDefined();
+  // });
 
   it(`/GET/v2/calendars/${GOOGLE_CALENDAR}/connect: it should redirect to auth-url for google calendar oauth with valid access token `, async () => {
     const response = await request(app.getHttpServer())

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

@@ -1,4 +1,5 @@
 import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
+import { DeleteCalendarCredentialsInputBodyDto } from "@/ee/calendars/input/delete-calendar-credentials.input";
 import { GetBusyTimesOutput } from "@/ee/calendars/outputs/busy-times.output";
 import { ConnectedCalendarsOutput } from "@/ee/calendars/outputs/connected-calendars.output";
 import {
@@ -196,7 +197,7 @@ export class CalendarsController {
   @HttpCode(HttpStatus.OK)
   async deleteCalendarCredentials(
     @Param("calendar") calendar: string,
-    @Body() body: { id: number },
+    @Body() body: DeleteCalendarCredentialsInputBodyDto,
     @GetUser() user: UserWithProfile
   ): Promise<DeletedCalendarCredentialsOutputResponseDto> {
     const { id: credentialId } = body;

apps/api/v2/src/ee/calendars/input/delete-calendar-credentials.input.ts

@@ -0,0 +1,15 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose } from "class-transformer";
+import { IsInt } from "class-validator";
+
+export class DeleteCalendarCredentialsInputBodyDto {
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    example: 10,
+    description: "Credential ID of the calendar to delete, as returned by the /calendars endpoint",
+    type: "integer",
+    required: true,
+  })
+  readonly id!: number;
+}

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.20";
+import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.23";
 
 @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.20";
+import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.23";
 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.20";
+} from "@calcom/platform-libraries-0.0.23";
 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

@@ -4,7 +4,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
-import { getEventTypeById } from "@calcom/platform-libraries-0.0.20";
+import { getEventTypeById } from "@calcom/platform-libraries-0.0.23";
 import type { PrismaClient } from "@calcom/prisma";
 
 @Injectable()

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

@@ -14,7 +14,7 @@ import {
   updateEventType,
   EventTypesPublic,
   getEventTypesPublic,
-} from "@calcom/platform-libraries-0.0.20";
+} from "@calcom/platform-libraries-0.0.23";
 import { EventType } from "@calcom/prisma/client";
 
 @Injectable()

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

@@ -7,7 +7,7 @@ import {
   getEventTypeById,
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.20";
+} from "@calcom/platform-libraries-0.0.23";
 import { CreateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 import type { PrismaClient } from "@calcom/prisma";
 

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.20";
-import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.20";
-import { dynamicEvent } from "@calcom/platform-libraries-0.0.20";
+import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.23";
+import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.23";
+import { dynamicEvent } from "@calcom/platform-libraries-0.0.23";
 import {
   CreateEventTypeInput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,

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

@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.20";
+} from "@calcom/platform-libraries-0.0.23";
 import { CreateEventTypeInput_2024_06_14, UpdateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 
 @Injectable()

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

@@ -9,7 +9,7 @@ import {
   parseRecurringEvent,
   TransformedLocationsSchema,
   BookingFieldsSchema,
-} from "@calcom/platform-libraries-0.0.20";
+} from "@calcom/platform-libraries-0.0.23";
 
 type EventTypeRelations = { users: User[]; schedule: Schedule | null };
 type DatabaseEventType = EventType & EventTypeRelations;

apps/api/v2/src/ee/me/outputs/me.output.ts

@@ -22,4 +22,7 @@ export class MeOutput {
 
   @IsString()
   timeZone!: string;
+
+  @IsInt()
+  organizationId!: number | null;
 }

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

@@ -66,6 +66,37 @@ describe("Schedules Endpoints", () => {
       expect(user).toBeDefined();
     });
 
+    it("should not create an invalid schedule", async () => {
+      const scheduleName = "schedule-name";
+      const scheduleTimeZone = "Europe/Rome";
+      const isDefault = true;
+
+      const body = {
+        name: scheduleName,
+        timeZone: scheduleTimeZone,
+        isDefault,
+        availabilities: [
+          {
+            days: ["Monday"],
+            endTime: "11:15",
+            startTime: "10:00",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post("/api/v2/schedules")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
+        .send(body)
+        .expect(400)
+        .then(async (response) => {
+          expect(response.body.status).toEqual("error");
+          expect(response.body.error.message).toEqual(
+            "Invalid datestring format. Expected format(ISO8061): 2025-04-12T13:17:56.324Z. Received: 11:15"
+          );
+        });
+    });
+
     it("should create a default schedule", async () => {
       const scheduleName = "schedule-name";
       const scheduleTimeZone = "Europe/Rome";

apps/api/v2/src/ee/schedules/schedules_2024_04_15/inputs/create-availability.input.ts

@@ -19,8 +19,18 @@ export class CreateAvailabilityInput_2024_04_15 {
 }
 
 function transformStringToDate(value: string, key: string): Date {
-  // note(Lauris): incoming value is ISO8061 e.g. 2025-0412T13:17:56.324Z
+  if (!value) {
+    throw new BadRequestException(
+      `Missing ${key}. Expected value is in ISO8061 format e.g. 2025-0412T13:17:56.324Z`
+    );
+  }
+
   const dateTimeParts = value.split("T");
+  if (dateTimeParts.length !== 2) {
+    throw new BadRequestException(
+      `Invalid datestring format. Expected format(ISO8061): 2025-04-12T13:17:56.324Z. Received: ${value}`
+    );
+  }
 
   const timePart = dateTimeParts[1].split(".")[0]; // Removes milliseconds
   const parts = timePart.split(":");

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/input-schedules.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
   transformApiScheduleOverrides,
   transformApiScheduleAvailability,
-} from "@calcom/platform-libraries-0.0.20";
+} from "@calcom/platform-libraries-0.0.23";
 import { CreateScheduleInput_2024_06_11, ScheduleAvailabilityInput_2024_06_11 } from "@calcom/platform-types";
 import { ScheduleOverrideInput_2024_06_11 } from "@calcom/platform-types";
 

apps/api/v2/src/filters/trpc-exception.filter.ts

@@ -2,7 +2,7 @@ import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
 import { Request } from "express";
 
 import { ERROR_STATUS } from "@calcom/platform-constants";
-import { TRPCError } from "@calcom/platform-libraries-0.0.20";
+import { TRPCError } from "@calcom/platform-libraries-0.0.23";
 import { Response } from "@calcom/platform-types";
 
 @Catch(TRPCError)

apps/api/v2/src/modules/auth/auth.module.ts

@@ -6,6 +6,7 @@ import { NextAuthStrategy } from "@/modules/auth/strategies/next-auth/next-auth.
 import { DeploymentsModule } from "@/modules/deployments/deployments.module";
 import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
+import { ProfilesModule } from "@/modules/profiles/profiles.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -21,6 +22,7 @@ import { PassportModule } from "@nestjs/passport";
     MembershipsModule,
     TokensModule,
     DeploymentsModule,
+    ProfilesModule,
   ],
   providers: [NextAuthGuard, NextAuthStrategy, ApiAuthGuard, ApiAuthStrategy, OAuthFlowService],
   exports: [NextAuthGuard, ApiAuthGuard],

apps/api/v2/src/modules/auth/decorators/billing/platform-plan.decorator.ts

@@ -0,0 +1,4 @@
+import type { PlatformPlanType } from "@/modules/billing/types";
+import { Reflector } from "@nestjs/core";
+
+export const PlatformPlan = Reflector.createDecorator<PlatformPlanType>();

apps/api/v2/src/modules/auth/guards/billing/platform-plan.guard.spec.ts

@@ -0,0 +1,123 @@
+import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { RedisService } from "@/modules/redis/redis.service";
+import { createMock } from "@golevelup/ts-jest";
+import { ExecutionContext } from "@nestjs/common";
+import { Reflector } from "@nestjs/core";
+
+describe("PlatformPlanGuard", () => {
+  let guard: PlatformPlanGuard;
+  let reflector: Reflector;
+  let organizationsRepository: OrganizationsRepository;
+  let redisService: RedisService;
+
+  const mockContext = createMockExecutionContext({
+    params: { teamId: "1", orgId: "1" },
+    user: { id: "1" },
+  });
+
+  beforeEach(async () => {
+    reflector = new Reflector();
+    organizationsRepository = createMock<OrganizationsRepository>();
+    redisService = createMock<RedisService>({
+      redis: {
+        get: jest.fn().mockResolvedValue(null),
+        set: jest.fn().mockResolvedValue(null),
+      },
+    });
+    guard = new PlatformPlanGuard(reflector, organizationsRepository, redisService);
+  });
+
+  it("should be defined", () => {
+    expect(guard).toBeDefined();
+  });
+
+  it("should return true", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(organizationsRepository, "findByIdIncludeBilling").mockResolvedValue({
+      isPlatform: true,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      platformBilling: {
+        subscriptionId: "sub_123",
+        plan: "SCALE",
+      },
+    });
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(true);
+  });
+
+  it("should return false if the organization does not exist", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(organizationsRepository, "findByIdIncludeBilling").mockResolvedValue(null);
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(false);
+  });
+
+  it("should return true if the organization is not platform", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(organizationsRepository, "findByIdIncludeBilling").mockResolvedValue({
+      isPlatform: false,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      platformBilling: undefined,
+    });
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(true);
+  });
+
+  it("should return false if the organization has no subscription", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(organizationsRepository, "findByIdIncludeBilling").mockResolvedValue({
+      isPlatform: true,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      platformBilling: {
+        subscriptionId: null,
+        plan: "STARTER",
+      },
+    });
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(false);
+  });
+
+  it("should return false if the user has a lower plan than required", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(organizationsRepository, "findByIdIncludeBilling").mockResolvedValue({
+      isPlatform: true,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      platformBilling: {
+        subscriptionId: "sub_123",
+        plan: "STARTER",
+      },
+    });
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(false);
+  });
+
+  it("should return true if the result is cached in Redis", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(redisService.redis, "get").mockResolvedValue(JSON.stringify(true));
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(true);
+  });
+
+  it("should return false if the result is cached in Redis", async () => {
+    jest.spyOn(reflector, "get").mockReturnValue("ESSENTIALS");
+    jest.spyOn(redisService.redis, "get").mockResolvedValue(JSON.stringify(false));
+
+    await expect(guard.canActivate(mockContext)).resolves.toBe(false);
+  });
+
+  function createMockExecutionContext(context: Record<string, string | object>): ExecutionContext {
+    return createMock<ExecutionContext>({
+      switchToHttp: () => ({
+        getRequest: () => ({
+          params: context.params,
+          user: context.user,
+        }),
+      }),
+    });
+  }
+});

apps/api/v2/src/modules/auth/guards/billing/platform-plan.guard.ts

@@ -0,0 +1,79 @@
+import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import { GetUserReturnType } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { PlatformPlanType } from "@/modules/billing/types";
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { RedisService } from "@/modules/redis/redis.service";
+import { Injectable, CanActivate, ExecutionContext } from "@nestjs/common";
+import { Reflector } from "@nestjs/core";
+import { Request } from "express";
+
+@Injectable()
+export class PlatformPlanGuard implements CanActivate {
+  constructor(
+    private reflector: Reflector,
+    private readonly organizationsRepository: OrganizationsRepository,
+    private readonly redisService: RedisService
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request>();
+    const teamId = request.params.teamId as string;
+    const orgId = request.params.orgId as string;
+    const user = request.user as GetUserReturnType;
+    const minimumPlan = this.reflector.get(PlatformPlan, context.getHandler()) as PlatformPlanType;
+
+    const REDIS_CACHE_KEY = `apiv2:user:${user?.id ?? "none"}:org:${orgId ?? "none"}:team:${
+      teamId ?? "none"
+    }:guard:platformbilling:${minimumPlan}`;
+
+    const cachedAccess = JSON.parse((await this.redisService.redis.get(REDIS_CACHE_KEY)) ?? "false");
+
+    if (cachedAccess) {
+      return cachedAccess;
+    }
+
+    let canAccess = false;
+
+    if (user && orgId) {
+      const team = await this.organizationsRepository.findByIdIncludeBilling(Number(orgId));
+      const isPlatform = team?.isPlatform;
+      const hasSubscription = team?.platformBilling?.subscriptionId;
+
+      if (!team) {
+        canAccess = false;
+      } else if (!isPlatform) {
+        canAccess = true;
+      } else if (!hasSubscription) {
+        canAccess = false;
+      } else {
+        canAccess = hasMinimumPlan({
+          currentPlan: team.platformBilling?.plan as PlatformPlanType,
+          minimumPlan: minimumPlan,
+          plans: ["STARTER", "ESSENTIALS", "SCALE", "ENTERPRISE"],
+        });
+      }
+    }
+
+    await this.redisService.redis.set(REDIS_CACHE_KEY, String(canAccess), "EX", 300);
+    return canAccess;
+  }
+}
+
+type HasMinimumPlanProp = {
+  currentPlan: PlatformPlanType;
+  minimumPlan: PlatformPlanType;
+  plans: PlatformPlanType[];
+};
+
+export function hasMinimumPlan(props: HasMinimumPlanProp): boolean {
+  const currentPlanIndex = props.plans.indexOf(props.currentPlan);
+  const minimumPlanIndex = props.plans.indexOf(props.minimumPlan);
+
+  if (currentPlanIndex === -1 || minimumPlanIndex === -1) {
+    throw new Error(
+      `Invalid platform billing plan provided. Current plan: ${props.currentPlan}, Minimum plan: ${props.minimumPlan}`
+    );
+  }
+
+  return currentPlanIndex >= minimumPlanIndex;
+}

apps/api/v2/src/modules/auth/guards/organizations/is-admin-api-enabled.guard.ts

@@ -0,0 +1,62 @@
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { RedisService } from "@/modules/redis/redis.service";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+type CachedData = {
+  org?: Team;
+  canAccess?: boolean;
+};
+
+@Injectable()
+export class IsAdminAPIEnabledGuard implements CanActivate {
+  constructor(
+    private organizationsRepository: OrganizationsRepository,
+    private readonly redisService: RedisService
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    let canAccess = false;
+    const request = context.switchToHttp().getRequest<Request & { organization: Team }>();
+    const organizationId: string = request.params.orgId;
+
+    if (!organizationId) {
+      throw new ForbiddenException("No organization id found in request params.");
+    }
+
+    const REDIS_CACHE_KEY = `apiv2:org:${organizationId}:guard:isAdminAccess`;
+    const cachedData = await this.redisService.redis.get(REDIS_CACHE_KEY);
+
+    if (cachedData) {
+      const { org: cachedOrg, canAccess: cachedCanAccess } = JSON.parse(cachedData) as CachedData;
+      if (cachedOrg?.id === Number(organizationId) && cachedCanAccess !== undefined) {
+        request.organization = cachedOrg;
+        return cachedCanAccess;
+      }
+    }
+
+    const org = await this.organizationsRepository.findById(Number(organizationId));
+
+    if (org?.isOrganization && !org?.isPlatform) {
+      const adminAPIAccessIsEnabledInOrg = await this.organizationsRepository.fetchOrgAdminApiStatus(
+        Number(organizationId)
+      );
+      if (!adminAPIAccessIsEnabledInOrg) {
+        throw new ForbiddenException(
+          `Organization does not have Admin API access, please contact https://cal.com/sales to upgrade`
+        );
+      }
+    }
+    canAccess = true;
+    org &&
+      (await this.redisService.redis.set(
+        REDIS_CACHE_KEY,
+        JSON.stringify({ org: org, canAccess } satisfies CachedData),
+        "EX",
+        300
+      ));
+    return canAccess;
+  }
+}

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.e2e-spec.ts

@@ -7,6 +7,7 @@ import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repo
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { ProfilesModule } from "@/modules/profiles/profiles.module";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { ExecutionContext, HttpException } from "@nestjs/common";
@@ -17,11 +18,14 @@ import { Test, TestingModule } from "@nestjs/testing";
 import { PlatformOAuthClient, Team, User } from "@prisma/client";
 import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { MockedRedisService } from "test/mocks/mock-redis-service";
 
+import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
+
 import { ApiAuthStrategy } from "./api-auth.strategy";
 
 describe("ApiAuthStrategy", () => {
@@ -33,11 +37,17 @@ describe("ApiAuthStrategy", () => {
   let oAuthClient: PlatformOAuthClient;
   let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
   let oAuthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let profilesRepositoryFixture: ProfileRepositoryFixture;
+
   const validApiKeyEmail = "api-key-user-email@example.com";
   const validAccessTokenEmail = "access-token-user-email@example.com";
+  const validOAuthEmail = "oauth-user@example.com";
+
   let validApiKeyUser: User;
   let validAccessTokenUser: User;
+  let validOAuthUser: User;
   let module: TestingModule;
+
   beforeAll(async () => {
     module = await Test.createTestingModule({
       imports: [
@@ -46,6 +56,7 @@ describe("ApiAuthStrategy", () => {
           isGlobal: true,
           load: [appConfig],
         }),
+        ProfilesModule,
       ],
       providers: [
         MockedRedisService,
@@ -71,6 +82,7 @@ describe("ApiAuthStrategy", () => {
     apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(module);
     teamRepositoryFixture = new TeamRepositoryFixture(module);
     oAuthClientRepositoryFixture = new OAuthClientRepositoryFixture(module);
+    profilesRepositoryFixture = new ProfileRepositoryFixture(module);
     organization = await teamRepositoryFixture.create({ name: "organization" });
     validApiKeyUser = await userRepositoryFixture.create({
       email: validApiKeyEmail,
@@ -78,6 +90,18 @@ describe("ApiAuthStrategy", () => {
     validAccessTokenUser = await userRepositoryFixture.create({
       email: validAccessTokenEmail,
     });
+
+    validOAuthUser = await userRepositoryFixture.create({
+      email: validOAuthEmail,
+    });
+
+    await profilesRepositoryFixture.create({
+      uid: "asd-asd",
+      username: validOAuthEmail,
+      user: { connect: { id: validOAuthUser.id } },
+      organization: { connect: { id: organization.id } },
+    });
+
     const data = {
       logo: "logo-url",
       name: "name",
@@ -94,22 +118,9 @@ describe("ApiAuthStrategy", () => {
         oAuthClient.id
       );
 
-      const context: ExecutionContext = {
-        switchToHttp: () => ({
-          getRequest: () => ({
-            headers: {
-              authorization: `Bearer ${accessToken}`,
-            },
-            get: (key: string) =>
-              ({ Authorization: `Bearer ${accessToken}`, origin: "http://localhost:3000" }[key]),
-          }),
-        }),
-      } as ExecutionContext;
-      const request = context.switchToHttp().getRequest();
-
       const user = await strategy.accessTokenStrategy(accessToken);
-      await expect(user).toBeDefined();
-      if (user) await expect(user.id).toEqual(validAccessTokenUser.id);
+      expect(user).toBeDefined();
+      expect(user?.id).toEqual(validAccessTokenUser.id);
     });
 
     it("should return user associated with valid api key", async () => {
@@ -117,22 +128,15 @@ describe("ApiAuthStrategy", () => {
       now.setDate(now.getDate() + 1);
       const { keyString } = await apiKeysRepositoryFixture.createApiKey(validApiKeyUser.id, now);
 
-      const context: ExecutionContext = {
-        switchToHttp: () => ({
-          getRequest: () => ({
-            headers: {
-              authorization: `Bearer cal_test_${keyString}`,
-            },
-            get: (key: string) =>
-              ({ Authorization: `Bearer cal_test_${keyString}`, origin: "http://localhost:3000" }[key]),
-          }),
-        }),
-      } as ExecutionContext;
-      const request = context.switchToHttp().getRequest();
-
       const user = await strategy.apiKeyStrategy(keyString);
-      await expect(user).toBeDefined();
-      if (user) expect(user.id).toEqual(validApiKeyUser.id);
+      expect(user).toBeDefined();
+      expect(user?.id).toEqual(validApiKeyUser.id);
+    });
+
+    it("should return user associated with valid OAuth client", async () => {
+      const user = await strategy.oAuthClientStrategy(oAuthClient.id, oAuthClient.secret);
+      expect(user).toBeDefined();
+      expect(user.id).toEqual(validOAuthUser.id);
     });
 
     it("should throw 401 if api key is invalid", async () => {
@@ -158,7 +162,55 @@ describe("ApiAuthStrategy", () => {
       }
     });
 
-    it("should throw 401 if Authorization header does not contain auth token", async () => {
+    it("should throw 401 if OAuth ID is invalid", async () => {
+      const context: ExecutionContext = {
+        switchToHttp: () => ({
+          getRequest: () => ({
+            headers: {
+              [X_CAL_CLIENT_ID]: `${oAuthClient.id}gibberish`,
+              [X_CAL_SECRET_KEY]: `secret`,
+            },
+            get: (key: string) =>
+              ({ Authorization: `Bearer cal_test_badkey1234`, origin: "http://localhost:3000" }[key]),
+          }),
+        }),
+      } as ExecutionContext;
+      const request = context.switchToHttp().getRequest();
+
+      try {
+        await strategy.authenticate(request);
+      } catch (error) {
+        if (error instanceof HttpException) {
+          expect(error.getStatus()).toEqual(401);
+        }
+      }
+    });
+
+    it("should throw 401 if OAuth secret is invalid", async () => {
+      const context: ExecutionContext = {
+        switchToHttp: () => ({
+          getRequest: () => ({
+            headers: {
+              [X_CAL_CLIENT_ID]: `${oAuthClient.id}`,
+              [X_CAL_SECRET_KEY]: `gibberish`,
+            },
+            get: (key: string) =>
+              ({ Authorization: `Bearer cal_test_badkey1234`, origin: "http://localhost:3000" }[key]),
+          }),
+        }),
+      } as ExecutionContext;
+      const request = context.switchToHttp().getRequest();
+
+      try {
+        await strategy.authenticate(request);
+      } catch (error) {
+        if (error instanceof HttpException) {
+          expect(error.getStatus()).toEqual(401);
+        }
+      }
+    });
+
+    it("should throw 401 if request does not contain Bearer token nor OAuth client credentials", async () => {
       const context: ExecutionContext = {
         switchToHttp: () => ({
           getRequest: () => ({
@@ -179,8 +231,11 @@ describe("ApiAuthStrategy", () => {
   });
 
   afterAll(async () => {
-    await userRepositoryFixture.deleteByEmail(validApiKeyEmail);
-    await userRepositoryFixture.deleteByEmail(validAccessTokenEmail);
+    await oAuthClientRepositoryFixture.delete(oAuthClient.id);
+    await userRepositoryFixture.delete(validApiKeyUser.id);
+    await userRepositoryFixture.delete(validAccessTokenUser.id);
+    await userRepositoryFixture.delete(validOAuthUser.id);
+    await teamRepositoryFixture.delete(organization.id);
     module.close();
   });
 });

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts

@@ -2,7 +2,9 @@ import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
 import { BaseStrategy } from "@/lib/passport/strategies/types";
 import { ApiKeyRepository } from "@/modules/api-key/api-key-repository";
 import { DeploymentsService } from "@/modules/deployments/deployments.service";
+import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
+import { ProfilesRepository } from "@/modules/profiles/profiles.repository";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { Injectable, InternalServerErrorException, UnauthorizedException } from "@nestjs/common";
@@ -10,7 +12,7 @@ import { ConfigService } from "@nestjs/config";
 import { PassportStrategy } from "@nestjs/passport";
 import type { Request } from "express";
 
-import { INVALID_ACCESS_TOKEN } from "@calcom/platform-constants";
+import { INVALID_ACCESS_TOKEN, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 
 @Injectable()
 export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth") {
@@ -20,19 +22,74 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
     private readonly oauthFlowService: OAuthFlowService,
     private readonly tokensRepository: TokensRepository,
     private readonly userRepository: UsersRepository,
-    private readonly apiKeyRepository: ApiKeyRepository
+    private readonly apiKeyRepository: ApiKeyRepository,
+    private readonly oauthRepository: OAuthClientRepository,
+    private readonly profilesRepository: ProfilesRepository
   ) {
     super();
   }
 
   async authenticate(request: Request) {
-    const authString = request.get("Authorization")?.replace("Bearer ", "");
-    if (!authString) {
-      return this.error(new UnauthorizedException("No Authorization header provided"));
+    try {
+      const { params } = request;
+      const oAuthClientSecret = request.get(X_CAL_SECRET_KEY);
+      const oAuthClientId = params.clientId || request.get(X_CAL_CLIENT_ID);
+      const bearerToken = request.get("Authorization")?.replace("Bearer ", "");
+
+      if (oAuthClientId && oAuthClientSecret) {
+        return await this.authenticateOAuthClient(oAuthClientId, oAuthClientSecret);
+      }
+
+      if (bearerToken) {
+        const requestOrigin = request.get("Origin");
+        return await this.authenticateBearerToken(bearerToken, requestOrigin);
+      }
+
+      throw new UnauthorizedException(
+        "No authentication method provided. Either pass an API key as 'Bearer' header or OAuth client credentials as 'x-cal-secret-key' and 'x-cal-client-id' headers"
+      );
+    } catch (err) {
+      if (err instanceof Error) {
+        return this.error(err);
+      }
+      return this.error(
+        new InternalServerErrorException("An error occurred while authenticating the request")
+      );
+    }
+  }
+
+  async authenticateOAuthClient(oAuthClientId: string, oAuthClientSecret: string) {
+    const user = await this.oAuthClientStrategy(oAuthClientId, oAuthClientSecret);
+    return this.success(user);
+  }
+
+  async oAuthClientStrategy(oAuthClientId: string, oAuthClientSecret: string) {
+    const client = await this.oauthRepository.getOAuthClient(oAuthClientId);
+
+    if (!client) {
+      throw new UnauthorizedException(`Client with ID ${oAuthClientId} not found`);
     }
 
-    const requestOrigin = request.get("Origin");
+    if (client.secret !== oAuthClientSecret) {
+      throw new UnauthorizedException("Invalid client secret");
+    }
 
+    const platformCreatorId = await this.profilesRepository.getPlatformOwnerUserId(client.organizationId);
+
+    if (!platformCreatorId) {
+      throw new UnauthorizedException("No owner ID found for this OAuth client");
+    }
+
+    const user = await this.userRepository.findByIdWithProfile(platformCreatorId);
+
+    if (!user) {
+      throw new UnauthorizedException("No user associated with the provided OAuth client");
+    }
+
+    return user;
+  }
+
+  async authenticateBearerToken(authString: string, requestOrigin: string | undefined) {
     try {
       const user = isApiKey(authString, this.config.get<string>("api.apiKeyPrefix") ?? "cal_")
         ? await this.apiKeyStrategy(authString)