format classnames

* remove unused JwtModule from the auth module

* feat: create abstracted jwt service

* refactor: tokens module and service use new jwt service

* refactor: oauth-client module and repository use new jwt service

* implement Morgans requests

.env.example

@@ -331,3 +331,6 @@ APP_ROUTER_TEAMS_ENABLED=0
 
 # disable setry server source maps
 SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
+
+# api v2
+NEXT_PUBLIC_API_V2_URL="http://localhost:5555/api/v2"

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,12 +19,12 @@ 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)
+- [ ] Tests (Unit/Integration/E2E or any other test)
+- [ ] This change requires a documentation update
 
 ## How should this be tested?
 

.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/labeler.yml

@@ -28,7 +28,7 @@ jobs:
         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"
+          ignore-labels: "app-store, ai, authentication, automated-testing, 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
 

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

@@ -2,7 +2,6 @@ name: "Next.js Bundle Analysis"
 
 on:
   workflow_call:
-  workflow_dispatch:
   push:
     branches:
       - main
@@ -35,7 +34,7 @@ jobs:
 
       - 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.yml

@@ -12,14 +12,6 @@ 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
@@ -64,41 +56,6 @@ jobs:
     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]
@@ -107,7 +64,7 @@ jobs:
     secrets: inherit
 
   required:
-    needs: [changes, lint, type-check, test, build, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    needs: [changes, lint, type-check, test, build]
     if: always()
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:

.github/workflows/pre-release.yml

@@ -2,6 +2,9 @@ name: Pre-release checks
 
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   changes:

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.

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

apps/api/index.js

@@ -0,0 +1,18 @@
+const http = require("http");
+const connect = require("connect");
+const { createProxyMiddleware } = require("http-proxy-middleware");
+
+const apiProxyV1 = createProxyMiddleware({
+  target: "http://localhost:3003",
+});
+
+const apiProxyV2 = createProxyMiddleware({
+  target: "http://localhost:3004",
+});
+
+const app = connect();
+app.use("/", apiProxyV1);
+
+app.use("/v2", apiProxyV2);
+
+http.createServer(app).listen(3002);

apps/api/package.json

@@ -1,46 +1,16 @@
 {
-  "name": "@calcom/api",
+  "name": "@calcom/api-proxy",
   "version": "1.0.0",
-  "description": "Public API for Cal.com",
-  "main": "index.ts",
-  "repository": "git@github.com:calcom/api.git",
-  "author": "Cal.com Inc.",
-  "private": true,
+  "description": "",
+  "main": "index.js",
   "scripts": {
-    "build": "next build",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
-    "dev": "PORT=3002 next dev",
-    "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": {
-    "@calcom/tsconfig": "*",
-    "@calcom/types": "*",
-    "node-mocks-http": "^1.11.0"
+    "dev": "node ./index.js"
   },
+  "author": "",
+  "license": "ISC",
   "dependencies": {
-    "@calcom/app-store": "*",
-    "@calcom/core": "*",
-    "@calcom/dayjs": "*",
-    "@calcom/emails": "*",
-    "@calcom/features": "*",
-    "@calcom/lib": "*",
-    "@calcom/prisma": "*",
-    "@calcom/trpc": "*",
-    "@sentry/nextjs": "^7.73.0",
-    "bcryptjs": "^2.4.3",
-    "memory-cache": "^0.2.0",
-    "next": "^13.4.6",
-    "next-api-middleware": "^1.0.1",
-    "next-axiom": "^0.17.0",
-    "next-swagger-doc": "^0.3.6",
-    "next-validations": "^0.2.0",
-    "typescript": "^4.9.4",
-    "tzdata": "^1.0.30",
-    "uuid": "^8.3.2",
-    "zod": "^3.22.2"
+    "connect": "^3.7.0",
+    "http": "^0.0.1-security",
+    "http-proxy-middleware": "^2.0.6"
   }
 }

apps/api/v1/next-i18next.config.js

@@ -4,7 +4,7 @@ const i18nConfig = require("@calcom/config/next-i18next.config");
 /** @type {import("next-i18next").UserConfig} */
 const config = {
   ...i18nConfig,
-  localePath: path.resolve("../web/public/static/locales"),
+  localePath: path.resolve("../../web/public/static/locales"),
 };
 
 module.exports = config;

apps/api/v1/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@calcom/api",
+  "version": "1.0.0",
+  "description": "Public API for Cal.com",
+  "main": "index.ts",
+  "repository": "git@github.com:calcom/api.git",
+  "author": "Cal.com Inc.",
+  "private": true,
+  "scripts": {
+    "build": "next build",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
+    "dev": "PORT=3003 next dev",
+    "lint": "eslint . --ignore-path .gitignore",
+    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
+    "start": "PORT=3003 next start",
+    "docker-start-api": "PORT=80 next start",
+    "type-check": "tsc --pretty --noEmit"
+  },
+  "devDependencies": {
+    "@calcom/tsconfig": "*",
+    "@calcom/types": "*",
+    "node-mocks-http": "^1.11.0"
+  },
+  "dependencies": {
+    "@calcom/app-store": "*",
+    "@calcom/core": "*",
+    "@calcom/dayjs": "*",
+    "@calcom/emails": "*",
+    "@calcom/features": "*",
+    "@calcom/lib": "*",
+    "@calcom/prisma": "*",
+    "@calcom/trpc": "*",
+    "@sentry/nextjs": "^7.73.0",
+    "bcryptjs": "^2.4.3",
+    "memory-cache": "^0.2.0",
+    "next": "^13.4.6",
+    "next-api-middleware": "^1.0.1",
+    "next-axiom": "^0.17.0",
+    "next-swagger-doc": "^0.3.6",
+    "next-validations": "^0.2.0",
+    "typescript": "^4.9.4",
+    "tzdata": "^1.0.30",
+    "uuid": "^8.3.2",
+    "zod": "^3.22.2"
+  }
+}

apps/api/v1/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