refactor: atoms e2e setup

.github/workflows/e2e-atoms.yml

@@ -1,28 +1,93 @@
 name: E2E Atoms
 
 on:
-  workflow_call:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'packages/platform/atoms/**'
+      - 'packages/platform/examples/base/**'
+      - 'apps/api/v2/**'
+      - '.github/workflows/e2e-atoms.yml'
+
 permissions:
   actions: write
   contents: read
 
 env:
-  NODE_OPTIONS: --max-old-space-size=8096
+  ## api v2 env
+  ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
+  API_KEY_PREFIX: ${{ secrets.CI_API_KEY_PREFIX }}
+  API_PORT: ${{ vars.CI_API_V2_PORT }}
+  CALCOM_LICENSE_KEY: ${{ secrets.CI_CALCOM_LICENSE_KEY }}
+  DAILY_API_KEY: ${{ secrets.CI_DAILY_API_KEY }}
+  DATABASE_READ_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_WRITE_URL: ${{ secrets.CI_DATABASE_URL }}
+  GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
+  IS_E2E: true
+  NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}
+  NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
+  REDIS_URL: "redis://localhost:6379"
+  LINGO_DOT_DEV_API_KEY: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY }}
+  STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
+  STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
+  SLOTS_CACHE_TTL: ${{ secrets.CI_SLOTS_CACHE_TTL }}
+  NEXT_PUBLIC_VAPID_PUBLIC_KEY: ${{ secrets.NEXT_PUBLIC_VAPID_PUBLIC_KEY }}
+  VAPID_PRIVATE_KEY: ${{ secrets.VAPID_PRIVATE_KEY }}
+  JWT_SECRET: ${{ secrets.CI_JWT_SECRET }}
+  NODE_ENV: ${{ vars.CI_NODE_ENV }}
+
+  ## atoms e2e examples app env
   ATOMS_E2E_OAUTH_CLIENT_ID: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_ID }}
   ATOMS_E2E_OAUTH_CLIENT_SECRET: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_SECRET }}
   ATOMS_E2E_API_URL: ${{ secrets.ATOMS_E2E_API_URL }}
   ATOMS_E2E_ORG_ID: ${{ secrets.ATOMS_E2E_ORG_ID }}
   ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED }}
   ATOMS_E2E_APPLE_ID: ${{ secrets.ATOMS_E2E_APPLE_ID }}
   ATOMS_E2E_APPLE_CONNECT_APP_SPECIFIC_PASSCODE: ${{ secrets.ATOMS_E2E_APPLE_CONNECT_APP_SPECIFIC_PASSCODE }}
+
+  ## env variables needed for both api v2 and examples app
   DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
   DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
+  NODE_OPTIONS: --max-old-space-size=29000
 
 jobs:
   e2e-atoms:
+    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
     timeout-minutes: 15
     name: E2E Atoms
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: buildjet-16vcpu-ubuntu-2204
+    services:
+      postgres:
+        image: postgres:13
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: calendso
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:latest
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - uses: docker/login-action@v3
         with:
@@ -31,10 +96,37 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/cache-db
       - uses: ./.github/actions/yarn-playwright-install
+      - name: Start API v2
+        working-directory: apps/api/v2
+        run: |
+          yarn dev:no-docker &
+          API_PID=$!
+          echo "API_PID=$API_PID" >> $GITHUB_ENV
+
+          # Wait for API to be ready
+          echo "Waiting for API v2 to be ready on port ${{ vars.CI_API_V2_PORT }}..."
+          timeout 300 bash -c 'until curl -f http://localhost:${{ vars.CI_API_V2_PORT }}/health > /dev/null 2>&1; do sleep 2; done'
+          echo "API v2 is ready!"
       - name: Run E2E Atoms Tests
         working-directory: packages/platform/examples/base
         run: yarn test:e2e
