Merge branch 'main' into 11576-cal-2537-a11y-turn-booking-entries-in-booking-to-links-not-clickable-divs

.env.appStore.example

@@ -37,7 +37,6 @@ BASECAMP3_USER_AGENT=
 
 DAILY_API_KEY=
 DAILY_SCALE_PLAN=''
-DAILY_WEBHOOK_SECRET=''
 
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
@@ -127,12 +126,4 @@ ZOHOCRM_CLIENT_ID=""
 ZOHOCRM_CLIENT_SECRET=""
 
 
-#   - REVERT
-# Used for the Pipedrive integration (via/ Revert (https://revert.dev))
-# @see https://github.com/calcom/cal.com/#obtaining-revert-api-keys
-REVERT_API_KEY=
-REVERT_PUBLIC_TOKEN=
-
-# NOTE: If you're self hosting Revert, update this URL to point to your own instance.
-REVERT_API_URL=https://api.revert.dev/
 # *********************************************************************************************************

.env.example

@@ -25,7 +25,6 @@ CALCOM_LICENSE_KEY=
 DATABASE_URL="postgresql://postgres:@localhost:5450/calendso"
 UPSTASH_REDIS_REST_URL=
 UPSTASH_REDIS_REST_TOKEN=
-INSIGHTS_DATABASE_URL=
 
 # Uncomment to enable a dedicated connection pool for Prisma using Prisma Data Proxy
 # Cold boots will be faster and you'll be able to scale your DB independently of your app.
@@ -88,7 +87,7 @@ CRON_ENABLE_APP_SYNC=false
 
 # Application Key for symmetric encryption and decryption
 # must be 32 bytes for AES256 encryption algorithm
-# You can use: `openssl rand -base64 32` to generate one
+# You can use: `openssl rand -base64 24` to generate one
 CALENDSO_ENCRYPTION_KEY=
 
 # Intercom Config
@@ -107,19 +106,6 @@ NEXT_PUBLIC_HELPSCOUT_KEY=
 NEXT_PUBLIC_FRESHCHAT_TOKEN=
 NEXT_PUBLIC_FRESHCHAT_HOST=
 
-# Google OAuth credentials
-# To enable Login with Google you need to:
-# 1. Set `GOOGLE_API_CREDENTIALS` above
-# 2. Set `GOOGLE_LOGIN_ENABLED` to `true`
-# When self-hosting please ensure you configure the Google integration as an Internal app so no one else can login to your instance
-# @see https://support.google.com/cloud/answer/6158849#public-and-internal&zippy=%2Cpublic-and-internal-applications
-GOOGLE_LOGIN_ENABLED=false
-
-#   - GOOGLE CALENDAR/MEET/LOGIN
-# Needed to enable Google Calendar integration and Login with Google
-# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
-GOOGLE_API_CREDENTIALS=
-
 # Inbox to send user feedback
 SEND_FEEDBACK_EMAIL=
 
@@ -129,15 +115,6 @@ SENDGRID_API_KEY=
 SENDGRID_EMAIL=
 NEXT_PUBLIC_SENDGRID_SENDER_NAME=
 
-# Sentry
-# Used for capturing exceptions and logging messages
-NEXT_PUBLIC_SENTRY_DSN=
-
-# Formbricks Experience Management Integration
-FORMBRICKS_HOST_URL=https://app.formbricks.com
-FORMBRICKS_ENVIRONMENT_ID=
-FORMBRICKS_FEEDBACK_SURVEY_ID=
-
 # Twilio
 # Used to send SMS reminders in workflows
 TWILIO_SID=
@@ -149,7 +126,7 @@ TWILIO_WHATSAPP_PHONE_NUMBER=
 NEXT_PUBLIC_SENDER_ID=
 TWILIO_VERIFY_SID=
 
-# Set it to "1" if you need to run E2E tests locally.
+# Set it to "1" if you need to run E2E tests locally. 
 NEXT_PUBLIC_IS_E2E=
 
 # Used for internal billing system
@@ -160,7 +137,6 @@ NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
 STRIPE_TEAM_MONTHLY_PRICE_ID=
 STRIPE_ORG_MONTHLY_PRICE_ID=
 STRIPE_WEBHOOK_SECRET=
-STRIPE_WEBHOOK_SECRET_APPS=
 STRIPE_PRIVATE_KEY=
 STRIPE_CLIENT_ID=
 PAYMENT_FEE_FIXED=
@@ -201,10 +177,6 @@ EMAIL_SERVER_PORT=1025
 # Make sure to run mailhog container manually or with `yarn dx`
 E2E_TEST_MAILHOG_ENABLED=
 
-# Resend
-# Send transactional email using resend
-# RESEND_API_KEY=
-
 # **********************************************************************************************************
 
 # Set the following value to true if you wish to enable Team Impersonation
@@ -231,8 +203,6 @@ CSP_POLICY=
 EDGE_CONFIG=
 
 NEXT_PUBLIC_MINUTES_TO_BOOK=5 # Minutes
-# Control time intervals on a user's Schedule availability
-NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
 
 # - ORGANIZATIONS *******************************************************************************************
 # Enable Organizations non-prod domain setup, works in combination with organizations feature flag
@@ -254,32 +224,12 @@ PROJECT_ID_VERCEL=
 TEAM_ID_VERCEL=
 # Get it from: https://vercel.com/account/tokens
 AUTH_BEARER_TOKEN_VERCEL=
-# Add the main domain that you want to use for testing vercel domain management for organizations. This is necessary because WEBAPP_URL of local isn't a valid public domain
-# Would create org1.example.com for an org with slug org1
-# LOCAL_TESTING_DOMAIN_VERCEL="example.com"
-
-## Set it to 1 if you use cloudflare to manage your DNS and would like us to manage the DNS for you for organizations
-# CLOUDFLARE_DNS=1
-## Get it from: https://dash.cloudflare.com/profile/api-tokens. Select Edit Zone template and choose a zone(your domain)
-# AUTH_BEARER_TOKEN_CLOUDFLARE=
-## Zone ID can be found in the Overview tab of your domain in Cloudflare
-# CLOUDFLARE_ZONE_ID=
-## It should usually work with the default value. This is the DNS CNAME record content to point to Vercel domain
-# CLOUDFLARE_VERCEL_CNAME=cname.vercel-dns.com
 
 #   - APPLE CALENDAR
 # Used for E2E tests on Apple Calendar
 E2E_TEST_APPLE_CALENDAR_EMAIL=""
 E2E_TEST_APPLE_CALENDAR_PASSWORD=""
 
-# - CALCOM QA ACCOUNT
-# Used for E2E tests on Cal.com that require 3rd party integrations
-E2E_TEST_CALCOM_QA_EMAIL="qa@example.com"
-# Replace with your own password
-E2E_TEST_CALCOM_QA_PASSWORD="password"
-E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS=
-E2E_TEST_CALCOM_GCAL_KEYS=
-
 # - APP CREDENTIAL SYNC ***********************************************************************************
 # Used for self-hosters that are implementing Cal.com into their applications that already have certain integrations
 # Under settings/admin/apps ensure that all app secrets are set the same as the parent application
@@ -289,7 +239,7 @@ CALCOM_WEBHOOK_SECRET=""
 CALCOM_WEBHOOK_HEADER_NAME="calcom-webhook-secret"
 CALCOM_CREDENTIAL_SYNC_ENDPOINT=""
 # Key should match on Cal.com and your application
-# must be 24 bytes for AES256 encryption algorithm
+# must be 32 bytes for AES256 encryption algorithm
 # You can use: `openssl rand -base64 24` to generate one
 CALCOM_APP_CREDENTIAL_ENCRYPTION_KEY=""
 
@@ -307,27 +257,3 @@ E2E_TEST_OIDC_USER_EMAIL=
 E2E_TEST_OIDC_USER_PASSWORD=
 
 # ***********************************************************************************************************
-
-# provide a value between 0 and 100 to ensure the percentage of traffic
-# redirected from the legacy to the future pages
-AB_TEST_BUCKET_PROBABILITY=50
-# whether we redirect to the future/event-types from event-types or not
-APP_ROUTER_EVENT_TYPES_ENABLED=0
-APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
-APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
-APP_ROUTER_APPS_SLUG_ENABLED=0
-APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
-# whether we redirect to the future/apps/categories from /apps/categories or not
-APP_ROUTER_APPS_CATEGORIES_ENABLED=0
-# whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
-APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
-APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
-APP_ROUTER_WORKFLOWS_ENABLED=0
-APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
-APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
-APP_ROUTER_APPS_ENABLED=0
-APP_ROUTER_VIDEO_ENABLED=0
-APP_ROUTER_TEAMS_ENABLED=0
-
-# disable setry server source maps
-SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1

.github/ISSUE_TEMPLATE/feature_request.md

@@ -47,9 +47,3 @@ assignees: ""
 -->
 
 (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.

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,12 +19,11 @@ Fixes # (issue)
 
 <!-- Please delete bullets that are not relevant. -->
 
-- Bug fix (non-breaking change which fixes an issue)
-- Chore (refactoring code, technical debt, workflow improvements)
-- New feature (non-breaking change which adds functionality)
-- Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- Tests (Unit/Integration/E2E or any other test)
-- This change requires a documentation update
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] Chore (refactoring code, technical debt, workflow improvements)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
 
 ## How should this be tested?
 
@@ -41,7 +40,7 @@ Fixes # (issue)
 
 ## Checklist
 
-<!-- Remove bullet points below that don't apply to you -->
+<!-- Please remove all the irrelevant bullets to your PR -->
 
 - I haven't read the [contributing guide](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
 - My code doesn't follow the style guidelines of this project

.github/actions/cache-build/action.yml