+      - name: Upload Atoms dist (entire folder)
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: atoms-dist-${{ github.sha }}
+          path: packages/platform/atoms/dist
+          retention-days: 7
+          if-no-files-found: warn
+
+      - name: Stop API v2
+        if: always()
+        run: |
+          if [ ! -z "$API_PID" ]; then
+            kill $API_PID || true
+          fi
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
         if: always()

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts

@@ -719,6 +719,11 @@ describe("OAuth Client Users Endpoints", () => {
       } catch (e) {
         // User might have been deleted by the test
       }
+      try {
+        await userRepositoryFixture.delete(postResponseDataTwo.user.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
       try {
         await userRepositoryFixture.delete(platformAdmin.id);
       } catch (e) {

packages/features/shell/useBottomNavItems.ts

@@ -38,7 +38,7 @@ export function useBottomNavItems({
     isTrial
       ? {
           name: "skip_trial",
-          href: "",
+          href: publicPageUrl,
           isLoading: skipTeamTrialsMutation.isPending,
           icon: "clock",
           onClick: (e: { preventDefault: () => void }) => {
@@ -55,7 +55,7 @@ export function useBottomNavItems({
     },
     {
       name: "copy_public_page_link",
-      href: "",
+      href: publicPageUrl,
       onClick: (e: { preventDefault: () => void }) => {
         e.preventDefault();
         navigator.clipboard.writeText(publicPageUrl);

packages/platform/examples/base/.env.e2e.example

@@ -0,0 +1,9 @@
+NEXT_PUBLIC_X_CAL_ID=
+X_CAL_SECRET_KEY=
+NEXT_PUBLIC_CALCOM_API_URL=
+VITE_BOOKER_EMBED_OAUTH_CLIENT_ID=
+VITE_BOOKER_EMBED_API_URL=
+ORGANIZATION_ID=
+ATOMS_E2E_APPLE_ID=
+ATOMS_E2E_APPLE_CONNECT_APP_SPECIFIC_PASSCODE=
+NEXT_PUBLIC_IS_E2E="1"

packages/platform/examples/base/.gitignore

@@ -27,6 +27,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+!.env.e2e.example
 
 # vercel
 .vercel
@@ -36,6 +37,7 @@ yarn-error.log*
 next-env.d.ts
 .yarn
 dev.db
+test.db
 
 # playwright
 test-results

packages/platform/examples/base/global-teardown.ts

@@ -0,0 +1,113 @@
+import dotenv from "dotenv";
+import fs from "fs";
+import path from "path";
+
+dotenv.config({ path: path.resolve(__dirname, ".env.e2e") });
+async function globalTeardown() {
+  console.log("Cleaning up managed users...");
+  try {
+    const oauthClientId = process.env.NEXT_PUBLIC_X_CAL_ID;
+    const secretKey = process.env.X_CAL_SECRET_KEY;
+    const apiUrl = process.env.NEXT_PUBLIC_CALCOM_API_URL;
+    if (!oauthClientId || !secretKey || !apiUrl) {
+      console.log("Missing environment variables, skipping managed user cleanup");
+      return;
+    }
+    const getManagedUsersResponse = await fetch(`${apiUrl}/oauth-clients/${oauthClientId}/users`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        "x-cal-secret-key": secretKey,
+        "x-cal-client-id": oauthClientId,
+      },
+    });
+    if (getManagedUsersResponse.ok) {
+      const managedUsersData = await getManagedUsersResponse.json();
+      const users = managedUsersData.data || [];
+      for (const user of users) {
+        try {
+          const deleteResponse = await fetch(`${apiUrl}/oauth-clients/${oauthClientId}/users/${user.id}`, {
+            method: "DELETE",
+            headers: {
+              "Content-Type": "application/json",
+              "x-cal-secret-key": secretKey,
+              "x-cal-client-id": oauthClientId,
+            },
+          });
+          if (deleteResponse.ok) {
+            console.log(`Deleted managed user: ${user.email}`);
+          } else {
+            console.error(`Failed to delete user ${user.email}:`, await deleteResponse.text());
+          }
+        } catch (error) {
+          console.error(`Error deleting user ${user.email}:`, error);
+        }
+      }
+    } else {
+      console.error("Failed to fetch managed users:", await getManagedUsersResponse.text());
+    }
+    const getOAuthClientResponse = await fetch(`${apiUrl}/oauth-clients/${oauthClientId}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        "x-cal-secret-key": secretKey,
+        "x-cal-client-id": oauthClientId,
+      },
+    });
+    if (getOAuthClientResponse.ok) {
+      const oauthClientData = await getOAuthClientResponse.json();
+      const organizationId = oauthClientData.data?.organizationId;
+      if (organizationId) {
+        console.log(`Found organizationId: ${organizationId}`);
+        const getTeamsResponse = await fetch(`${apiUrl}/organizations/${organizationId}/teams`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            "x-cal-secret-key": secretKey,
+            "x-cal-client-id": oauthClientId,
+          },
+        });
+        if (getTeamsResponse.ok) {
+          const teamsData = await getTeamsResponse.json();
+          const teams = teamsData.data || [];
+          for (const team of teams) {
+            try {
+              const deleteTeamResponse = await fetch(
+                `${apiUrl}/organizations/${organizationId}/teams/${team.id}`,
+                {
+                  method: "DELETE",
+                  headers: {
+                    "Content-Type": "application/json",
+                    "x-cal-secret-key": secretKey,
+                    "x-cal-client-id": oauthClientId,
+                  },
+                }
+              );
+              if (deleteTeamResponse.ok) {
+                console.log(`Deleted team: ${team.name}`);
+              } else {
+                console.error(`Failed to delete team ${team.name}:`, await deleteTeamResponse.text());
+              }
+            } catch (error) {
+              console.error(`Error deleting team ${team.name}:`, error);
+            }
+          }
+        } else {
+          console.error("Failed to fetch teams:", await getTeamsResponse.text());
+        }
+      } else {
+        console.log("No organizationId found in OAuth client");
+      }
+    } else {
+      console.error("Failed to fetch OAuth client:", await getOAuthClientResponse.text());
+    }
+  } catch (error) {
+    console.error("Failed to clean up:", error);
+  } finally {
+    console.log("Cleaning up test database...");
+    const testDbPath = path.resolve(__dirname, "prisma", "test.db");
+    fs.rmSync(testDbPath, { force: true });
+    console.log("Test database cleaned up successfully");
+  }
+}
+export default globalTeardown;

packages/platform/examples/base/package.json

@@ -9,7 +9,10 @@
     "start": "next start",
     "lint": "eslint .",
     "test:e2e": "playwright test",
-    "test:e2e:ui": "playwright test --ui"
+    "test:e2e:ui": "playwright test --ui",
+    "db:push:test": "prisma db push --schema=prisma/schema.test.prisma",
+    "db:generate:test": "prisma generate --schema=prisma/schema.test.prisma",
+    "db:reset:test": "rm -f prisma/test.db && yarn db:push:test"
   },
   "dependencies": {
     "@calcom/atoms": "workspace:*",

packages/platform/examples/base/playwright.config.ts

@@ -2,9 +2,9 @@ import { defineConfig, devices } from "@playwright/test";
 import dotenv from "dotenv";
 import path from "path";
 
-const envPath = process.env.CI ? path.resolve(__dirname, ".env") : path.resolve(__dirname, ".env.local");
-
-dotenv.config({ path: envPath });
+if (!process.env.CI) {
+  dotenv.config({ path: path.resolve(__dirname, ".env.e2e") });
+}
 
 const DEFAULT_EXPECT_TIMEOUT = process.env.CI ? 30000 : 120000;
 const DEFAULT_TEST_TIMEOUT = process.env.CI ? 60000 : 240000;
@@ -17,6 +17,7 @@ export default defineConfig({
   workers: process.env.CI ? 1 : undefined,
   timeout: DEFAULT_TEST_TIMEOUT,
   fullyParallel: false,
+  globalTeardown: require.resolve("./global-teardown"),
   reporter: [
     ["list"],
     ["html", { outputFolder: "./test-results/reports/playwright-html-report", open: "never" }],
@@ -44,10 +45,24 @@ export default defineConfig({
   ],
   webServer: {
     command: process.env.CI
-      ? `yarn workspace @calcom/atoms dev-on && yarn workspace @calcom/atoms build && rm -f prisma/dev.db && yarn prisma db push && NEXT_PUBLIC_IS_E2E=1 NODE_ENV=test NEXT_PUBLIC_X_CAL_ID="${process.env.ATOMS_E2E_OAUTH_CLIENT_ID}" X_CAL_SECRET_KEY="${process.env.ATOMS_E2E_OAUTH_CLIENT_SECRET}" NEXT_PUBLIC_CALCOM_API_URL="${process.env.ATOMS_E2E_API_URL}" VITE_BOOKER_EMBED_OAUTH_CLIENT_ID="${process.env.ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED}" VITE_BOOKER_EMBED_API_URL="${process.env.ATOMS_E2E_API_URL}" ORGANIZATION_ID=${process.env.ATOMS_E2E_ORG_ID} yarn dev:e2e`
-      : `rm -f prisma/dev.db && yarn prisma db push && yarn dev:e2e`,
+      ? `yarn workspace @calcom/atoms dev-on && yarn workspace @calcom/atoms build && yarn db:generate:test && yarn db:reset:test && yarn dev:e2e`
+      : `yarn db:generate:test && yarn db:reset:test && yarn dev:e2e`,
     url: "http://localhost:4322",
     timeout: 600_000,
     reuseExistingServer: !process.env.CI,
+    ...(process.env.CI
+      ? {
+          env: {
+            NEXT_PUBLIC_IS_E2E: "1",
+            NODE_ENV: "test",
+            NEXT_PUBLIC_X_CAL_ID: process.env.ATOMS_E2E_OAUTH_CLIENT_ID ?? "",
+            X_CAL_SECRET_KEY: process.env.ATOMS_E2E_OAUTH_CLIENT_SECRET ?? "",
+            NEXT_PUBLIC_CALCOM_API_URL: process.env.ATOMS_E2E_API_URL ?? "",
+            VITE_BOOKER_EMBED_OAUTH_CLIENT_ID: process.env.ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED ?? "",
+            VITE_BOOKER_EMBED_API_URL: process.env.ATOMS_E2E_API_URL ?? "",
+            ORGANIZATION_ID: String(process.env.ATOMS_E2E_ORG_ID ?? ""),
+          },
+        }
+      : {}),
   },
 });

packages/platform/examples/base/prisma/schema.test.prisma

@@ -0,0 +1,19 @@
+generator testClient {
+  provider = "prisma-client-js"
+  output   = "../node_modules/.prisma/test-client"
+}
+datasource testDb {
+  provider = "sqlite"
+  url      = "file:./test.db"
+}
+model User {
+  id    Int     @id @default(autoincrement())
+  email String  @unique(map: "TestUser_email_key")
+  name  String?
+  calcomUserId Int? @unique(map: "TestUser_calcomUserId_key")
+  calcomUsername String? @unique(map: "TestUser_calcomUsername_key")
+  refreshToken String? @unique(map: "TestUser_refreshToken_key")
+  accessToken String? @unique(map: "TestUser_accessToken_key")
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now())
+}

packages/platform/examples/base/src/lib/prismaClient.ts

@@ -1,7 +1,8 @@
-// prisma client of example app
-//  using local prisma db, not related to the cal.com monorepo prisma client
-// eslint-disable-next-line
-import { PrismaClient } from "@prisma/client";
+const isE2E = process.env.NEXT_PUBLIC_IS_E2E === "1";
+
+const { PrismaClient } = isE2E
+  ? require("../../node_modules/.prisma/test-client")
+  : require("@prisma/client");
 
 const prismaClientSingleton = () => {
   return new PrismaClient();