@@ -24,8 +24,6 @@ runs:
           **/.turbo/**
           **/dist/**
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
-    - run: |
-        export NODE_OPTIONS="--max_old_space_size=8192"
-        yarn build
+    - run: yarn build
       if: steps.cache-build.outputs.cache-hit != 'true'
       shell: bash

.github/actions/cache-db/action.yml

@@ -17,14 +17,10 @@ runs:
         cache-name: cache-db
         key-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
         key-2: ${{ github.event.pull_request.number || github.ref }}
-        DATABASE_URL: ${{ inputs.DATABASE_URL }}
-        E2E_TEST_CALCOM_QA_EMAIL: ${{ inputs.E2E_TEST_CALCOM_QA_EMAIL }}
-        E2E_TEST_CALCOM_QA_PASSWORD: ${{ inputs.E2E_TEST_CALCOM_QA_PASSWORD }}
-        E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ inputs.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
       with:
         path: ${{ inputs.path }}
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}
-    - run: echo ${{ env.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }} && yarn db-seed
+    - run: yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash
     - name: Postgres Dump Backup

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

@@ -5,7 +5,7 @@ runs:
   steps:
     - name: Cache playwright binaries
       id: playwright-cache
-      uses: buildjet/cache@v3
+      uses: buildjet/cache@v2
       with:
         path: |
           ~/Library/Caches/ms-playwright

.github/workflows/apply-issue-labels-to-pr.yml

@@ -0,0 +1,74 @@
+name: "Apply issue labels to PR"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  label_on_pr:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: none
+      issues: read
+      pull-requests: write
+
+    steps:
+      - name: Apply labels from linked issue to PR
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            async function getLinkedIssues(owner, repo, prNumber) {
+              const query = `query GetLinkedIssues($owner: String!, $repo: String!, $prNumber: Int!) {
+                repository(owner: $owner, name: $repo) {
+                  pullRequest(number: $prNumber) {
+                    closingIssuesReferences(first: 10) {
+                      nodes {
+                        number
+                        labels(first: 10) {
+                          nodes {
+                            name
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }`;
+
+              const variables = {
+                owner: owner,
+                repo: repo,
+                prNumber: prNumber,
+              };
+
+              const result = await github.graphql(query, variables);
+              return result.repository.pullRequest.closingIssuesReferences.nodes;
+            }
+
+            const pr = context.payload.pull_request;
+            const linkedIssues = await getLinkedIssues(
+              context.repo.owner,
+              context.repo.repo,
+              pr.number
+            );
+
+            const labelsToAdd = new Set();
+            for (const issue of linkedIssues) {
+              if (issue.labels && issue.labels.nodes) {
+                for (const label of issue.labels.nodes) {
+                  labelsToAdd.add(label.name);
+                }
+              }
+            }
+
+            if (labelsToAdd.size) {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: pr.number,
+                labels: Array.from(labelsToAdd),
+              });
+            }

.github/workflows/check-types.yml

@@ -2,7 +2,7 @@ name: Check types
 on:
   workflow_call:
 env:
-  NODE_OPTIONS: --max-old-space-size=4096
+  NODE_OPTIONS: "--max-old-space-size=8192"
 jobs:
   check-types:
     runs-on: buildjet-4vcpu-ubuntu-2204

.github/workflows/cron-stale-issue.yml

@@ -17,11 +17,10 @@ jobs:
     steps:
       - uses: actions/stale@v7
         with:
-          days-before-close: -1
           days-before-issue-stale: 60
           days-before-issue-close: -1
           days-before-pr-stale: 14
-          days-before-pr-close: -1
+          days-before-pr-close: 7
           stale-pr-message: "This PR is being marked as stale due to inactivity."
           close-pr-message: "This PR is being closed due to inactivity. Please reopen if work is intended to be continued."
           operations-per-run: 100

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

@@ -1,8 +1,7 @@
-name: E2E App-Store Apps Tests
+name: E2E App-Store Apps
 on:
   workflow_call:
-env:
-  NODE_OPTIONS: --max-old-space-size=4096
+
 jobs:
   e2e-app-store:
     timeout-minutes: 20
@@ -30,15 +29,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - uses: ./.github/actions/cache-db
-        env:
-          DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
-          E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}
-          E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}
-          E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ secrets.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
-          E2E_TEST_CALCOM_GCAL_KEYS: ${{ secrets.E2E_TEST_CALCOM_GCAL_KEYS }}
       - uses: ./.github/actions/cache-build
       - name: Run Tests
         run: yarn e2e:app-store --shard=${{ matrix.shard }}/${{ strategy.job-total }}
@@ -49,10 +43,6 @@ jobs:
           DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
           E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
           E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
-          E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}
-          E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}
-          E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ secrets.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
-          E2E_TEST_CALCOM_GCAL_KEYS: ${{ secrets.E2E_TEST_CALCOM_GCAL_KEYS }}
           E2E_TEST_MAILHOG_ENABLED: ${{ vars.E2E_TEST_MAILHOG_ENABLED }}
           GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
           GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}
@@ -75,7 +65,7 @@ jobs:
           TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       - name: Upload Test Results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: app-store-results-${{ matrix.shard }}_${{ strategy.job-total }}
           path: test-results

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

@@ -1,8 +1,7 @@
-name: E2E Embed React tests and booking flow (for non-embed as well)
+name: E2E Embed React tests and booking flow(for non-embed as well)
 on:
   workflow_call:
-env:
-  NODE_OPTIONS: --max-old-space-size=4096
+
 jobs:
   e2e-embed:
     timeout-minutes: 20
@@ -25,6 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - uses: ./.github/actions/cache-db
@@ -61,7 +61,7 @@ jobs:
           TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       - name: Upload Test Results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: embed-react-results-${{ matrix.shard }}_${{ strategy.job-total }}
           path: test-results

.github/workflows/e2e-embed.yml

@@ -1,8 +1,7 @@
-name: E2E Embed Core tests and booking flow (for non-embed as well)
+name: E2E Embed Core tests and booking flow(for non-embed as well)
 on:
   workflow_call:
-env:
-  NODE_OPTIONS: --max-old-space-size=4096
+
 jobs:
   e2e-embed:
     timeout-minutes: 20
@@ -30,6 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - uses: ./.github/actions/cache-db
@@ -65,7 +65,7 @@ jobs:
           TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       - name: Upload Test Results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: embed-core-results-${{ matrix.shard }}_${{ strategy.job-total }}
           path: test-results

.github/workflows/e2e.yml

@@ -1,8 +1,8 @@
-name: E2E tests
+name: E2E test
+
 on:
   workflow_call:
-env:
-  NODE_OPTIONS: --max-old-space-size=4096
+
 jobs:
   e2e:
     timeout-minutes: 20
@@ -28,6 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - uses: ./.github/actions/cache-db
@@ -67,7 +68,7 @@ jobs:
           TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       - name: Upload Test Results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
           path: test-results

.github/workflows/labeler.yml

@@ -1,7 +1,6 @@
 name: "Pull Request Labeler"
 on:
-  pull_request_target:
-  workflow_dispatch:
+  - pull_request_target
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -17,81 +16,3 @@ jobs:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           # https://github.com/actions/labeler/issues/442#issuecomment-1297359481
           sync-labels: ""
-  team-labels:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: equitybee/team-label-action@main
-        with:
-          repo-token: ${{ secrets.EQUITY_BEE_TEAM_LABELER_ACTION_TOKEN }}
-          organization-name: calcom
-          ignore-labels: "admin, app-store, ai, authentication, automated-testing, devops, platform, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, teams, webhooks, workflows, zapier"
-  apply-labels-from-issue:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: none
-      issues: read
-      pull-requests: write
-
-    steps:
-      - name: Apply labels from linked issue to PR
-        uses: actions/github-script@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            async function getLinkedIssues(owner, repo, prNumber) {
-              const query = `query GetLinkedIssues($owner: String!, $repo: String!, $prNumber: Int!) {
-                repository(owner: $owner, name: $repo) {
-                  pullRequest(number: $prNumber) {
-                    closingIssuesReferences(first: 10) {
-                      nodes {
-                        number
-                        labels(first: 10) {
-                          nodes {
-                            name
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }`;
-
-              const variables = {
-                owner: owner,
-                repo: repo,
-                prNumber: prNumber,
-              };
-
-              const result = await github.graphql(query, variables);
-              return result.repository.pullRequest.closingIssuesReferences.nodes;
-            }
-
-            const pr = context.payload.pull_request;
-            const linkedIssues = await getLinkedIssues(
-              context.repo.owner,
-              context.repo.repo,
-              pr.number
-            );
-
-            const labelsToAdd = new Set();
-            for (const issue of linkedIssues) {
-              if (issue.labels && issue.labels.nodes) {
-                for (const label of issue.labels.nodes) {
-                  labelsToAdd.add(label.name);
-                }
-              }
-            }
-
-            if (labelsToAdd.size) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels: Array.from(labelsToAdd),
-              });
-            }

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Upload ESLint report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: lint-results
           path: lint-results

.github/workflows/merge-conflict.yml

@@ -0,0 +1,18 @@
+name: Auto Comment Merge Conflicts
+on: push
+
+permissions:
+  pull-requests: write
+
+jobs:
+  auto-comment-merge-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: codytseng/auto-comment-merge-conflicts@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-body: "Hey there, there is a merge conflict, can you take a look?"
+          wait-ms: 3000
+          max-retries: 5
+          label-name: "🚨 merge conflict"
+          ignore-authors: dependabot,otherAuthor

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

@@ -2,7 +2,6 @@ name: "Next.js Bundle Analysis"
 
 on:
   workflow_call:
-  workflow_dispatch:
   push:
     branches:
       - main
@@ -28,14 +27,14 @@ jobs:
           npx -p nextjs-bundle-analysis@0.5.0 report
 
       - name: Upload bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         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()
+        if: success() && github.event.number
         with:
           workflow: nextjs-bundle-analysis.yml
           branch: ${{ github.event.pull_request.base.ref }}
@@ -55,7 +54,7 @@ jobs:
       # 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()
+        if: success() && github.event.number
         run: |
           cd apps/web
           ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
@@ -69,10 +68,10 @@ jobs:
           body="${body//'%'/'%25'}"
           body="${body//$'\n'/'%0A'}"
           body="${body//$'\r'/'%0D'}"
-          echo "{body}=${body}" >> $GITHUB_OUTPUT
+          echo ::set-output name=body::$body
 
       - name: Find Comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v1
         if: success() && github.event.number
         id: fc
         with:
@@ -80,14 +79,14 @@ jobs:
           body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
 
       - name: Create Comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v1.4.4
         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
+        uses: peter-evans/create-or-update-comment@v1.4.4
         if: success() && github.event.number && steps.fc.outputs.comment-id != 0
         with:
           issue-number: ${{ github.event.number }}

.github/workflows/pr-assign-team-label.yml

@@ -0,0 +1,16 @@
+name: Assign PR team labels
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  team-labels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: equitybee/team-label-action@main
+        with:
+          repo-token: ${{ secrets.GH_ACCESS_TOKEN }}
+          organization-name: calcom
+          ignore-labels: "app-store, authentication, automated-testing, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, teams, webhooks, workflows, zapier"

.github/workflows/pr.yml

@@ -4,6 +4,9 @@ on:
   pull_request_target:
     branches:
       - main
+    paths-ignore:
+      - "**.md"
+      - ".github/CODEOWNERS"
   merge_group:
   workflow_dispatch:
 
@@ -12,21 +15,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  login:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
   changes:
     name: Detect changes
     runs-on: buildjet-4vcpu-ubuntu-2204
     permissions:
       pull-requests: read
     outputs:
-      has-files-requiring-all-checks: ${{ steps.filter.outputs.has-files-requiring-all-checks }}
+      app-store: ${{ steps.filter.outputs.app-store }}
+      embed: ${{ steps.filter.outputs.embed }}
+      embed-react: ${{ steps.filter.outputs.embed-react }}
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
@@ -34,83 +31,78 @@ jobs:
         id: filter
         with:
           filters: |
-            has-files-requiring-all-checks:
-              - "!(**.md|.github/CODEOWNERS)"
+            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'
+
   type-check:
     name: Type check
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/check-types.yml
     secrets: inherit
 
   test:
     name: Unit tests
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/unit-tests.yml
+    uses: ./.github/workflows/test.yml
     secrets: inherit
 
   lint:
     name: Linters
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/lint.yml
     secrets: inherit
 
   build:
     name: Production build
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/production-build.yml
     secrets: inherit
 
   build-without-database:
     name: Production build (without database)
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/production-build-without-database.yml
     secrets: inherit
 
   e2e:
     name: E2E tests
     needs: [changes, lint, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e.yml
     secrets: inherit
 
   e2e-app-store:
     name: E2E App Store tests
     needs: [changes, lint, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-app-store.yml
     secrets: inherit
 
   e2e-embed:
     name: E2E embeds tests
     needs: [changes, lint, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-embed.yml
     secrets: inherit
 
   e2e-embed-react:
     name: E2E React embeds tests
     needs: [changes, lint, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
   analyze:
-    name: Analyze Build
-    needs: [changes, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: build
     uses: ./.github/workflows/nextjs-bundle-analysis.yml
     secrets: inherit
 
   required:
-    needs: [changes, lint, type-check, test, build, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    needs: [lint, type-check, test, build, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     if: always()
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
       - name: fail if conditional jobs failed
-        if: needs.changes.outputs.has-files-requiring-all-checks == 'true' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled'))
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')
         run: exit 1

.github/workflows/pre-release.yml

@@ -1,82 +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@v3
-      - uses: ./.github/actions/dangerous-git-checkout
-      - uses: dorny/paths-filter@v2
-        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 build
-    uses: ./.github/workflows/production-build.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
-
-  build-without-database:
-    name: Production build (without database)
-    uses: ./.github/workflows/production-build-without-database.yml
-    secrets: inherit
-
-  required:
-    needs: [e2e, e2e-app-store, e2e-embed, e2e-embed-react, build-without-database]
-    if: always()
-    runs-on: buildjet-4vcpu-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.yml

@@ -9,10 +9,6 @@ env:
   DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
   E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
   E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
-  E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}
-  E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}
-  E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ secrets.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
-  E2E_TEST_CALCOM_GCAL_KEYS: ${{ secrets.E2E_TEST_CALCOM_GCAL_KEYS }}
   GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
   GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}
   NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}

.github/workflows/semantic-pull-requests.yml

@@ -44,5 +44,5 @@ jobs:
         with:
           header: pr-title-lint-error
           message: |
-            Thank you for following the naming conventions! 🙏 Feel free to join our [discord](https://go.cal.com/discord) and post your PR link.           
+            Thank you for following the naming conventions! 🙏 Feel free to join our [discord](https://go.cal.com/discord) and post your PR link to [collect XP and win prizes!](https://cal.com/blog/community-incentives)            
 

.github/workflows/test.yml

@@ -11,8 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=6144"' >> $GITHUB_ENV
       - 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

.github/workflows/welcome-new-contributors.yml

@@ -0,0 +1,27 @@
+name: "Welcome new contributors"
+
+on:
+  issues:
+    types: opened
+  pull_request:
+    types: opened
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  welcome-message:
+    name: Welcoming New Users
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: github.event.action == 'opened'
+    steps:
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-message: |-
+            Thank you for making your first Pull Request and taking the time to improve Cal.com ! ❤️🎉
+            Feel free to join our [discord](https://go.cal.com/discord) and post your PR link to [collect XP and win prizes!](https://cal.com/blog/community-incentives)            
+          issue-message: |
+            Thank you for opening your first issue, one of our team members will review it as soon as it possible. ❤️🎉

.vscode/settings.json

@@ -2,7 +2,7 @@
   "typescript.tsdk": "node_modules/typescript/lib",
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.eslint": true
   },
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "spellright.language": ["en"],

.yarn/patches/libphonenumber-js-npm-1.10.51-4ff79b15f8.patch

@@ -1,15 +0,0 @@
-diff --git a/index.cjs b/index.cjs
-index c83f700ae9998cd87b4c2d66ecbb2ad3d7b4603c..76a2200b57f0b9243e2c61464d578b67746ad5a4 100644
---- a/index.cjs
-+++ b/index.cjs
-@@ -13,8 +13,8 @@ function withMetadataArgument(func, _arguments) {
- // https://github.com/babel/babel/issues/2212#issuecomment-131827986
- // An alternative approach:
- // https://www.npmjs.com/package/babel-plugin-add-module-exports
--exports = module.exports = min.parsePhoneNumberFromString
--exports['default'] = min.parsePhoneNumberFromString
-+// exports = module.exports = min.parsePhoneNumberFromString
-+// exports['default'] = min.parsePhoneNumberFromString
- 
- // `parsePhoneNumberFromString()` named export is now considered legacy:
- // it has been promoted to a default export due to being too verbose.

.yarn/patches/next-i18next-npm-13.3.0-bf25b0943c.patch

@@ -1,26 +0,0 @@
-diff --git a/dist/commonjs/serverSideTranslations.js b/dist/commonjs/serverSideTranslations.js
-index bcad3d02fbdfab8dacb1d85efd79e98623a0c257..fff668f598154a13c4030d1b4a90d5d9c18214ad 100644
---- a/dist/commonjs/serverSideTranslations.js
-+++ b/dist/commonjs/serverSideTranslations.js
-@@ -36,7 +36,6 @@ var _fs = _interopRequireDefault(require("fs"));
- var _path = _interopRequireDefault(require("path"));
- var _createConfig = require("./config/createConfig");
- var _node = _interopRequireDefault(require("./createClient/node"));
--var _appWithTranslation = require("./appWithTranslation");
- var _utils = require("./utils");
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-@@ -110,12 +109,8 @@ var serverSideTranslations = /*#__PURE__*/function () {
-               lng: initialLocale
-             }));
-             localeExtension = config.localeExtension, localePath = config.localePath, fallbackLng = config.fallbackLng, reloadOnPrerender = config.reloadOnPrerender;
--            if (!reloadOnPrerender) {
--              _context.next = 18;
--              break;
--            }
-             _context.next = 18;
--            return _appWithTranslation.globalI18n === null || _appWithTranslation.globalI18n === void 0 ? void 0 : _appWithTranslation.globalI18n.reloadResources();
-+            return void 0;
-           case 18:
-             _createClient = (0, _node["default"])(_objectSpread(_objectSpread({}, config), {}, {
-               lng: initialLocale

CONTRIBUTING.md

@@ -2,18 +2,7 @@
 
 Contributions are what makes the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
-## House rules
-
-- Before submitting a new issue or PR, check if it already exists in [issues](https://github.com/calcom/cal.com/issues) or [PRs](https://github.com/calcom/cal.com/pulls).
-- GitHub issues: take note of the `🚨 needs approval` label.
-  - **For Contributors**:
-    - Feature Requests: Wait for a core member to approve and remove the `🚨 needs approval` label before you start coding or submit a PR.
-    - Bugs, Security, Performance, Documentation, etc.: You can start coding immediately, even if the `🚨 needs approval` label is present. This label mainly concerns feature requests.
-  - **Our Process**:
-    - Issues from non-core members automatically receive the `🚨 needs approval` label.
-    - We greatly value new feature ideas. To ensure consistency in the product's direction, they undergo review and approval.
-
-
+- Before jumping into a PR be sure to search [existing PRs](https://github.com/calcom/cal.com/pulls) or [issues](https://github.com/calcom/cal.com/issues) for an open or closed item that relates to your submission.
 
 ## Priorities
 
@@ -103,22 +92,7 @@ To develop locally:
    - Use `openssl rand -base64 32` to generate a key and add it under `NEXTAUTH_SECRET` in the `.env` file.
    - Use `openssl rand -base64 24` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
 
-6. Setup Node
-   If your Node version does not meet the project's requirements as instructed by the docs, "nvm" (Node Version Manager) allows using Node at the version required by the project:
-
-   ```sh
-   nvm use
-   ```
-
-   You first might need to install the specific version and then use it:
-
-   ```sh
-   nvm install && nvm use
-   ```
-
-   You can install nvm from [here](https://github.com/nvm-sh/nvm).
-
-7. Start developing and watch for code changes:
+6. Start developing and watch for code changes:
 
    ```sh
    yarn dev
@@ -146,16 +120,6 @@ This will run and test all flows in multiple Chromium windows to verify that no
 yarn test-e2e
 ```
 
-#### Resolving issues
-
-##### E2E test browsers not installed
-
-Run `npx playwright install` to download test browsers and resolve the error below when running `yarn test-e2e`:
-
-```
-Executable doesn't exist at /Users/alice/Library/Caches/ms-playwright/chromium-1048/chrome-mac/Chromium.app/Contents/MacOS/Chromium
-```
-
 ## Linting
 
 To check the formatting of your code:
@@ -171,49 +135,4 @@ If you get errors, be sure to fix them before committing.
 - Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) while creating your PR.
 - If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. See more about [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
 - Be sure to fill the PR Template accordingly.
-- Review [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations
-
-## Guidelines for committing yarn lockfile
-
-Do not commit your `yarn.lock` unless you've made changes to the `package.json`. If you've already committed `yarn.lock` unintentionally, follow these steps to undo:
-
-If your last commit has the `yarn.lock` file alongside other files and you only wish to uncommit the `yarn.lock`:
-   ```bash
-   git checkout HEAD~1 yarn.lock
-   git commit -m "Revert yarn.lock changes"
-   ```
-If you've pushed the commit with the `yarn.lock`:
-   1. Correct the commit locally using the above method.
-   2. Carefully force push:
-
-   ```bash
-   git push origin <your-branch-name> --force
-   ```
-
-If `yarn.lock` was committed a while ago and there have been several commits since, you can use the following steps to revert just the `yarn.lock` changes without impacting the subsequent changes:
-
-1. **Checkout a Previous Version**:
-   - Find the commit hash before the `yarn.lock` was unintentionally committed. You can do this by viewing the Git log:
-     ```bash
-     git log yarn.lock
-     ```
-   - Once you have identified the commit hash, use it to checkout the previous version of `yarn.lock`:
-     ```bash
-     git checkout <commit_hash> yarn.lock
-     ```
-
-2. **Commit the Reverted Version**:
-   - After checking out the previous version of the `yarn.lock`, commit this change:
-     ```bash
-     git commit -m "Revert yarn.lock to its state before unintended changes"
-     ```
-
-3. **Proceed with Caution**:
-   - If you need to push this change, first pull the latest changes from your remote branch to ensure you're not overwriting other recent changes:
-     ```bash
-     git pull origin <your-branch-name>
-     ```
-   - Then push the updated branch:
-     ```bash
-     git push origin <your-branch-name>
-     ```
+- Review [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations

PRIVACY.md

@@ -1,37 +0,0 @@
-## PRIVACY POLICY
-Last updated January 28, 2024
-
-  
-### Introduction
-This is the privacy notice of MaroCalendar, a personal calendar booking service that is only used by me, Gustavo Maronato, to manage my personal and work calendars, and allow you to book events with me. Here, you'll find a description of how and why I might collect, store, and use your information when you book an event with me using this service.
-  
-The service is located at [https://cal.maronato.dev](https://cal.maronato.dev).
-
-### Questions or concerns?
-Reading this privacy notice will help you understand your privacy rights and choices. If you do not agree with my policies and practices, please do not access or book an event with me using this service.
-
-## SUMMARY OF KEY POINTS
-
-### What personal information do I process?
-When you choose to book an event with me, you provide me with your name and email address.
-
-### Do I process any sensitive personal information?
-I do not process sensitive personal information.
-
-### Do I receive any information from third parties?
-I do not receive any information from third parties.
-
-### How do I process your information?
-When you book an event with me, I use your name and email address to send you an email with a calendar invite to the event you booked.
-
-### In what situations and with which parties do I share personal information?
-The information you submit is used to create a booking between myself and you. I do not share your information with any third parties.
-
-### How do I keep your information safe?
-I use reasonable and appropriate security measures to protect your personal information from loss, misuse, and unauthorized access, disclosure, alteration, and destruction.
-
-### What are your rights?
-You can cancel your booking at any time by clicking the link in the confirmation email you received when you booked the event.
-
-### Google Calendar
-I use a Google Calendar oAuth integration to automatically display to you what are my free time slots and manage the events you book on my calendar. You do not interact with this integration and you are not allowed to use your Google account to add this integration to your Google Calendar. This integration is only used by me to manage my calendar and is not shared with anyone else.

README.md

@@ -7,7 +7,7 @@
   <h3 align="center">Cal.com (formerly Calendso)</h3>
 
   <p align="center">
-    The open-source Calendly successor.
+    The open-source Calendly alternative.
     <br />
     <a href="https://cal.com"><strong>Learn more »</strong></a>
     <br />
@@ -50,7 +50,7 @@
 
 # Scheduling infrastructure for absolutely everyone
 
-The open source Calendly successor. You are in charge
+The open source Calendly alternative. You are in charge
 of your own data, workflow, and appearance.
 
 Calendly and other scheduling tools are awesome. It made our lives massively easier. We're using it for business meetings, seminars, yoga classes, and even calls with our families. However, most tools are very limited in terms of control and customization.
@@ -122,7 +122,7 @@ Here is what you need to be able to run Cal.com.
 
 ### Setup
 
-1. Clone the repo into a public GitHub repository (or fork https://github.com/calcom/cal.com/fork). If you plan to distribute the code, keep the source code public to comply with [AGPLv3](https://github.com/calcom/cal.com/blob/main/LICENSE). To clone in a private repository, [acquire a commercial license](https://cal.com/sales)
+1. Clone the repo into a public GitHub repository (or fork https://github.com/calcom/cal.com/fork). If you plan to distribute the code, keep the source code public to comply with [AGPLv3](https://github.com/calcom/cal.com/blob/main/LICENSE). To clone in a private repository, [acquire a commercial license](https://cal.com/sales))
 
    ```sh
    git clone https://github.com/calcom/cal.com.git
@@ -131,38 +131,22 @@ Here is what you need to be able to run Cal.com.
    > If you are on Windows, run the following command on `gitbash` with admin privileges: <br> > `git clone -c core.symlinks=true https://github.com/calcom/cal.com.git` <br>
    > See [docs](https://cal.com/docs/how-to-guides/how-to-troubleshoot-symbolic-link-issues-on-windows#enable-symbolic-links) for more details.
 
-2. Go to the project folder
+1. Go to the project folder
 
    ```sh
    cd cal.com
    ```
 
-3. Install packages with yarn
+1. Install packages with yarn
 
    ```sh
    yarn
    ```
 
-4. Set up your `.env` file
-
+1. Set up your `.env` file
    - Duplicate `.env.example` to `.env`
    - Use `openssl rand -base64 32` to generate a key and add it under `NEXTAUTH_SECRET` in the `.env` file.
-   - Use `openssl rand -base64 32` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
-
-5. Setup Node
-   If your Node version does not meet the project's requirements as instructed by the docs, "nvm" (Node Version Manager) allows using Node at the version required by the project:
-
-   ```sh
-   nvm use
-   ```
-
-   You first might need to install the specific version and then use it:
-
-   ```sh
-   nvm install && nvm use
-   ```
-
-   You can install nvm from [here](https://github.com/nvm-sh/nvm).
+   - Use `openssl rand -base64 24` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
 
 #### Quick start with `yarn dx`
 
@@ -216,11 +200,12 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
 
    If you don't want to create a local DB. Then you can also consider using services like railway.app or render.
 
-   - [Setup postgres DB with railway.app](https://docs.railway.app/guides/postgresql)
+   - [Setup postgres DB with railway.app](https://arctype.com/postgres/setup/railway-postgres)
    - [Setup postgres DB with render](https://render.com/docs/databases)
 
 1. Copy and paste your `DATABASE_URL` from `.env` to `.env.appStore`.
 
+1. Set a 32 character random string in your `.env` file for the `CALENDSO_ENCRYPTION_KEY` (You can use a command like `openssl rand -base64 24` to generate one).
 1. Set up the database using the Prisma schema (found in `packages/prisma/schema.prisma`)
 
    In a development environment, run:
@@ -236,7 +221,6 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
    ```
 
 1. Run [mailhog](https://github.com/mailhog/MailHog) to view emails sent during development
-
    > **_NOTE:_** Required when `E2E_TEST_MAILHOG_ENABLED` is "1"
 
    ```sh
@@ -252,8 +236,6 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
 
 #### Setting up your first user
 
-##### Approach 1
-
 1. Open [Prisma Studio](https://prisma.io/studio) to look at or modify the database content:
 
    ```sh
@@ -265,17 +247,6 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
    > New users are set on a `TRIAL` plan by default. You might want to adjust this behavior to your needs in the `packages/prisma/schema.prisma` file.
 1. Open a browser to [http://localhost:3000](http://localhost:3000) and login with your just created, first user.
 
-##### Approach 2
-
-Seed the local db by running
-
-```sh
-cd packages/prisma
-yarn db-seed
-```
-
-The above command will populate the local db with dummy users.
-
 ### E2E-Testing
 
 Be sure to set the environment variable `NEXTAUTH_URL` to the correct value. If you are running locally, as the documentation within `.env.example` mentions, the value should be `http://localhost:3000`.
@@ -288,16 +259,6 @@ yarn test-e2e
 yarn playwright show-report test-results/reports/playwright-html-report
 ```
 
-#### Resolving issues
-
-##### E2E test browsers not installed
-
-Run `npx playwright install` to download test browsers and resolve the error below when running `yarn test-e2e`:
-
-```
-Executable doesn't exist at /Users/alice/Library/Caches/ms-playwright/chromium-1048/chrome-mac/Chromium.app/Contents/MacOS/Chromium
-```
-
 ### Upgrading from earlier versions
 
 1. Pull the current version:
@@ -380,10 +341,6 @@ Currently Vercel Pro Plan is required to be able to Deploy this application with
 
 [![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/calcom/docker)
 
-### Elestio
-
-[![Deploy on Elestio](https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png)](https://elest.io/open-source/cal.com)
-
 <!-- ROADMAP -->
 
 ## Roadmap
@@ -513,8 +470,9 @@ following
 4. Select Basecamp 4 as the product to integrate with.
 5. Set the Redirect URL for OAuth `<Cal.com URL>/api/integrations/basecamp3/callback` replacing Cal.com URL with the URI at which your application runs.
 6. Click on done and copy the Client ID and secret into the `BASECAMP3_CLIENT_ID` and `BASECAMP3_CLIENT_SECRET` fields.
-7. Set the `BASECAMP3_CLIENT_SECRET` env variable to `{your_domain} ({support_email})`.
-   For example, `Cal.com (support@cal.com)`.
+7. Set the `BASECAMP3_CLIENT_SECRET` env variable to `{your_domain} ({support_email})`. 
+For example, `Cal.com (support@cal.com)`.
+
 
 ### Obtaining HubSpot Client ID and Secret
 
@@ -549,15 +507,10 @@ following
 ### Obtaining Zoho Calendar Client ID and Secret
 
 [Follow these steps](./packages/app-store/zohocalendar/)
-
 ### Obtaining Zoho Bigin Client ID and Secret
 
 [Follow these steps](./packages/app-store/zoho-bigin/)
 
-### Obtaining Pipedrive Client ID and Secret
-
-[Follow these steps](./packages/app-store/pipedrive-crm/)
-
 ## Workflows
 
 ### Setting up SendGrid for Email reminders
@@ -600,6 +553,8 @@ Distributed under the [AGPLv3 License](https://github.com/calcom/cal.com/blob/ma
 
 Special thanks to these amazing projects which help power Cal.com:
 
+[<img src="https://cal.com/powered-by-vercel.svg">](https://vercel.com/?utm_source=calend-so&utm_campaign=oss)
+
 - [Vercel](https://vercel.com/?utm_source=calend-so&utm_campaign=oss)
 - [Next.js](https://nextjs.org/)
 - [Day.js](https://day.js.org/)

TERMS-OF-SERVICE.md

@@ -1,117 +0,0 @@
-Terms of Service
-----------------
-
-Effective date: 01/28/2024
-
-Introduction
-------------
-
-These are the terms of service for my personal calendar booking service, MaroCalendar. You may use this service to book events with me by providing your name, email address, and date/time preferences. 
-
-These Terms of Service (“Terms”, “Terms of Service”) govern your use of this service located at https://cal.maronato.dev operated by Gustavo Maronato.
-
-You can also find it's privacy policy here https://git.maronato.dev/maronato/cal/src/branch/main/PRIVACY.md
-
-And the source code here https://git.maronato.dev/maronato/cal
-
-If you do not agree with (or cannot comply with) these terms, then you may not use the Service.
-
-Thank you for being responsible.
-
-Communications
---------------
-
-By using this service to book an event with me, you agree to receive an email with the calendar invite. You may also receive a reminder email before the event, or a confirmation email if you reschedule or cancel the event.
-
-Purchases
----------
-
-There are no purchases on this service. You may use it to book events with me, but you will not be charged for it.
-
-Contests, Sweepstakes and Promotions
-------------------------------------
-
-There are no contests, sweepstakes, or promotions on this service.
-
-Subscriptions
--------------
-
-There is no subscription on this service.
-
-
-Fee Changes
------------
-
-There are no fees on this service.
-
-Refunds
--------
-
-This is a free service, so there are no refunds.
-
-Content
--------
-
-Our Service allows you to create an event with me by providing your name and email address. You are responsible for that information that you submit on or through Service, including its legality, reliability, and appropriateness.
-
-By posting Content on or through Service, You represent and warrant that: (i) Content is yours (you own it) and/or you have the right to use it, and (ii) that the posting of your Content on or through Service does not violate the privacy rights, publicity rights, copyrights, contract rights or any other rights of any person or entity. I reserve the right to not meet with you.
-
-Prohibited Uses
----------------
-
-You may use Service only for lawful purposes and in accordance with Terms. You agree not to use Service:
-
-*   In any way that violates any applicable national or international law or regulation.
-*   For the purpose of exploiting, harming, or attempting to exploit or harm minors in any way by exposing them to inappropriate content or otherwise.
-*   To transmit, or procure the sending of, any advertising or promotional material, including any “junk mail”, “chain letter,” “spam,” or any other similar solicitation.
-*   To impersonate or attempt to impersonate Company, a Company employee, another user, or any other person or entity.
-*   In any way that infringes upon the rights of others, or in any way is illegal, threatening, fraudulent, or harmful, or in connection with any unlawful, illegal, fraudulent, or harmful purpose or activity.
-*   To engage in any other conduct that restricts or inhibits anyone’s use or enjoyment of Service, or which, as determined by us, may harm or offend Company or users of Service or expose them to liability.
-
-Additionally, you agree not to:
-
-*   Use Service in any manner that could disable, overburden, damage, or impair Service or interfere with any other party’s use of Service, including their ability to engage in real time activities through Service.
-*   Use any robot, spider, or other automatic device, process, or means to access Service for any purpose, including monitoring or copying any of the material on Service.
-*   Use any manual process to monitor or copy any of the material on Service or for any other unauthorized purpose without our prior written consent.
-*   Use any device, software, or routine that interferes with the proper working of Service.
-*   Introduce any viruses, trojan horses, worms, logic bombs, or other material which is malicious or technologically harmful.
-*   Attempt to gain unauthorized access to, interfere with, damage, or disrupt any parts of Service, the server on which Service is stored, or any server, computer, or database connected to Service.
-*   Attack Service via a denial-of-service attack or a distributed denial-of-service attack.
-*   Take any action that may damage or falsify Company rating.
-*   Otherwise attempt to interfere with the proper working of Service.
-
-Analytics
----------
-
-There is no analytics on this service.
-
-No Use By Minors
-----------------
-
-Service is intended only for access and use by individuals at least eighteen (18) years old. By accessing or using any of Company, you warrant and represent that you are at least eighteen (18) years of age and with the full authority, right, and capacity to enter into this agreement and abide by all of the terms and conditions of Terms. If you are not at least eighteen (18) years old, you are prohibited from both the access and usage of Service.
-
-Accounts
---------
-
-You cannot create an account on this service. The only account that exists is mine.
-
-Changes To Service
-------------------
-
-I reserve the right to withdraw or amend this Service, and any service or material I provide via Service, in my sole discretion without notice. I will not be liable if for any reason all or any part of Service is unavailable at any time or for any period. From time to time, I may restrict access to some parts of Service, or the entire Service, to visitors.
-
-Amendments To Terms
--------------------
-
-I may amend Terms at any time by posting the amended terms on this site. It is your responsibility to review these Terms periodically.
-
-Acknowledgement
----------------
-
-BY USING SERVICE OR OTHER SERVICES PROVIDED BY ME, YOU ACKNOWLEDGE THAT YOU HAVE READ THESE TERMS OF SERVICE AND AGREE TO BE BOUND BY THEM.
-
-Contact Me
-----------
-
-If you have any questions about these terms of service, please contact me:
-By email: support@maronato.dev

__checks__/README.md

@@ -1,4 +0,0 @@
-# Checkly Tests
-
-Run as `yarn checkly test`
-Deploy the tests as `yarn checkly deploy`

__checks__/organization.spec.ts

@@ -1,75 +0,0 @@
-import type { Page } from "@playwright/test";
-import { test, expect } from "@playwright/test";
-
-test.describe("Org", () => {
-  // Because these pages involve next.config.js rewrites, it's better to test them on production
-  test.describe("Embeds - i.cal.com", () => {
-    test("Org Profile Page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/embed");
-      expect(response?.status()).toBe(200);
-      await page.screenshot({ path: "screenshot.jpg" });
-      await expectPageToBeServerSideRendered(page);
-    });
-
-    test("Org User(Peer) Page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/peer/embed");
-      expect(response?.status()).toBe(200);
-      await expect(page.locator("text=Peer Richelsen")).toBeVisible();
-      await expectPageToBeServerSideRendered(page);
-    });
-
-    test("Org User Event(peer/meet) Page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/peer/meet/embed");
-      expect(response?.status()).toBe(200);
-      await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible();
-      await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible();
-      await expectPageToBeServerSideRendered(page);
-    });
-
-    test("Org Team Profile(/sales) page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/sales/embed");
-      expect(response?.status()).toBe(200);
-      await expect(page.locator("text=Cal.com Sales")).toBeVisible();
-      await expectPageToBeServerSideRendered(page);
-    });
-
-    test("Org Team Event page(/sales/hippa) should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/sales/hipaa/embed");
-      expect(response?.status()).toBe(200);
-      await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible();
-      await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible();
-      await expectPageToBeServerSideRendered(page);
-    });
-  });
-  test.describe("Dynamic Group Booking", () => {
-    test("Dynamic Group booking link should load", async ({ page }) => {
-      const users = [
-        {
-          username: "peer",
-          name: "Peer Richelsen",
-        },
-        {
-          username: "bailey",
-          name: "Bailey Pumfleet",
-        },
-      ];
-      const response = await page.goto(`http://i.cal.com/${users[0].username}+${users[1].username}`);
-      expect(response?.status()).toBe(200);
-      expect(await page.locator('[data-testid="event-title"]').textContent()).toBe("Dynamic");
-
-      expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[0].name);
-      expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[1].name);
-      // 2 users and 1 for the organization(2+1)
-      expect((await page.locator('[data-testid="event-meta"] [data-testid="avatar"]').all()).length).toBe(3);
-    });
-  });
-});
-
-// This ensures that the route is actually mapped to a page that is using withEmbedSsr
-async function expectPageToBeServerSideRendered(page: Page) {
-  expect(
-    await page.evaluate(() => {
-      return window.__NEXT_DATA__.props.pageProps.isEmbed;
-    })
-  ).toBe(true);
-}

app.json

@@ -83,10 +83,6 @@
     "NEXT_PUBLIC_TEAM_IMPERSONATION": {
       "description": "Set the following value to true if you wish to enable Team Impersonation",
       "value": "false"
-    },
-    "NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL": {
-      "description": "Control time intervals on a user's Schedule availability",
-      "value": "15"
     }
   },
   "scripts": {

apps/ai/.env.example

@@ -6,9 +6,6 @@ FRONTEND_URL=http://localhost:3000
 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=
 

apps/ai/README.md

@@ -1,12 +1,12 @@
-# Cal.ai
+# Cal.com Email Assistant
 
-Welcome to [Cal.ai](https://cal.ai)!
+Welcome to the first stage of 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?"
+  - Turn informal emails into bookings eg. forward "wanna meet tmrw at 2pm?"
+  - List and rearrange your bookings eg. "Cancel my next meeting"
+  - 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.
 
@@ -14,11 +14,7 @@ _The AI agent can only choose from a set of tools, without ever seeing your API
 
 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>
+Incoming emails are routed by email address. Addresses are verified by [DKIM record](https://support.google.com/a/answer/174124?hl=en), making it hard to spoof them.
 
 ## Getting Started
 
@@ -26,43 +22,27 @@ Incoming emails are routed by email address. Addresses are verified by [DKIM rec
 
 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:
+Before running the app, please see [env.mjs](./src/env.mjs) for all required environment variables. 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`
+  - 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, `ai@cal.dev`)
+  - The Cal.ai's app ID and URL (see [add.ts](/packages/app-store/cal-ai/api/index.ts))
 
 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. 
+To expose the AI app, run `ngrok http 3000` (or the AI app's port number) in a new terminal. You may need to install [nGrok](https://ngrok.com/).
 
-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))
+To forward incoming emails to the Node.js server, one option is to use [SendGrid's Inbound Parse Webhook](https://docs.sendgrid.com/for-developers/parsing-email/setting-up-the-inbound-parse-webhook).
 
-For nGrok, run `ngrok http 3005` (or the AI app's port number) in a new terminal. You may need to install nGrok first.
+1.  [Sign up for an account](https://signup.sendgrid.com/)
+2.  Go to Settings > [Inbound Parse](https://app.sendgrid.com/settings/parse) > Add Host & URL.
+3.  For subdomain, use `<sub>.<domain>.com` for now, where `sub` can be any subdomain but `domain.com` will need to be verified via MX records in your environment variables, eg. on [Vercel](https://vercel.com/guides/how-to-add-vercel-environment-variables).
+4.  Use the nGrok URL from above as the **Destination URL**.
+5.  Activate "POST the raw, full MIME message".
+6.  Send an email to `<anyone>@ai.example.com`. You should see a ping on the nGrok listener and Node.js server.
+7.  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.
 
-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!
+Please feel free to improve any part of this architecture.

apps/ai/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcom/ai",
-  "version": "1.2.1",
+  "version": "1.1.0",
   "private": true,
   "author": "Cal.com Inc.",
   "dependencies": {
@@ -8,7 +8,7 @@
     "@t3-oss/env-nextjs": "^0.6.1",
     "langchain": "^0.0.131",
     "mailparser": "^3.6.5",
-    "next": "^13.5.4",
+    "next": "^13.4.6",
     "supports-color": "8.1.1",
     "zod": "^3.22.2"
   },

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

@@ -5,9 +5,6 @@ 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.
@@ -40,13 +37,6 @@ export const POST = async (request: NextRequest) => {
 
     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

@@ -3,7 +3,6 @@ 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";
@@ -15,10 +14,6 @@ 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.
@@ -32,37 +27,18 @@ export const POST = async (request: NextRequest) => {
 
   const formData = await request.formData();
   const body = Object.fromEntries(formData);
+
+  // body.dkim looks like {@domain-com.22222222.gappssmtp.com : pass}
+  const signature = (body.dkim as string).includes(" : pass");
+
   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 });
   }
 
@@ -79,17 +55,14 @@ export const POST = async (request: NextRequest) => {
         },
       },
     },
-    where: { email: envelope.from },
+    where: { email: envelope.from, credentials: { some: { appId: env.APP_ID } } },
   });
 
-  // 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}`,
+      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.`,
+      subject: `Re: ${body.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,
@@ -106,7 +79,7 @@ export const POST = async (request: NextRequest) => {
 
     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}`,
+      subject: `Re: ${body.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,
@@ -133,7 +106,7 @@ export const POST = async (request: NextRequest) => {
 
   if ("error" in availability) {
     await sendEmail({
-      subject: `Re: ${subject}`,
+      subject: `Re: ${body.subject}`,
       text: "Sorry, there was an error fetching your availability. Please try again.",
       to: user.email,
       from: aiEmail,
@@ -144,7 +117,7 @@ export const POST = async (request: NextRequest) => {
 
   if ("error" in eventTypes) {
     await sendEmail({
-      subject: `Re: ${subject}`,
+      subject: `Re: ${body.subject}`,
       text: "Sorry, there was an error fetching your event types. Please try again.",
       to: user.email,
       from: aiEmail,
@@ -162,8 +135,8 @@ export const POST = async (request: NextRequest) => {
     body: JSON.stringify({
       apiKey,
       userId: user.id,
-      message: parsed.text || "",
-      subject: parsed.subject || "",
+      message: parsed.text,
+      subject: parsed.subject,
       replyTo: aiEmail,
       user: {
         email: user.email,

apps/ai/src/env.mjs

@@ -20,7 +20,6 @@ export const env = createEnv({
     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,
@@ -37,7 +36,6 @@ export const env = createEnv({
     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),

apps/ai/src/tools/createBooking.ts

@@ -47,7 +47,7 @@ const createBooking = async ({
   }
 
   const responses = {
-    id: invite.toString(),
+    id: invite,
     name: user.username,
     email: user.email,
   };

apps/ai/src/tools/sendBookingEmail.ts

@@ -1,124 +0,0 @@
-import { DynamicStructuredTool } from "langchain/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/sendBookingLink.ts

@@ -0,0 +1,81 @@
+import { DynamicStructuredTool } from "langchain/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 sendBookingLink = async ({
+  user,
+  agentEmail,
+  subject,
+  to,
+  message,
+  eventTypeSlug,
+  date,
+}: {
+  apiKey: string;
+  user: User;
+  users: UserList;
+  agentEmail: string;
+  subject: string;
+  to: string[];
+  message: string;
+  eventTypeSlug: string;
+  date: string;
+}) => {
+  const url = `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date}`;
+
+  await sendEmail({
+    subject,
+    to,
+    cc: user.email,
+    from: agentEmail,
+    text: message.split("[[[Booking Link]]]").join(url),
+    html: message
+      .split("\n")
+      .join("<br>")
+      .split("[[[Booking Link]]]")
+      .join(`<a href="${url}">Booking Link</a>`),
+  });
+
+  return "Booking link sent";
+};
+
+const sendBookingLinkTool = (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.",
+    func: async ({ message, subject, to, eventTypeSlug, date }) => {
+      return JSON.stringify(
+        await sendBookingLink({
+          apiKey,
+          user,
+          users,
+          agentEmail,
+          subject,
+          to,
+          message,
+          eventTypeSlug,
+          date,
+        })
+      );
+    },
+    name: "sendBookingLink",
+
+    schema: z.object({
+      message: z
+        .string()
+        .describe(
+          "Make sure to nicely format the message and introduce yourself as the primary user's booking assistant. Make sure to include a spot for the link using: [[[Booking Link]]]"
+        ),
+      subject: z.string(),
+      to: z
+        .array(z.string())
+        .describe("array of emails to send the booking link to. Primary user is automatically CC'd"),
+      eventTypeSlug: z.string().describe("the slug of the event type to book"),
+      date: z.string().describe("the date (yyyy-mm-dd) to suggest for the booking"),
+    }),
+  });
+};
+
+export default sendBookingLinkTool;

apps/ai/src/utils/agent.ts

@@ -6,7 +6,7 @@ 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 sendBookingLink from "../tools/sendBookingLink";
 import updateBooking from "../tools/updateBooking";
 import type { EventType } from "../types/eventType";
 import type { User, UserList } from "../types/user";
@@ -35,7 +35,7 @@ const agent = async (
     createBookingIfAvailable(apiKey, userId, users),
     updateBooking(apiKey, userId),
     deleteBooking(apiKey),
-    sendBookingEmail(apiKey, user, users, agentEmail),
+    sendBookingLink(apiKey, user, users, agentEmail),
   ];
 
   const model = new ChatOpenAI({
@@ -53,8 +53,6 @@ const agent = async (
 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}
@@ -76,19 +74,18 @@ ${
     ? `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)")
-            };`
+            (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")}`
     : ""

apps/ai/src/utils/extractUsers.ts

@@ -1,17 +1,11 @@
-import prisma from "@calcom/prisma";
-
-import type { UserList } from "../types/user";
-
 /*
  * Extracts usernames (@Example) and emails (hi@example.com) from a string
  */
+import type { UserList } from "../types/user";
+
 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 usernames = text.match(/(?<![a-zA-Z0-9_.])@[a-zA-Z0-9_]+/g)?.map((username) => username.slice(1));
+  const emails = text.match(/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/g);
 
   const dbUsersFromUsernames = usernames
     ? await prisma.user.findMany({

apps/api/lib/helpers/rateLimitApiKey.ts

@@ -1,15 +0,0 @@
-import type { NextMiddleware } from "next-api-middleware";
-
-import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-
-export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
-  if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
-
-  // TODO: Add a way to add trusted api keys
-  await checkRateLimitAndThrowError({
-    identifier: req.query.apiKey as string,
-    rateLimitingType: "api",
-  });
-
-  await next();
-};

apps/api/lib/helpers/verifyApiKey.ts

@@ -4,7 +4,7 @@ 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 { isAdminGuard } from "../utils/isAdmin";
+import { isAdminGuard } from "~/lib/utils/isAdmin";
 
 // Used to check if the apiKey is not expired, could be extracted if reused. but not for now.
 export const dateNotInPast = function (date: Date) {

apps/api/lib/helpers/withMiddleware.ts

@@ -12,29 +12,24 @@ import {
   HTTP_GET_OR_POST,
   HTTP_GET_DELETE_PATCH,
 } from "./httpMethods";
-import { rateLimitApiKey } from "./rateLimitApiKey";
 import { verifyApiKey } from "./verifyApiKey";
 import { withPagination } from "./withPagination";
 
-const middleware = {
-  HTTP_GET_OR_POST,
-  HTTP_GET_DELETE_PATCH,
-  HTTP_GET,
-  HTTP_PATCH,
-  HTTP_POST,
-  HTTP_DELETE,
-  addRequestId,
-  verifyApiKey,
-  rateLimitApiKey,
-  customPrismaClient,
-  extendRequest,
-  pagination: withPagination,
-  captureErrors,
-};
-
-type Middleware = keyof typeof middleware;
-
-const middlewareOrder =
+const withMiddleware = label(
+  {
+    HTTP_GET_OR_POST,
+    HTTP_GET_DELETE_PATCH,
+    HTTP_GET,
+    HTTP_PATCH,
+    HTTP_POST,
+    HTTP_DELETE,
+    addRequestId,
+    verifyApiKey,
+    customPrismaClient,
+    extendRequest,
+    pagination: withPagination,
+    captureErrors,
+  },
   // The order here, determines the order of execution
   [
     "extendRequest",
@@ -42,10 +37,8 @@ const middlewareOrder =
     // - Put customPrismaClient before verifyApiKey always.
     "customPrismaClient",
     "verifyApiKey",
-    "rateLimitApiKey",
     "addRequestId",
-  ] as Middleware[]; // <-- Provide a list of middleware to call automatically
+  ] // <-- Provide a list of middleware to call automatically
+);
 
-const withMiddleware = label(middleware, middlewareOrder);
-
-export { withMiddleware, middleware, middlewareOrder };
+export { withMiddleware };

apps/api/lib/utils/extractUserIdsFromQuery.ts

@@ -1,14 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { HttpError } from "@calcom/lib/http-error";
-
-import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/queryUserId";
-
-export function extractUserIdsFromQuery({ isAdmin, query }: NextApiRequest) {
-  /** Guard: Only admins can query other users */
-  if (!isAdmin) {
-    throw new HttpError({ statusCode: 401, message: "ADMIN required" });
-  }
-  const { userId: userIdOrUserIds } = schemaQuerySingleOrMultipleUserIds.parse(query);
-  return Array.isArray(userIdOrUserIds) ? userIdOrUserIds : [userIdOrUserIds];
-}

apps/api/lib/utils/isValidBase64Image.ts

@@ -1,4 +0,0 @@
-export function isValidBase64Image(input: string): boolean {
-  const regex = /^data:image\/[^;]+;base64,(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-  return regex.test(input);
-}

apps/api/lib/validations/availability.ts

@@ -26,7 +26,6 @@ const schemaAvailabilityCreateParams = z
     startTime: z.date().or(z.string()),
     endTime: z.date().or(z.string()),
     days: z.array(z.number()).optional(),
-    date: z.date().or(z.string()).optional(),
   })
   .strict();
 
@@ -35,7 +34,6 @@ const schemaAvailabilityEditParams = z
     startTime: z.date().or(z.string()).optional(),
     endTime: z.date().or(z.string()).optional(),
     days: z.array(z.number()).optional(),
-    date: z.date().or(z.string()).optional(),
   })
   .strict();
 

apps/api/lib/validations/booking.ts

@@ -58,7 +58,7 @@ export const schemaBookingReadPublic = Booking.extend({
       })
     )
     .optional(),
-  responses: z.record(z.any()).nullable(),
+  responses: z.record(z.any()),
 }).pick({
   id: true,
   userId: true,

apps/api/lib/validations/destination-calendar.ts

@@ -14,9 +14,9 @@ const schemaDestinationCalendarCreateParams = z
   .object({
     integration: z.string(),
     externalId: z.string(),
-    eventTypeId: z.number().optional(),
-    bookingId: z.number().optional(),
-    userId: z.number().optional(),
+    eventTypeId: z.number(),
+    bookingId: z.number(),
+    userId: z.number(),
   })
   .strict();
 

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

@@ -24,11 +24,6 @@ const hostSchema = _HostModel.pick({
   userId: true,
 });
 
-export const childrenSchema = z.object({
-  id: z.number().int(),
-  userId: z.number().int(),
-});
-
 export const schemaEventTypeBaseBodyParams = EventType.pick({
   title: true,
   description: true,
@@ -50,7 +45,6 @@ export const schemaEventTypeBaseBodyParams = EventType.pick({
   disableGuests: true,
   hideCalendarNotes: true,
   minimumBookingNotice: true,
-  parentId: true,
   beforeEventBuffer: true,
   afterEventBuffer: true,
   teamId: true,
@@ -60,15 +54,9 @@ export const schemaEventTypeBaseBodyParams = EventType.pick({
   successRedirectUrl: true,
   locations: true,
   bookingLimits: true,
-  onlyShowFirstAvailableSlot: true,
   durationLimits: true,
 })
-  .merge(
-    z.object({
-      children: z.array(childrenSchema).optional().default([]),
-      hosts: z.array(hostSchema).optional().default([]),
-    })
-  )
+  .merge(z.object({ hosts: z.array(hostSchema).optional().default([]) }))
   .partial()
   .strict();
 
@@ -85,7 +73,6 @@ const schemaEventTypeCreateParams = z
     seatsShowAvailabilityCount: z.boolean().optional(),
     bookingFields: eventTypeBookingFields.optional(),
     scheduleId: z.number().optional(),
-    parentId: z.number().optional(),
   })
   .strict();
 
@@ -138,7 +125,6 @@ export const schemaEventTypeReadPublic = EventType.pick({
   price: true,
   currency: true,
   slotInterval: true,
-  parentId: true,
   successRedirectUrl: true,
   description: true,
   locations: true,
@@ -148,12 +134,9 @@ export const schemaEventTypeReadPublic = EventType.pick({
   seatsShowAvailabilityCount: true,
   bookingFields: true,
   bookingLimits: true,
-  onlyShowFirstAvailableSlot: true,
   durationLimits: true,
 }).merge(
   z.object({
-    children: z.array(childrenSchema).optional().default([]),
-    hosts: z.array(hostSchema).optional().default([]),
     locations: z
       .array(
         z.object({

apps/api/lib/validations/schedule.ts

@@ -21,16 +21,7 @@ export const schemaSchedulePublic = z
   .merge(
     z.object({
       availability: z
-        .array(
-          Availability.pick({
-            id: true,
-            eventTypeId: true,
-            date: true,
-            days: true,
-            startTime: true,
-            endTime: true,
-          })
-        )
+        .array(Availability.pick({ id: true, eventTypeId: true, days: true, startTime: true, endTime: true }))
         .transform((v) =>
           v.map((item) => ({
             ...item,

apps/api/lib/validations/user.ts

@@ -4,7 +4,6 @@ import { checkUsername } from "@calcom/lib/server/checkUsername";
 import { _UserModel as User } from "@calcom/prisma/zod";
 import { iso8601 } from "@calcom/prisma/zod-utils";
 
-import { isValidBase64Image } from "~/lib/utils/isValidBase64Image";
 import { timeZone } from "~/lib/validations/shared/timeZone";
 
 // @note: These are the ONLY values allowed as weekStart. So user don't introduce bad data.
@@ -76,7 +75,6 @@ export const schemaUserBaseBodyParams = User.pick({
   theme: true,
   defaultScheduleId: true,
   locale: true,
-  hideBranding: true,
   timeFormat: true,
   brandColor: true,
   darkBrandColor: true,
@@ -92,12 +90,11 @@ export const schemaUserBaseBodyParams = User.pick({
 // Here we can both require or not (adding optional or nullish) and also rewrite validations for any value
 // for example making weekStart only accept weekdays as input
 const schemaUserEditParams = z.object({
-  email: z.string().email().toLowerCase(),
+  email: z.string().email(),
   username: usernameSchema,
   weekStart: z.nativeEnum(weekdays).optional(),
   brandColor: z.string().min(4).max(9).regex(/^#/).optional(),
   darkBrandColor: z.string().min(4).max(9).regex(/^#/).optional(),
-  hideBranding: z.boolean().optional(),
   timeZone: timeZone.optional(),
   theme: z.nativeEnum(theme).optional().nullable(),
   timeFormat: z.nativeEnum(timeFormat).optional(),
@@ -107,19 +104,17 @@ const schemaUserEditParams = z.object({
     .optional()
     .nullable(),
   locale: z.nativeEnum(locales).optional().nullable(),
-  avatar: z.string().refine(isValidBase64Image).optional(),
 });
 
 // @note: These are the values that are editable via PATCH method on the user Model,
 // merging both BaseBodyParams with RequiredParams, and omiting whatever we want at the end.
 
 const schemaUserCreateParams = z.object({
-  email: z.string().email().toLowerCase(),
+  email: z.string().email(),
   username: usernameSchema,
   weekStart: z.nativeEnum(weekdays).optional(),
   brandColor: z.string().min(4).max(9).regex(/^#/).optional(),
   darkBrandColor: z.string().min(4).max(9).regex(/^#/).optional(),
-  hideBranding: z.boolean().optional(),
   timeZone: timeZone.optional(),
   theme: z.nativeEnum(theme).optional().nullable(),
   timeFormat: z.nativeEnum(timeFormat).optional(),
@@ -130,7 +125,6 @@ const schemaUserCreateParams = z.object({
     .nullable(),
   locale: z.nativeEnum(locales).optional(),
   createdDate: iso8601.optional(),
-  avatar: z.string().refine(isValidBase64Image).optional(),
 });
 
 // @note: These are the values that are editable via PATCH method on the user Model,
@@ -163,7 +157,6 @@ export const schemaUserReadPublic = User.pick({
   defaultScheduleId: true,
   locale: true,
   timeFormat: true,
-  hideBranding: true,
   brandColor: true,
   darkBrandColor: true,
   allowDynamicBooking: true,

apps/api/lib/validations/webhook.ts

@@ -20,7 +20,6 @@ export const schemaWebhookCreateParams = z
     payloadTemplate: z.string().optional().nullable(),
     eventTypeId: z.number().optional(),
     userId: z.number().optional(),
-    secret: z.string().optional().nullable(),
     // API shouldn't mess with Apps webhooks yet (ie. Zapier)
     // appId: z.string().optional().nullable(),
   })
@@ -32,7 +31,6 @@ export const schemaWebhookEditBodyParams = schemaWebhookBaseBodyParams
   .merge(
     z.object({
       eventTriggers: z.enum(WEBHOOK_TRIGGER_EVENTS).array().optional(),
-      secret: z.string().optional().nullable(),
     })
   )
   .partial()

apps/api/next.config.js

@@ -1,8 +1,6 @@
 const { withAxiom } = require("next-axiom");
-const { withSentryConfig } = require("@sentry/nextjs");
 
-const plugins = [withAxiom];
-const nextConfig = {
+module.exports = withAxiom({
   transpilePackages: [
     "@calcom/app-store",
     "@calcom/core",
@@ -68,15 +66,4 @@ const nextConfig = {
       ],
     };
   },
-};
-
-if (!!process.env.NEXT_PUBLIC_SENTRY_DSN) {
-  nextConfig["sentry"] = {
-    autoInstrumentServerFunctions: true,
-    hideSourceMaps: true,
-  };
-
-  plugins.push(withSentryConfig);
-}
-
-module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
+});

apps/api/package.json

@@ -13,7 +13,6 @@
     "lint": "eslint . --ignore-path .gitignore",
     "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
     "start": "PORT=3002 next start",
-    "docker-start-api": "PORT=80 next start",
     "type-check": "tsc --pretty --noEmit"
   },
   "devDependencies": {
@@ -30,7 +29,7 @@
     "@calcom/lib": "*",
     "@calcom/prisma": "*",
     "@calcom/trpc": "*",
-    "@sentry/nextjs": "^7.73.0",
+    "@sentry/nextjs": "^7.20.0",
     "bcryptjs": "^2.4.3",
     "memory-cache": "^0.2.0",
     "next": "^13.4.6",

apps/api/pages/api/bookings/[id]/_auth-middleware.ts

@@ -6,44 +6,18 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
 
 async function authMiddleware(req: NextApiRequest) {
   const { userId, prisma, isAdmin, query } = req;
-  if (isAdmin) {
-    return;
-  }
-
   const { id } = schemaQueryIdParseInt.parse(query);
-  const userWithBookingsAndTeamIds = await prisma.user.findUnique({
+  const userWithBookings = await prisma.user.findUnique({
     where: { id: userId },
-    include: {
-      bookings: true,
-      teams: {
-        select: {
-          teamId: true,
-        },
-      },
-    },
+    include: { bookings: true },
   });
 
-  if (!userWithBookingsAndTeamIds) throw new HttpError({ statusCode: 404, message: "User not found" });
+  if (!userWithBookings) throw new HttpError({ statusCode: 404, message: "User not found" });
 
-  const userBookingIds = userWithBookingsAndTeamIds.bookings.map((booking) => booking.id);
+  const userBookingIds = userWithBookings.bookings.map((booking) => booking.id);
 
-  if (!userBookingIds.includes(id)) {
-    const teamBookings = await prisma.booking.findUnique({
-      where: {
-        id: id,
-        eventType: {
-          team: {
-            id: {
-              in: userWithBookingsAndTeamIds.teams.map((team) => team.teamId),
-            },
-          },
-        },
-      },
-    });
-
-    if (!teamBookings) {
-      throw new HttpError({ statusCode: 401, message: "You are not authorized" });
-    }
+  if (!isAdmin && !userBookingIds.includes(id)) {
+    throw new HttpError({ statusCode: 401, message: "You are not authorized" });
   }
 }
 

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

@@ -33,7 +33,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *          type: boolean
  *        description: Delete all remaining bookings
  *      - in: query
- *        name: cancellationReason
+ *        name: reason
  *        required: false
  *        schema:
  *          type: string
@@ -56,6 +56,10 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *               <td>The provided id didn't correspond to any existing booking.</td>
  *             </tr>
  *             <tr>
+ *               <td>Cannot cancel past events</td>
+ *               <td>The provided id matched an existing booking with a past startDate.</td>
+ *             </tr>
+ *             <tr>
  *               <td>User not found</td>
  *               <td>The userId did not matched an existing user.</td>
  *             </tr>

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

@@ -205,8 +205,8 @@ import { defaultResponder } from "@calcom/lib/server";
 async function handler(req: NextApiRequest) {
   const { userId, isAdmin } = req;
   if (isAdmin) req.userId = req.body.userId || userId;
-
-  return await handleNewBooking(req);
+  const booking = await handleNewBooking(req);
+  return booking;
 }
 
 export default defaultResponder(handler);

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

@@ -0,0 +1,240 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import { withMiddleware } from "~/lib/helpers/withMiddleware";
+import type { DestinationCalendarResponse } from "~/lib/types";
+import {
+  schemaDestinationCalendarEditBodyParams,
+  schemaDestinationCalendarReadPublic,
+} from "~/lib/validations/destination-calendar";
+import {
+  schemaQueryIdParseInt,
+  withValidQueryIdTransformParseInt,
+} from "~/lib/validations/shared/queryIdTransformParseInt";
+
+export async function destionationCalendarById(
+  { method, query, body, userId, prisma }: NextApiRequest,
+  res: NextApiResponse<DestinationCalendarResponse>
+) {
+  const safeQuery = schemaQueryIdParseInt.safeParse(query);
+  const safeBody = schemaDestinationCalendarEditBodyParams.safeParse(body);
+  if (!safeQuery.success) {
+    res.status(400).json({ message: "Your query was invalid" });
+    return;
+  }
+  const data = await prisma.destinationCalendar.findMany({ where: { userId } });
+  const userDestinationCalendars = data.map((destinationCalendar) => destinationCalendar.id);
+  //  FIXME: Should we also check ownership of bokingId and eventTypeId to avoid users cross-pollinating other users calendars.
+  // On a related note, moving from sequential integer IDs to UUIDs would be a good idea. and maybe help avoid having this problem.
+  if (userDestinationCalendars.includes(safeQuery.data.id)) res.status(401).json({ message: "Unauthorized" });
+  else {
+    switch (method) {
+      /**
+       * @swagger
+       * /destination-calendars/{id}:
+       *   get:
+       *     summary: Find a destination calendar
+       *     parameters:
+       *       - in: path
+       *         name: id
+       *         schema:
+       *           type: integer
+       *         required: true
+       *         description: ID of the destination calendar to get
+       *       - in: query
+       *         name: apiKey
+       *         required: true
+       *         schema:
+       *           type: string
+       *         description: Your API key
+       *     tags:
+       *      - destination-calendars
+       *     responses:
+       *       200:
+       *         description: OK
+       *       401:
+       *        description: Authorization information is missing or invalid.
+       *       404:
+       *         description: DestinationCalendar was not found
+       *   patch:
+       *     summary: Edit an existing destination calendar
+       *     parameters:
+       *      - in: path
+       *        name: id
+       *        schema:
+       *          type: integer
+       *        required: true
+       *        description: ID of the destination calendar to edit
+       *      - in: query
+       *        name: apiKey
+       *        required: true
+       *        schema:
+       *          type: string
+       *        description: Your API key
+       *     requestBody:
+       *       description: Create a new booking related to one of your event-types
+       *       required: true
+       *       content:
+       *         application/json:
+       *           schema:
+       *             type: object
+       *             properties:
+       *               integration:
+       *                 type: string
+       *                 description: 'The integration'
+       *               externalId:
+       *                 type: string
+       *                 description: 'The external ID of the integration'
+       *               eventTypeId:
+       *                 type: integer
+       *                 description: 'The ID of the eventType it is associated with'
+       *               bookingId:
+       *                 type: integer
+       *                 description: 'The booking ID it is associated with'
+       *     tags:
+       *      - destination-calendars
+       *     responses:
+       *       201:
+       *         description: OK, destinationCalendar edited successfuly
+       *       400:
+       *        description: Bad request. DestinationCalendar body is invalid.
+       *       401:
+       *        description: Authorization information is missing or invalid.
+       *   delete:
+       *     summary: Remove an existing destination calendar
+       *     parameters:
+       *      - in: path
+       *        name: id
+       *        schema:
+       *          type: integer
+       *        required: true
+       *        description: ID of the destination calendar to delete
+       *      - in: query
+       *        name: apiKey
+       *        required: true
+       *        schema:
+       *          type: string
+       *        description: Your API key
+       *     tags:
+       *      - destination-calendars
+       *     responses:
+       *       201:
+       *         description: OK, destinationCalendar removed successfuly
+       *       400:
+       *        description: Bad request. DestinationCalendar id is invalid.
+       *       401:
+       *        description: Authorization information is missing or invalid.
+       */
+      case "GET":
+        await prisma.destinationCalendar
+          .findUnique({ where: { id: safeQuery.data.id } })
+          .then((data) => schemaDestinationCalendarReadPublic.parse(data))
+          .then((destination_calendar) => res.status(200).json({ destination_calendar }))
+          .catch((error: Error) =>
+            res.status(404).json({
+              message: `DestinationCalendar with id: ${safeQuery.data.id} not found`,
+              error,
+            })
+          );
+        break;
+      /**
+       * @swagger
+       * /destination-calendars/{id}:
+       *   patch:
+       *     summary: Edit an existing destination calendar
+       *     parameters:
+       *      - in: path
+       *        name: id
+       *        schema:
+       *          type: integer
+       *        required: true
+       *        description: ID of the destination calendar to edit
+       *      - in: query
+       *        name: apiKey
+       *        required: true
+       *        schema:
+       *          type: string
+       *        description: Your API key
+       *     tags:
+       *      - destination-calendars
+       *     responses:
+       *       201:
+       *         description: OK, destinationCalendar edited successfuly
+       *       400:
+       *        description: Bad request. DestinationCalendar body is invalid.
+       *       401:
+       *        description: Authorization information is missing or invalid.
+       */
+      case "PATCH":
+        if (!safeBody.success) {
+          {
+            res.status(400).json({ message: "Invalid request body" });
+            return;
+          }
+        }
+        await prisma.destinationCalendar
+          .update({ where: { id: safeQuery.data.id }, data: safeBody.data })
+          .then((data) => schemaDestinationCalendarReadPublic.parse(data))
+          .then((destination_calendar) => res.status(200).json({ destination_calendar }))
+          .catch((error: Error) =>
+            res.status(404).json({
+              message: `DestinationCalendar with id: ${safeQuery.data.id} not found`,
+              error,
+            })
+          );
+        break;
+      /**
+       * @swagger
+       * /destination-calendars/{id}:
+       *   delete:
+       *     summary: Remove an existing destination calendar
+       *     parameters:
+       *      - in: path
+       *        name: id
+       *        schema:
+       *          type: integer
+       *        required: true
+       *        description: ID of the destination calendar to delete
+       *      - in: query
+       *        name: apiKey
+       *        required: true
+       *        schema:
+       *          type: string
+       *        description: Your API key
+       *     tags:
+       *      - destination-calendars
+       *     responses:
+       *       201:
+       *         description: OK, destinationCalendar removed successfuly
+       *       400:
+       *        description: Bad request. DestinationCalendar id is invalid.
+       *       401:
+       *        description: Authorization information is missing or invalid.
+       */
+      case "DELETE":
+        await prisma.destinationCalendar
+          .delete({
+            where: { id: safeQuery.data.id },
+          })
+          .then(() =>
+            res.status(200).json({
+              message: `DestinationCalendar with id: ${safeQuery.data.id} deleted`,
+            })
+          )
+          .catch((error: Error) =>
+            res.status(404).json({
+              message: `DestinationCalendar with id: ${safeQuery.data.id} not found`,
+              error,
+            })
+          );
+        break;
+
+      default:
+        res.status(405).json({ message: "Method not allowed" });
+        break;
+    }
+  }
+}
+
+export default withMiddleware("HTTP_GET_DELETE_PATCH")(
+  withValidQueryIdTransformParseInt(destionationCalendarById)
+);

apps/api/pages/api/destination-calendars/[id]/_auth-middleware.ts

@@ -1,32 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { HttpError } from "@calcom/lib/http-error";
-
-import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
-
-async function authMiddleware(req: NextApiRequest) {
-  const { userId, isAdmin, prisma } = req;
-  const { id } = schemaQueryIdParseInt.parse(req.query);
-  if (isAdmin) return;
-  const userEventTypes = await prisma.eventType.findMany({
-    where: { userId },
-    select: { id: true },
-  });
-
-  const userEventTypeIds = userEventTypes.map((eventType) => eventType.id);
-
-  const destinationCalendar = await prisma.destinationCalendar.findFirst({
-    where: {
-      AND: [
-        { id },
-        {
-          OR: [{ userId }, { eventTypeId: { in: userEventTypeIds } }],
-        },
-      ],
-    },
-  });
-  if (!destinationCalendar)
-    throw new HttpError({ statusCode: 404, message: "Destination calendar not found" });
-}
-
-export default authMiddleware;

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

@@ -1,42 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { defaultResponder } from "@calcom/lib/server";
-
-import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
-
-/**
- * @swagger
- * /destination-calendars/{id}:
- *   delete:
- *     summary: Remove an existing destination calendar
- *     parameters:
- *      - in: path
- *        name: id
- *        schema:
- *          type: integer
- *        required: true
- *        description: ID of the destination calendar to delete
- *      - in: query
- *        name: apiKey
- *        required: true
- *        schema:
- *          type: string
- *        description: Your API key
- *     tags:
- *      - destination-calendars
- *     responses:
- *       200:
- *         description: OK, destinationCalendar removed successfully
- *       401:
- *        description: Authorization information is missing or invalid.
- *       404:
- *        description: Destination calendar not found
- */
-export async function deleteHandler(req: NextApiRequest) {
-  const { prisma, query } = req;
-  const { id } = schemaQueryIdParseInt.parse(query);
-  await prisma.destinationCalendar.delete({ where: { id } });
-  return { message: `OK, Destination Calendar removed successfully` };
-}
-
-export default defaultResponder(deleteHandler);

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

@@ -1,47 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { defaultResponder } from "@calcom/lib/server";
-
-import { schemaDestinationCalendarReadPublic } from "~/lib/validations/destination-calendar";
-import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
-
-/**
- * @swagger
- * /destination-calendars/{id}:
- *   get:
- *     summary: Find a destination calendar
- *     parameters:
- *       - in: path
- *         name: id
- *         schema:
- *           type: integer
- *         required: true
- *         description: ID of the destination calendar to get
- *       - in: query
- *         name: apiKey
- *         required: true
- *         schema:
- *           type: string
- *         description: Your API key
- *     tags:
- *      - destination-calendars
- *     responses:
- *       200:
- *         description: OK
- *       401:
- *        description: Authorization information is missing or invalid.
- *       404:
- *         description: Destination calendar not found
- */
-export async function getHandler(req: NextApiRequest) {
-  const { prisma, query } = req;
-  const { id } = schemaQueryIdParseInt.parse(query);
-
-  const destinationCalendar = await prisma.destinationCalendar.findUnique({
-    where: { id },
-  });
-
-  return { destinationCalendar: schemaDestinationCalendarReadPublic.parse({ ...destinationCalendar }) };
-}
-
-export default defaultResponder(getHandler);

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

@@ -1,312 +0,0 @@
-import type { Prisma } from "@prisma/client";
-import type { NextApiRequest } from "next";
-import type { z } from "zod";
-
-import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
-import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
-import type { PrismaClient } from "@calcom/prisma";
-import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
-
-import {
-  schemaDestinationCalendarEditBodyParams,
-  schemaDestinationCalendarReadPublic,
-} from "~/lib/validations/destination-calendar";
-import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
-
-/**
- * @swagger
- * /destination-calendars/{id}:
- *   patch:
- *     summary: Edit an existing destination calendar
- *     parameters:
- *      - in: path
- *        name: id
- *        schema:
- *          type: integer
- *        required: true
- *        description: ID of the destination calendar to edit
- *      - in: query
- *        name: apiKey
- *        required: true
- *        schema:
- *          type: string
- *        description: Your API key
- *     requestBody:
- *       description: Create a new booking related to one of your event-types
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             type: object
- *             properties:
- *               integration:
- *                 type: string
- *                 description: 'The integration'
- *               externalId:
- *                 type: string
- *                 description: 'The external ID of the integration'
- *               eventTypeId:
- *                 type: integer
- *                 description: 'The ID of the eventType it is associated with'
- *               bookingId:
- *                 type: integer
- *                 description: 'The booking ID it is associated with'
- *     tags:
- *      - destination-calendars
- *     responses:
- *       200:
- *         description: OK
- *       401:
- *        description: Authorization information is missing or invalid.
- *       404:
- *        description: Destination calendar not found
- */
-type DestinationCalendarType = {
-  userId?: number | null;
-  eventTypeId?: number | null;
-  credentialId: number | null;
-};
-
-type UserCredentialType = {
-  id: number;
-  appId: string | null;
-  type: string;
-  userId: number | null;
-  user: {
-    email: string;
-  } | null;
-  teamId: number | null;
-  key: Prisma.JsonValue;
-  invalid: boolean | null;
-};
-
-export async function patchHandler(req: NextApiRequest) {
-  const { userId, isAdmin, prisma, query, body } = req;
-  const { id } = schemaQueryIdParseInt.parse(query);
-  const parsedBody = schemaDestinationCalendarEditBodyParams.parse(body);
-  const assignedUserId = isAdmin ? parsedBody.userId || userId : userId;
-
-  validateIntegrationInput(parsedBody);
-  const destinationCalendarObject: DestinationCalendarType = await getDestinationCalendar(id, prisma);
-  await validateRequestAndOwnership({ destinationCalendarObject, parsedBody, assignedUserId, prisma });
-
-  const userCredentials = await getUserCredentials({
-    credentialId: destinationCalendarObject.credentialId,
-    userId: assignedUserId,
-    prisma,
-  });
-  const credentialId = await verifyCredentialsAndGetId({
-    parsedBody,
-    userCredentials,
-    currentCredentialId: destinationCalendarObject.credentialId,
-  });
-  // If the user has passed eventTypeId, we need to remove userId from the update data to make sure we don't link it to user as well
-  if (parsedBody.eventTypeId) parsedBody.userId = undefined;
-  const destinationCalendar = await prisma.destinationCalendar.update({
-    where: { id },
-    data: { ...parsedBody, credentialId },
-  });
-  return { destinationCalendar: schemaDestinationCalendarReadPublic.parse(destinationCalendar) };
-}
-
-/**
- * Retrieves user credentials associated with a given credential ID and user ID and validates if the credentials belong to this user
- *
- * @param credentialId - The ID of the credential to fetch. If not provided, an error is thrown.
- * @param userId - The user ID against which the credentials need to be verified.
- * @param prisma - An instance of PrismaClient for database operations.
- *
- * @returns - An array containing the matching user credentials.
- *
- * @throws HttpError - If `credentialId` is not provided or no associated credentials are found in the database.
- */
-async function getUserCredentials({
-  credentialId,
-  userId,
-  prisma,
-}: {
-  credentialId: number | null;
-  userId: number;
-  prisma: PrismaClient;
-}) {
-  if (!credentialId) {
-    throw new HttpError({
-      statusCode: 404,
-      message: `Destination calendar missing credential id`,
-    });
-  }
-  const userCredentials = await prisma.credential.findMany({
-    where: { id: credentialId, userId },
-    select: credentialForCalendarServiceSelect,
-  });
-
-  if (!userCredentials || userCredentials.length === 0) {
-    throw new HttpError({
-      statusCode: 400,
-      message: `Bad request, no associated credentials found`,
-    });
-  }
-  return userCredentials;
-}
-
-/**
- * Verifies the provided credentials and retrieves the associated credential ID.
- *
- * This function checks if the `integration` and `externalId` properties from the parsed body are present.
- * If both properties exist, it fetches the connected calendar credentials using the provided user credentials
- * and checks for a matching external ID and integration from the list of connected calendars.
- *
- * If a match is found, it updates the `credentialId` with the one from the connected calendar.
- * Otherwise, it throws an HTTP error with a 400 status indicating an invalid credential ID.
- *
- * If the parsed body does not contain the necessary properties, the function
- * returns the `credentialId` from the destination calendar object.
- *
- * @param parsedBody - The parsed body from the incoming request, validated against a predefined schema.
- *                     Checked if it contain properties like `integration` and `externalId`.
- * @param userCredentials - An array of user credentials used to fetch the connected calendar credentials.
- * @param destinationCalendarObject - An object representing the destination calendar. Primarily used
- *                                    to fetch the default `credentialId`.
- *
- * @returns - The verified `credentialId` either from the matched connected calendar in case of updating the destination calendar,
- *            or the provided destination calendar object in other cases.
- *
- * @throws HttpError - If no matching connected calendar is found for the given `integration` and `externalId`.
- */
-async function verifyCredentialsAndGetId({
-  parsedBody,
-  userCredentials,
-  currentCredentialId,
-}: {
-  parsedBody: z.infer<typeof schemaDestinationCalendarEditBodyParams>;
-  userCredentials: UserCredentialType[];
-  currentCredentialId: number | null;
-}) {
-  if (parsedBody.integration && parsedBody.externalId) {
-    const calendarCredentials = getCalendarCredentials(userCredentials);
-
-    const { connectedCalendars } = await getConnectedCalendars(
-      calendarCredentials,
-      [],
-      parsedBody.externalId
-    );
-    const eligibleCalendars = connectedCalendars[0]?.calendars?.filter((calendar) => !calendar.readOnly);
-    const calendar = eligibleCalendars?.find(
-      (c) => c.externalId === parsedBody.externalId && c.integration === parsedBody.integration
-    );
-
-    if (!calendar?.credentialId)
-      throw new HttpError({
-        statusCode: 400,
-        message: "Bad request, credential id invalid",
-      });
-    return calendar?.credentialId;
-  }
-  return currentCredentialId;
-}
-
-/**
- * Validates the request for updating a destination calendar.
- *
- * This function checks the validity of the provided eventTypeId against the existing destination calendar object
- * in the sense that if the destination calendar is not linked to an event type, the eventTypeId can not be provided.
- *
- * It also ensures that the eventTypeId, if provided, belongs to the assigned user.
- *
- * @param destinationCalendarObject - An object representing the destination calendar.
- * @param parsedBody - The parsed body from the incoming request, validated against a predefined schema.
- * @param assignedUserId - The user ID assigned for the operation, which might be an admin or a regular user.
- * @param prisma - An instance of PrismaClient for database operations.
- *
- * @throws HttpError - If the validation fails or inconsistencies are detected in the request data.
- */
-async function validateRequestAndOwnership({
-  destinationCalendarObject,
-  parsedBody,
-  assignedUserId,
-  prisma,
-}: {
-  destinationCalendarObject: DestinationCalendarType;
-  parsedBody: z.infer<typeof schemaDestinationCalendarEditBodyParams>;
-  assignedUserId: number;
-  prisma: PrismaClient;
-}) {
-  if (parsedBody.eventTypeId) {
-    if (!destinationCalendarObject.eventTypeId) {
-      throw new HttpError({
-        statusCode: 400,
-        message: `The provided destination calendar can not be linked to an event type`,
-      });
-    }
-
-    const userEventType = await prisma.eventType.findFirst({
-      where: { id: parsedBody.eventTypeId },
-      select: { userId: true },
-    });
-
-    if (!userEventType || userEventType.userId !== assignedUserId) {
-      throw new HttpError({
-        statusCode: 404,
-        message: `Event type with ID ${parsedBody.eventTypeId} not found`,
-      });
-    }
-  }
-
-  if (!parsedBody.eventTypeId) {
-    if (destinationCalendarObject.eventTypeId) {
-      throw new HttpError({
-        statusCode: 400,
-        message: `The provided destination calendar can only be linked to an event type`,
-      });
-    }
-    if (destinationCalendarObject.userId !== assignedUserId) {
-      throw new HttpError({
-        statusCode: 403,
-        message: `Forbidden`,
-      });
-    }
-  }
-}
-
-/**
- * Fetches the destination calendar based on the provided ID as the path parameter, specifically `credentialId` and `eventTypeId`.
- *
- * If no matching destination calendar is found for the provided ID, an HTTP error with a 404 status
- * indicating that the desired destination calendar was not found is thrown.
- *
- * @param id - The ID of the destination calendar to be retrieved.
- * @param prisma - An instance of PrismaClient for database operations.
- *
- * @returns - An object containing details of the matching destination calendar, specifically `credentialId` and `eventTypeId`.
- *
- * @throws HttpError - If no destination calendar matches the provided ID.
- */
-async function getDestinationCalendar(id: number, prisma: PrismaClient) {
-  const destinationCalendarObject = await prisma.destinationCalendar.findFirst({
-    where: {
-      id,
-    },
-    select: { userId: true, eventTypeId: true, credentialId: true },
-  });
-
-  if (!destinationCalendarObject) {
-    throw new HttpError({
-      statusCode: 404,
-      message: `Destination calendar with ID ${id} not found`,
-    });
-  }
-
-  return destinationCalendarObject;
-}
-
-function validateIntegrationInput(parsedBody: z.infer<typeof schemaDestinationCalendarEditBodyParams>) {
-  if (parsedBody.integration && !parsedBody.externalId) {
-    throw new HttpError({ statusCode: 400, message: "External Id is required with integration value" });
-  }
-  if (!parsedBody.integration && parsedBody.externalId) {
-    throw new HttpError({ statusCode: 400, message: "Integration value is required with external ID" });
-  }
-}
-
-export default defaultResponder(patchHandler);

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

@@ -1,18 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-
-import { defaultHandler, defaultResponder } from "@calcom/lib/server";
-
-import { withMiddleware } from "~/lib/helpers/withMiddleware";
-
-import authMiddleware from "./_auth-middleware";
-
-export default withMiddleware()(
-  defaultResponder(async (req: NextApiRequest, res: NextApiResponse) => {
-    await authMiddleware(req);
-    return defaultHandler({
-      GET: import("./_get"),
-      PATCH: import("./_patch"),
-      DELETE: import("./_delete"),
-    })(req, res);
-  })
-);

apps/api/pages/api/destination-calendars/_get.ts

@@ -1,58 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
-
-import { extractUserIdsFromQuery } from "~/lib/utils/extractUserIdsFromQuery";
-import { schemaDestinationCalendarReadPublic } from "~/lib/validations/destination-calendar";
-
-/**
- * @swagger
- * /destination-calendars:
- *   get:
- *     parameters:
- *       - in: query
- *         name: apiKey
- *         required: true
- *         schema:
- *           type: string
- *         description: Your API key
- *     summary: Find all destination calendars
- *     tags:
- *      - destination-calendars
- *     responses:
- *       200:
- *         description: OK
- *       401:
- *        description: Authorization information is missing or invalid.
- *       404:
- *         description: No destination calendars were found
- */
-async function getHandler(req: NextApiRequest) {
-  const { userId, prisma } = req;
-  const userIds = req.query.userId ? extractUserIdsFromQuery(req) : [userId];
-
-  const userEventTypes = await prisma.eventType.findMany({
-    where: { userId: { in: userIds } },
-    select: { id: true },
-  });
-
-  const userEventTypeIds = userEventTypes.map((eventType) => eventType.id);
-
-  const allDestinationCalendars = await prisma.destinationCalendar.findMany({
-    where: {
-      OR: [{ userId: { in: userIds } }, { eventTypeId: { in: userEventTypeIds } }],
-    },
-  });
-
-  if (allDestinationCalendars.length === 0)
-    new HttpError({ statusCode: 404, message: "No destination calendars were found" });
-
-  return {
-    destinationCalendars: allDestinationCalendars.map((destinationCalendar) =>
-      schemaDestinationCalendarReadPublic.parse(destinationCalendar)
-    ),
-  };
-}
-
-export default defaultResponder(getHandler);

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

@@ -1,141 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
-import { HttpError } from "@calcom/lib/http-error";
-import { defaultResponder } from "@calcom/lib/server";
-import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
-
-import {
-  schemaDestinationCalendarReadPublic,
-  schemaDestinationCalendarCreateBodyParams,
-} from "~/lib/validations/destination-calendar";
-
-/**
- * @swagger
- * /destination-calendars:
- *   post:
- *     parameters:
- *       - in: query
- *         name: apiKey
- *         required: true
- *         schema:
- *           type: string
- *         description: Your API key
- *     summary: Creates a new destination calendar
- *     requestBody:
- *       description: Create a new destination calendar for your events
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             type: object
- *             required:
- *               - integration
- *               - externalId
- *               - credentialId
- *             properties:
- *               integration:
- *                 type: string
- *                 description: 'The integration'
- *               externalId:
- *                 type: string
- *                 description: 'The external ID of the integration'
- *               eventTypeId:
- *                 type: integer
- *                 description: 'The ID of the eventType it is associated with'
- *               bookingId:
- *                 type: integer
- *                 description: 'The booking ID it is associated with'
- *               userId:
- *                 type: integer
- *                 description: 'The user it is associated with'
- *     tags:
- *      - destination-calendars
- *     responses:
- *       201:
- *         description: OK, destination calendar created
- *       400:
- *        description: Bad request. DestinationCalendar body is invalid.
- *       401:
- *        description: Authorization information is missing or invalid.
- */
-async function postHandler(req: NextApiRequest) {
-  const { userId, isAdmin, prisma, body } = req;
-  const parsedBody = schemaDestinationCalendarCreateBodyParams.parse(body);
-  await checkPermissions(req, userId);
-
-  const assignedUserId = isAdmin && parsedBody.userId ? parsedBody.userId : userId;
-
-  /* Check if credentialId data matches the ownership and integration passed in */
-  const userCredentials = await prisma.credential.findMany({
-    where: {
-      type: parsedBody.integration,
-      userId: assignedUserId,
-    },
-    select: credentialForCalendarServiceSelect,
-  });
-
-  if (userCredentials.length === 0)
-    throw new HttpError({
-      statusCode: 400,
-      message: "Bad request, credential id invalid",
-    });
-
-  const calendarCredentials = getCalendarCredentials(userCredentials);
-
-  const { connectedCalendars } = await getConnectedCalendars(calendarCredentials, [], parsedBody.externalId);
-
-  const eligibleCalendars = connectedCalendars[0]?.calendars?.filter((calendar) => !calendar.readOnly);
-  const calendar = eligibleCalendars?.find(
-    (c) => c.externalId === parsedBody.externalId && c.integration === parsedBody.integration
-  );
-  if (!calendar?.credentialId)
-    throw new HttpError({
-      statusCode: 400,
-      message: "Bad request, credential id invalid",
-    });
-  const credentialId = calendar.credentialId;
-
-  if (parsedBody.eventTypeId) {
-    const eventType = await prisma.eventType.findFirst({
-      where: { id: parsedBody.eventTypeId, userId: parsedBody.userId },
-    });
-    if (!eventType)
-      throw new HttpError({
-        statusCode: 400,
-        message: "Bad request, eventTypeId invalid",
-      });
-    parsedBody.userId = undefined;
-  }
-
-  const destination_calendar = await prisma.destinationCalendar.create({
-    data: { ...parsedBody, credentialId },
-  });
-
-  return {
-    destinationCalendar: schemaDestinationCalendarReadPublic.parse(destination_calendar),
-    message: "Destination calendar created successfully",
-  };
-}
-
-async function checkPermissions(req: NextApiRequest, userId: number) {
-  const { isAdmin } = req;
-  const body = schemaDestinationCalendarCreateBodyParams.parse(req.body);
-
-  /* Non-admin users can only create destination calendars for themselves */
-  if (!isAdmin && body.userId)
-    throw new HttpError({
-      statusCode: 401,
-      message: "ADMIN required for `userId`",
-    });
-  /* Admin users are required to pass in a userId */
-  if (isAdmin && !body.userId) throw new HttpError({ statusCode: 400, message: "`userId` required" });
-  /* User should only be able to create for their own destination calendars*/
-  if (!isAdmin && body.eventTypeId) {
-    const ownsEventType = await req.prisma.eventType.findFirst({ where: { id: body.eventTypeId, userId } });
-    if (!ownsEventType) throw new HttpError({ statusCode: 401, message: "Unauthorized" });
-  }
-  // TODO:: Add support for team event types with validation
-}
-
-export default defaultResponder(postHandler);

apps/api/pages/api/destination-calendars/index.ts

@@ -1,10 +1,114 @@
-import { defaultHandler } from "@calcom/lib/server";
+import type { NextApiRequest, NextApiResponse } from "next";
 
 import { withMiddleware } from "~/lib/helpers/withMiddleware";
+import type { DestinationCalendarResponse, DestinationCalendarsResponse } from "~/lib/types";
+import {
+  schemaDestinationCalendarCreateBodyParams,
+  schemaDestinationCalendarReadPublic,
+} from "~/lib/validations/destination-calendar";
 
-export default withMiddleware()(
-  defaultHandler({
-    GET: import("./_get"),
-    POST: import("./_post"),
-  })
-);
+async function createOrlistAllDestinationCalendars(
+  { method, body, userId, prisma }: NextApiRequest,
+  res: NextApiResponse<DestinationCalendarsResponse | DestinationCalendarResponse>
+) {
+  if (method === "GET") {
+    /**
+     * @swagger
+     * /destination-calendars:
+     *   get:
+     *     parameters:
+     *       - in: query
+     *         name: apiKey
+     *         required: true
+     *         schema:
+     *           type: string
+     *         description: Your API key
+     *     summary: Find all destination calendars
+     *     tags:
+     *      - destination-calendars
+     *     responses:
+     *       200:
+     *         description: OK
+     *       401:
+     *        description: Authorization information is missing or invalid.
+     *       404:
+     *         description: No destination calendars were found
+     */
+    const data = await prisma.destinationCalendar.findMany({ where: { userId } });
+    const destination_calendars = data.map((destinationCalendar) =>
+      schemaDestinationCalendarReadPublic.parse(destinationCalendar)
+    );
+    if (data) res.status(200).json({ destination_calendars });
+    else
+      (error: Error) =>
+        res.status(404).json({
+          message: "No DestinationCalendars were found",
+          error,
+        });
+  } else if (method === "POST") {
+    /**
+     * @swagger
+     * /destination-calendars:
+     *   post:
+     *     parameters:
+     *       - in: query
+     *         name: apiKey
+     *         required: true
+     *         schema:
+     *           type: string
+     *         description: Your API key
+     *     summary: Creates a new destination calendar
+     *     requestBody:
+     *       description: Create a new destination calendar for your events
+     *       required: true
+     *       content:
+     *         application/json:
+     *           schema:
+     *             type: object
+     *             required:
+     *               - integration
+     *               - externalId
+     *             properties:
+     *               integration:
+     *                 type: string
+     *                 description: 'The integration'
+     *               externalId:
+     *                 type: string
+     *                 description: 'The external ID of the integration'
+     *               eventTypeId:
+     *                 type: integer
+     *                 description: 'The ID of the eventType it is associated with'
+     *               bookingId:
+     *                 type: integer
+     *                 description: 'The booking ID it is associated with'
+     *     tags:
+     *      - destination-calendars
+     *     responses:
+     *       201:
+     *         description: OK, destination calendar created
+     *       400:
+     *        description: Bad request. DestinationCalendar body is invalid.
+     *       401:
+     *        description: Authorization information is missing or invalid.
+     */
+    const safe = schemaDestinationCalendarCreateBodyParams.safeParse(body);
+    if (!safe.success) {
+      res.status(400).json({ message: "Invalid request body" });
+      return;
+    }
+
+    const data = await prisma.destinationCalendar.create({ data: { ...safe.data, userId } });
+    const destination_calendar = schemaDestinationCalendarReadPublic.parse(data);
+
+    if (destination_calendar)
+      res.status(201).json({ destination_calendar, message: "DestinationCalendar created successfully" });
+    else
+      (error: Error) =>
+        res.status(400).json({
+          message: "Could not create new destinationCalendar",
+          error,
+        });
+  } else res.status(405).json({ message: `Method ${method} not allowed` });
+}
+
+export default withMiddleware("HTTP_GET_OR_POST")(createOrlistAllDestinationCalendars);

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

@@ -2,7 +2,6 @@ import type { NextApiRequest } from "next";
 
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
-import { MembershipRole } from "@calcom/prisma/enums";
 
 import { schemaEventTypeReadPublic } from "~/lib/validations/event-type";
 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
@@ -52,9 +51,7 @@ export async function getHandler(req: NextApiRequest) {
       customInputs: true,
       team: { select: { slug: true } },
       users: true,
-      hosts: { select: { userId: true, isFixed: true } },
       owner: { select: { username: true, id: true } },
-      children: { select: { id: true, userId: true } },
     },
   });
   await checkPermissions(req, eventType);
@@ -90,9 +87,7 @@ async function checkPermissions<T extends BaseEventTypeCheckPermissions>(
   if (req.isAdmin) return true;
   if (eventType?.teamId) {
     req.query.teamId = String(eventType.teamId);
-    await canAccessTeamEventOrThrow(req, {
-      in: [MembershipRole.OWNER, MembershipRole.ADMIN, MembershipRole.MEMBER],
-    });
+    await canAccessTeamEventOrThrow(req, "MEMBER");
   }
   if (eventType?.userId === req.userId) return true; // is owner.
   throw new HttpError({ statusCode: 403, message: "Forbidden" });

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

@@ -209,8 +209,6 @@ export async function patchHandler(req: NextApiRequest) {
     hosts = [],
     bookingLimits,
     durationLimits,
-    /** FIXME: Updating event-type children from API not supported for now  */
-    children: _,
     ...parsedBody
   } = schemaEventTypeEditBodyParams.parse(body);
 

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

@@ -45,9 +45,7 @@ async function getHandler(req: NextApiRequest) {
       customInputs: true,
       team: { select: { slug: true } },
       users: true,
-      hosts: { select: { userId: true, isFixed: true } },
       owner: { select: { username: true, id: true } },
-      children: { select: { id: true, userId: true } },
     },
   });
   // this really should return [], but backwards compatibility..

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

@@ -3,14 +3,10 @@ import type { NextApiRequest } from "next";
 
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
-import { MembershipRole } from "@calcom/prisma/client";
 
 import { schemaEventTypeCreateBodyParams, schemaEventTypeReadPublic } from "~/lib/validations/event-type";
-import { canUserAccessTeamWithRole } from "~/pages/api/teams/[teamId]/_auth-middleware";
 
-import checkParentEventOwnership from "./_utils/checkParentEventOwnership";
 import checkTeamEventEditPermission from "./_utils/checkTeamEventEditPermission";
-import checkUserMembership from "./_utils/checkUserMembership";
 import ensureOnlyMembersAsHosts from "./_utils/ensureOnlyMembersAsHosts";
 
 /**
@@ -122,13 +118,10 @@ import ensureOnlyMembersAsHosts from "./_utils/ensureOnlyMembersAsHosts";
  *               schedulingType:
  *                 type: string
  *                 description: The type of scheduling if a Team event. Required for team events only
- *                 enum: [ROUND_ROBIN, COLLECTIVE, MANAGED]
+ *                 enum: [ROUND_ROBIN, COLLECTIVE]
  *               price:
  *                 type: integer
  *                 description: Price of the event type booking
- *               parentId:
- *                 type: integer
- *                 description: EventTypeId of the parent managed event
  *               currency:
  *                 type: string
  *                 description: Currency acronym. Eg- usd, eur, gbp, etc.
@@ -270,8 +263,6 @@ async function postHandler(req: NextApiRequest) {
     hosts = [],
     bookingLimits,
     durationLimits,
-    /** FIXME: Adding event-type children from API not supported for now  */
-    children: _,
     ...parsedBody
   } = schemaEventTypeCreateBodyParams.parse(body || {});
 
@@ -285,11 +276,6 @@ async function postHandler(req: NextApiRequest) {
 
   await checkPermissions(req);
 
-  if (parsedBody.parentId) {
-    await checkParentEventOwnership(req);
-    await checkUserMembership(req);
-  }
-
   if (isAdmin && parsedBody.userId) {
     data = { ...parsedBody, users: { connect: { id: parsedBody.userId } } };
   }
@@ -301,7 +287,7 @@ async function postHandler(req: NextApiRequest) {
     data.hosts = { createMany: { data: hosts } };
   }
 
-  const eventType = await prisma.eventType.create({ data, include: { hosts: true } });
+  const eventType = await prisma.eventType.create({ data });
 
   return {
     event_type: schemaEventTypeReadPublic.parse(eventType),
@@ -318,20 +304,8 @@ async function checkPermissions(req: NextApiRequest) {
       statusCode: 401,
       message: "ADMIN required for `userId`",
     });
-  if (
-    body.teamId &&
-    !isAdmin &&
-    !(await canUserAccessTeamWithRole(req.prisma, req.userId, isAdmin, body.teamId, {
-      in: [MembershipRole.OWNER, MembershipRole.ADMIN],
-    }))
-  )
-    throw new HttpError({
-      statusCode: 401,
-      message: "ADMIN required for `teamId`",
-    });
-  /* Admin users are required to pass in a userId or teamId */
-  if (isAdmin && !body.userId && !body.teamId)
-    throw new HttpError({ statusCode: 400, message: "`userId` or `teamId` required" });
+  /* Admin users are required to pass in a userId */
+  if (isAdmin && !body.userId) throw new HttpError({ statusCode: 400, message: "`userId` required" });
 }
 
 export default defaultResponder(postHandler);

apps/api/pages/api/event-types/_utils/checkParentEventOwnership.ts

@@ -1,56 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { HttpError } from "@calcom/lib/http-error";
-
-/**
- * Checks if a user, identified by the provided userId, has ownership (or admin rights) over
- * the team associated with the event type identified by the parentId.
- *
- * @param req - The current request
- *
- * @throws {HttpError} If the parent event type is not found,
- *                     if the parent event type doesn't belong to any team,
- *                     or if the user doesn't have ownership or admin rights to the associated team.
- */
-export default async function checkParentEventOwnership(req: NextApiRequest) {
-  const { userId, prisma, body } = req;
-  /** These are already parsed upstream, we can assume they're good here. */
-  const parentId = Number(body.parentId);
-  const parentEventType = await prisma.eventType.findUnique({
-    where: {
-      id: parentId,
-    },
-    select: {
-      teamId: true,
-    },
-  });
-
-  if (!parentEventType) {
-    throw new HttpError({
-      statusCode: 404,
-      message: "Parent event type not found.",
-    });
-  }
-
-  if (!parentEventType.teamId) {
-    throw new HttpError({
-      statusCode: 400,
-      message: "This event type is not capable of having children",
-    });
-  }
-
-  const teamMember = await prisma.membership.findFirst({
-    where: {
-      teamId: parentEventType.teamId,
-      userId: userId,
-      OR: [{ role: "OWNER" }, { role: "ADMIN" }],
-    },
-  });
-
-  if (!teamMember) {
-    throw new HttpError({
-      statusCode: 403,
-      message: "User is not authorized to access the team to which the parent event type belongs.",
-    });
-  }
-}

apps/api/pages/api/event-types/_utils/checkUserMembership.ts

@@ -1,57 +0,0 @@
-import type { NextApiRequest } from "next";
-
-import { HttpError } from "@calcom/lib/http-error";
-
-/**
- * Checks if a user, identified by the provided userId, is a member of the team associated
- * with the event type identified by the parentId.
- *
- * @param req - The current request
- *
- * @throws {HttpError} If the event type is not found,
- *                     if the event type doesn't belong to any team,
- *                     or if the user isn't a member of the associated team.
- */
-export default async function checkUserMembership(req: NextApiRequest) {
-  const { prisma, body } = req;
-  /** These are already parsed upstream, we can assume they're good here. */
-  const parentId = Number(body.parentId);
-  const userId = Number(body.userId);
-  const parentEventType = await prisma.eventType.findUnique({
-    where: {
-      id: parentId,
-    },
-    select: {
-      teamId: true,
-    },
-  });
-
-  if (!parentEventType) {
-    throw new HttpError({
-      statusCode: 404,
-      message: "Event type not found.",
-    });
-  }
-
-  if (!parentEventType.teamId) {
-    throw new HttpError({
-      statusCode: 400,
-      message: "This event type is not capable of having children.",
-    });
-  }
-
-  const teamMember = await prisma.membership.findFirst({
-    where: {
-      teamId: parentEventType.teamId,
-      userId: userId,
-      accepted: true,
-    },
-  });
-
-  if (!teamMember) {
-    throw new HttpError({
-      statusCode: 400,
-      message: "User is not a team member.",
-    });
-  }
-}

apps/api/pages/api/index.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function CalcomApi(_: NextApiRequest, res: NextApiResponse) {
-  res.status(200).json({ message: "Welcome to Cal.com API - docs are at https://developer.cal.com/api" });
+  res.status(201).json({ message: "Welcome to Cal.com API - docs are at https://developer.cal.com/api" });
 }

apps/api/pages/api/slots/_get.ts

@@ -1,47 +1,20 @@
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import type { NextApiRequest, NextApiResponse } from "next";
 
-import dayjs from "@calcom/dayjs";
-import { isSupportedTimeZone } from "@calcom/lib/date-fns";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
 import { createContext } from "@calcom/trpc/server/createContext";
-import { getScheduleSchema } from "@calcom/trpc/server/routers/viewer/slots/types";
-import { getAvailableSlots } from "@calcom/trpc/server/routers/viewer/slots/util";
+import { viewerRouter } from "@calcom/trpc/server/routers/viewer/_router";
 
 import { TRPCError } from "@trpc/server";
 import { getHTTPStatusCodeFromError } from "@trpc/server/http";
 
-// Apply plugins
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
 async function handler(req: NextApiRequest, res: NextApiResponse) {
+  /** @see https://trpc.io/docs/server-side-calls */
+  const ctx = await createContext({ req, res });
+  const caller = viewerRouter.createCaller(ctx);
   try {
-    const { usernameList, ...rest } = req.query;
-    let slugs = usernameList;
-    if (!Array.isArray(usernameList)) {
-      slugs = usernameList ? [usernameList] : [];
-    }
-    const input = getScheduleSchema.parse({ usernameList: slugs, ...rest });
-    const timeZoneSupported = input.timeZone ? isSupportedTimeZone(input.timeZone) : false;
-    const availableSlots = await getAvailableSlots({ ctx: await createContext({ req, res }), input });
-    const slotsInProvidedTimeZone = timeZoneSupported
-      ? Object.keys(availableSlots.slots).reduce(
-          (acc: Record<string, { time: string; attendees?: number; bookingUid?: string }[]>, date) => {
-            acc[date] = availableSlots.slots[date].map((slot) => ({
-              ...slot,
-              time: dayjs(slot.time).tz(input.timeZone).format(),
-            }));
-            return acc;
-          },
-          {}
-        )
-      : availableSlots;
-
-    return slotsInProvidedTimeZone;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return await caller.slots.getSchedule(req.query as any /* Let tRPC handle this */);
   } catch (cause) {
     if (cause instanceof TRPCError) {
       const statusCode = getHTTPStatusCodeFromError(cause);

apps/api/pages/api/teams/[teamId]/_auth-middleware.ts

@@ -22,21 +22,7 @@ export async function checkPermissions(
   role: Prisma.MembershipWhereInput["role"] = MembershipRole.OWNER
 ) {
   const { userId, prisma, isAdmin } = req;
-  const { teamId } = schemaQueryTeamId.parse({
-    teamId: req.query.teamId,
-    version: req.query.version,
-    apiKey: req.query.apiKey,
-  });
-  return canUserAccessTeamWithRole(prisma, userId, isAdmin, teamId, role);
-}
-
-export async function canUserAccessTeamWithRole(
-  prisma: NextApiRequest["prisma"],
-  userId: number,
-  isAdmin: boolean,
-  teamId: number,
-  role: Prisma.MembershipWhereInput["role"] = MembershipRole.OWNER
-) {
+  const { teamId } = schemaQueryTeamId.parse(req.query);
   const args: Prisma.TeamFindFirstArgs = { where: { id: teamId } };
   /** If not ADMIN then we check if the actual user belongs to team and matches the required role */
   if (!isAdmin) args.where = { ...args.where, members: { some: { userId, role } } };

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

@@ -58,44 +58,12 @@ export async function patchHandler(req: NextApiRequest) {
   const { prisma, body, userId } = req;
   const data = schemaTeamUpdateBodyParams.parse(body);
   const { teamId } = schemaQueryTeamId.parse(req.query);
-
   /** Only OWNERS and ADMINS can edit teams */
   const _team = await prisma.team.findFirst({
     include: { members: true },
     where: { id: teamId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
   });
   if (!_team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
-
-  const slugAlreadyExists = await prisma.team.findFirst({
-    where: {
-      slug: {
-        mode: "insensitive",
-        equals: data.slug,
-      },
-    },
-  });
-
-  if (slugAlreadyExists && data.slug !== _team.slug)
-    throw new HttpError({ statusCode: 409, message: "Team slug already exists" });
-
-  // Check if parentId is related to this user
-  if (data.parentId && data.parentId === teamId) {
-    throw new HttpError({
-      statusCode: 400,
-      message: "Bad request: Parent id cannot be the same as the team id.",
-    });
-  }
-  if (data.parentId) {
-    const parentTeam = await prisma.team.findFirst({
-      where: { id: data.parentId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
-    });
-    if (!parentTeam)
-      throw new HttpError({
-        statusCode: 401,
-        message: "Unauthorized: Invalid parent id. You can only use parent id of your own teams.",
-      });
-  }
-
   let paymentUrl;
   if (_team.slug === null && data.slug) {
     data.metadata = {

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

@@ -56,14 +56,6 @@ async function getHandler(req: NextApiRequest) {
             members: { some: { userId } },
           },
     },
-    include: {
-      customInputs: true,
-      team: { select: { slug: true } },
-      users: true,
-      hosts: { select: { userId: true, isFixed: true } },
-      owner: { select: { username: true, id: true } },
-      children: { select: { id: true, userId: true } },
-    },
   };
 
   const data = await prisma.eventType.findMany(args);

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

@@ -68,18 +68,6 @@ async function postHandler(req: NextApiRequest) {
     }
   }
 
-  // Check if parentId is related to this user
-  if (data.parentId) {
-    const parentTeam = await prisma.team.findFirst({
-      where: { id: data.parentId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
-    });
-    if (!parentTeam)
-      throw new HttpError({
-        statusCode: 401,
-        message: "Unauthorized: Invalid parent id. You can only use parent id of your own teams.",
-      });
-  }
-
   // TODO: Perhaps there is a better fix for this?
   const cloneData: typeof data & {
     metadata: NonNullable<typeof data.metadata> | undefined;

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

@@ -1,6 +1,5 @@
 import type { NextApiRequest } from "next";
 
-import { deleteUser } from "@calcom/features/users/lib/userDeletionService";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
 
@@ -42,18 +41,10 @@ export async function deleteHandler(req: NextApiRequest) {
   // Here we only check for ownership of the user if the user is not admin, otherwise we let ADMIN's edit any user
   if (!isAdmin && query.userId !== req.userId) throw new HttpError({ statusCode: 403, message: "Forbidden" });
 
-  const user = await prisma.user.findUnique({
-    where: { id: query.userId },
-    select: {
-      id: true,
-      email: true,
-      metadata: true,
-    },
-  });
+  const user = await prisma.user.findUnique({ where: { id: query.userId } });
   if (!user) throw new HttpError({ statusCode: 404, message: "User not found" });
 
-  await deleteUser(user);
-
+  await prisma.user.delete({ where: { id: user.id } });
   return { message: `User with id: ${user.id} deleted successfully` };
 }
 

apps/api/pages/api/users/[userId]/_patch.ts

@@ -53,9 +53,6 @@ import { schemaUserEditBodyParams, schemaUserReadPublic } from "~/lib/validation
  *               timeZone:
  *                 description: The user's time zone
  *                 type: string
- *               hideBranding:
- *                 description: Remove branding from the user's calendar page
- *                 type: boolean
  *               theme:
  *                 description: Default theme for the user. Acceptable values are one of [DARK, LIGHT]
  *                 type: string
@@ -65,9 +62,6 @@ import { schemaUserEditBodyParams, schemaUserReadPublic } from "~/lib/validation
  *               locale:
  *                 description: The user's locale. Acceptable values are one of [EN, FR, IT, RU, ES, DE, PT, RO, NL, PT_BR, ES_419, KO, JA, PL, AR, IW, ZH_CH, ZH_TW, CS, SR, SV, VI]
  *                 type: string
- *               avatar:
- *                 description: The user's avatar, in base64 format
- *                 type: string
  *           examples:
  *              user:
  *                summary: An example of USER
@@ -85,7 +79,7 @@ import { schemaUserEditBodyParams, schemaUserReadPublic } from "~/lib/validation
  *       - users
  *     responses:
  *       200:
- *         description: OK, user edited successfully
+ *         description: OK, user edited successfuly
  *       400:
  *         description: Bad request. User body is invalid.
  *       401:
@@ -100,10 +94,9 @@ export async function patchHandler(req: NextApiRequest) {
   if (!isAdmin && query.userId !== req.userId) throw new HttpError({ statusCode: 403, message: "Forbidden" });
 
   const body = await schemaUserEditBodyParams.parseAsync(req.body);
-  // disable role or branding changes unless admin.
-  if (!isAdmin) {
-    if (body.role) body.role = undefined;
-    if (body.hideBranding) body.hideBranding = undefined;
+  // disable role changes unless admin.
+  if (!isAdmin && body.role) {
+    body.role = undefined;
   }
 
   const userSchedules = await prisma.schedule.findMany({

apps/api/pages/api/users/_post.ts

@@ -42,9 +42,6 @@ import { schemaUserCreateBodyParams } from "~/lib/validations/user";
  *               darkBrandColor:
  *                 description: The new user's brand color for dark mode
  *                 type: string
- *               hideBranding:
- *                 description: Remove branding from the user's calendar page
- *                 type: boolean
  *               weekStart:
  *                 description: Start of the week. Acceptable values are one of [SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY]
  *                 type: string
@@ -60,9 +57,6 @@ import { schemaUserCreateBodyParams } from "~/lib/validations/user";
  *               locale:
  *                 description: The new user's locale. Acceptable values are one of [EN, FR, IT, RU, ES, DE, PT, RO, NL, PT_BR, ES_419, KO, JA, PL, AR, IW, ZH_CH, ZH_TW, CS, SR, SV, VI]
  *                 type: string
- *               avatar:
- *                 description: The user's avatar, in base64 format
- *                 type: string
  *           examples:
  *              user:
  *                summary: An example of USER

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

@@ -51,9 +51,6 @@ import { schemaWebhookEditBodyParams, schemaWebhookReadPublic } from "~/lib/vali
  *               eventTypeId:
  *                 type: number
  *                 description: The event type ID if this webhook should be associated with only that event type
- *               secret:
- *                 type: string
- *                 description: The secret to verify the authenticity of the received payload
  *     tags:
  *     - webhooks
  *     externalDocs:
@@ -69,12 +66,7 @@ import { schemaWebhookEditBodyParams, schemaWebhookReadPublic } from "~/lib/vali
 export async function patchHandler(req: NextApiRequest) {
   const { prisma, query, userId, isAdmin } = req;
   const { id } = schemaQueryIdAsString.parse(query);
-  const {
-    eventTypeId,
-    userId: bodyUserId,
-    eventTriggers,
-    ...data
-  } = schemaWebhookEditBodyParams.parse(req.body);
+  const { eventTypeId, userId: bodyUserId, ...data } = schemaWebhookEditBodyParams.parse(req.body);
   const args: Prisma.WebhookUpdateArgs = { where: { id }, data };
 
   if (eventTypeId) {
@@ -92,11 +84,6 @@ export async function patchHandler(req: NextApiRequest) {
     args.data.userId = bodyUserId;
   }
 
-  if (args.data.eventTriggers) {
-    const eventTriggersSet = new Set(eventTriggers);
-    args.data.eventTriggers = Array.from(eventTriggersSet);
-  }
-
   const result = await prisma.webhook.update(args);
   return { webhook: schemaWebhookReadPublic.parse(result) };
 }

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

@@ -49,9 +49,6 @@ import { schemaWebhookCreateBodyParams, schemaWebhookReadPublic } from "~/lib/va
  *               eventTypeId:
  *                 type: number
  *                 description: The event type ID if this webhook should be associated with only that event type
- *               secret:
- *                 type: string
- *                 description: The secret to verify the authenticity of the received payload
  *     tags:
  *     - webhooks
  *     externalDocs:
@@ -66,12 +63,7 @@ import { schemaWebhookCreateBodyParams, schemaWebhookReadPublic } from "~/lib/va
  */
 async function postHandler(req: NextApiRequest) {
   const { userId, isAdmin, prisma } = req;
-  const {
-    eventTypeId,
-    userId: bodyUserId,
-    eventTriggers,
-    ...body
-  } = schemaWebhookCreateBodyParams.parse(req.body);
+  const { eventTypeId, userId: bodyUserId, ...body } = schemaWebhookCreateBodyParams.parse(req.body);
   const args: Prisma.WebhookCreateArgs = { data: { id: uuidv4(), ...body } };
 
   // If no event type, we assume is for the current user. If admin we run more checks below...
@@ -92,11 +84,6 @@ async function postHandler(req: NextApiRequest) {
     args.data.userId = bodyUserId;
   }
 
-  if (args.data.eventTriggers) {
-    const eventTriggersSet = new Set(eventTriggers);
-    args.data.eventTriggers = Array.from(eventTriggersSet);
-  }
-
   const data = await prisma.webhook.create(args);
 
   return {

apps/api/sentry.client.config.ts

@@ -1 +0,0 @@
-export {};

apps/api/sentry.edge.config.ts

@@ -1,5 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-
-Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-});

apps/api/sentry.server.config.ts

@@ -1,6 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-
-Sentry.init({
-  dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-  tracesSampleRate: 1.0,
-});

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

@@ -1,6 +1,3 @@
-// TODO: Fix tests (These test were never running due to the vitest workspace config)
-import prismaMock from "../../../../../tests/libs/__mocks__/prisma";
-
 import type { Request, Response } from "express";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
@@ -8,10 +5,10 @@ import { describe, expect, test, vi } from "vitest";
 
 import dayjs from "@calcom/dayjs";
 import sendPayload from "@calcom/features/webhooks/lib/sendPayload";
-import { ErrorCode } from "@calcom/lib/errorCodes";
 import { buildBooking, buildEventType, buildWebhook } from "@calcom/lib/test/builder";
 import prisma from "@calcom/prisma";
 
+import prismaMock from "../../../../../tests/libs/__mocks__/prisma";
 import handler from "../../../pages/api/bookings/_post";
 
 type CustomNextApiRequest = NextApiRequest & Request;
@@ -23,7 +20,7 @@ vi.mock("@calcom/lib/server/i18n", () => {
   };
 });
 
-describe.skipIf(true)("POST /api/bookings", () => {
+describe("POST /api/bookings", () => {
   describe("Errors", () => {
     test("Missing required data", async () => {
       const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
@@ -33,7 +30,7 @@ describe.skipIf(true)("POST /api/bookings", () => {
 
       await handler(req, res);
 
-      expect(res.statusCode).toBe(400);
+      expect(res._getStatusCode()).toBe(400);
       expect(JSON.parse(res._getData())).toEqual(
         expect.objectContaining({
           message:
@@ -149,7 +146,7 @@ describe.skipIf(true)("POST /api/bookings", () => {
       expect(res._getStatusCode()).toBe(500);
       expect(JSON.parse(res._getData())).toEqual(
         expect.objectContaining({
-          message: ErrorCode.NoAvailableUsersFound,
+          message: "No available users found.",
         })
       );
     });

apps/api/test/lib/middleware/addRequestId.test.ts

@@ -1,36 +0,0 @@
-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 { addRequestId } from "../../../lib/helpers/addRequestid";
-
-type CustomNextApiRequest = NextApiRequest & Request;
-type CustomNextApiResponse = NextApiResponse & Response;
-
-afterEach(() => {
-  vi.resetAllMocks();
-});
-
-describe("Adds a request ID", () => {
-  it("Should attach a request ID to the request", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {},
-    });
-
-    const middleware = {
-      fn: addRequestId,
-    };
-
-    const serverNext = vi.fn((next: void) => Promise.resolve(next));
-
-    const middlewareSpy = vi.spyOn(middleware, "fn");
-
-    await middleware.fn(req, res, serverNext);
-
-    expect(middlewareSpy).toBeCalled();
-    expect(res.statusCode).toBe(200);
-    expect(res.getHeader("Calcom-Response-ID")).toBeDefined();
-  });
-});

apps/api/test/lib/middleware/httpMethods.test.ts

@@ -1,53 +0,0 @@
-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 { httpMethod } from "../../../lib/helpers/httpMethods";
-
-type CustomNextApiRequest = NextApiRequest & Request;
-type CustomNextApiResponse = NextApiResponse & Response;
-
-afterEach(() => {
-  vi.resetAllMocks();
-});
-
-describe("HTTP Methods function only allows the correct HTTP Methods", () => {
-  it("Should allow the passed in Method", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {},
-    });
-
-    const middleware = {
-      fn: httpMethod("POST"),
-    };
-
-    const serverNext = vi.fn((next: void) => Promise.resolve(next));
-
-    const middlewareSpy = vi.spyOn(middleware, "fn");
-
-    await middleware.fn(req, res, serverNext);
-
-    expect(middlewareSpy).toBeCalled();
-    expect(res.statusCode).toBe(200);
-  });
-  it("Should allow the passed in Method", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {},
-    });
-
-    const middleware = {
-      fn: httpMethod("GET"),
-    };
-
-    const serverNext = vi.fn((next: void) => Promise.resolve(next));
-    const middlewareSpy = vi.spyOn(middleware, "fn");
-
-    await middleware.fn(req, res, serverNext);
-
-    expect(middlewareSpy).toBeCalled();
-    expect(res.statusCode).toBe(405);
-  });
-});

apps/api/test/lib/middleware/verifyApiKey.test.ts

@@ -1,76 +0,0 @@
-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 checkLicense from "@calcom/features/ee/common/server/checkLicense";
-
-import { isAdminGuard } from "~/lib/utils/isAdmin";
-
-import { verifyApiKey } from "../../../lib/helpers/verifyApiKey";
-
-type CustomNextApiRequest = NextApiRequest & Request;
-type CustomNextApiResponse = NextApiResponse & Response;
-
-afterEach(() => {
-  vi.resetAllMocks();
-});
-
-vi.mock("@calcom/features/ee/common/server/checkLicense", () => {
-  return {
-    default: vi.fn(),
-  };
-});
-
-vi.mock("~/lib/utils/isAdmin", () => {
-  return {
-    isAdminGuard: vi.fn(),
-  };
-});
-
-describe("Verify API key", () => {
-  it("It should throw an error if the api key is not valid", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {},
-    });
-
-    const middleware = {
-      fn: verifyApiKey,
-    };
-
-    vi.mocked(checkLicense).mockResolvedValue(false);
-    vi.mocked(isAdminGuard).mockResolvedValue(false);
-
-    const serverNext = vi.fn((next: void) => Promise.resolve(next));
-
-    const middlewareSpy = vi.spyOn(middleware, "fn");
-
-    await middleware.fn(req, res, serverNext);
-
-    expect(middlewareSpy).toBeCalled();
-    expect(res.statusCode).toBe(401);
-  });
-  it("It should thow an error if no api key is provided", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {},
-    });
-
-    const middleware = {
-      fn: verifyApiKey,
-    };
-
-    vi.mocked(checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue(false);
-
-    const serverNext = vi.fn((next: void) => Promise.resolve(next));
-
-    const middlewareSpy = vi.spyOn(middleware, "fn");
-
-    await middleware.fn(req, res, serverNext);
-
-    expect(middlewareSpy).toBeCalled();
-    expect(res.statusCode).toBe(401);
-  });
-});

apps/api/test/lib/middleware/withMiddleware.test.ts

@@ -1,17 +0,0 @@
-import { describe, vi, it, expect, afterEach } from "vitest";
-
-import { middlewareOrder } from "../../../lib/helpers/withMiddleware";
-
-afterEach(() => {
-  vi.resetAllMocks();
-});
-
-// Not sure if there is much point testing this order is actually applied via an integration test:
-// It is tested internally https://github.com/htunnicliff/next-api-middleware/blob/368b12aa30e79f4bd7cfe7aacc18da263cc3de2f/lib/label.spec.ts#L62
-describe("API - withMiddleware test", () => {
-  it("Custom prisma should be before verifyApiKey", async () => {
-    const customPrismaClientIndex = middlewareOrder.indexOf("customPrismaClient");
-    const verifyApiKeyIndex = middlewareOrder.indexOf("verifyApiKey");
-    expect(customPrismaClientIndex).toBeLessThan(verifyApiKeyIndex);
-  });
-});

apps/api/vercel.json

@@ -1,7 +0,0 @@
-{
-  "functions": {
-    "pages/api/slots/*.ts": {
-      "memory": 512
-    }
-  }
-}