added cache no-store when formbricksDebug is enabled

.env.example

@@ -117,7 +117,7 @@ IMPRINT_URL=
 IMPRINT_ADDRESS=
 
 # Configure Turnstile in signup flow
-# TURNSTILE_SITE_KEY=
+# NEXT_PUBLIC_TURNSTILE_SITE_KEY=
 # TURNSTILE_SECRET_KEY=
 
 # Configure Github Login
@@ -155,8 +155,9 @@ STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
 
 # Configure Formbricks usage within Formbricks
-FORMBRICKS_API_HOST=
-FORMBRICKS_ENVIRONMENT_ID=
+NEXT_PUBLIC_FORMBRICKS_API_HOST=
+NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=
+NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID=
 
 # Oauth credentials for Google sheet integration
 GOOGLE_SHEETS_CLIENT_ID=

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

@@ -8,14 +8,6 @@ on:
         required: false
         default: "0"
 
-inputs:
-  turbo_token:
-    description: "Turborepo token"
-    required: false
-  turbo_team:
-    description: "Turborepo team"
-    required: false
-
 runs:
   using: "composite"
   steps:
@@ -70,8 +62,6 @@ runs:
 
     - run: |
         pnpm build --filter=@formbricks/web...
+
       if: steps.cache-build.outputs.cache-hit != 'true'
       shell: bash
-      env:
-        TURBO_TOKEN: ${{ inputs.turbo_token }}
-        TURBO_TEAM: ${{ inputs.turbo_team }}

.github/workflows/build-web.yml

@@ -4,7 +4,7 @@ on:
 
 permissions:
   contents: read
-
+  
 jobs:
   build:
     name: Build Formbricks-web
@@ -25,5 +25,3 @@ jobs:
         id: cache-build-web
         with:
           e2e_testing_mode: "0"
-          turbo_token: ${{ secrets.TURBO_TOKEN }}
-          turbo_team: ${{ vars.TURBO_TEAM }}

.github/workflows/docker-build-validation.yml

@@ -1,167 +0,0 @@
-name: Docker Build Validation
-
-on:
-  pull_request:
-    branches:
-      - main
-  merge_group:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
-
-jobs:
-  validate-docker-build:
-    name: Validate Docker Build
-    runs-on: ubuntu-latest
-
-    # Add PostgreSQL service container
-    services:
-      postgres:
-        image: pgvector/pgvector:pg17
-        env:
-          POSTGRES_USER: test
-          POSTGRES_PASSWORD: test
-          POSTGRES_DB: formbricks
-        ports:
-          - 5432:5432
-        # Health check to ensure PostgreSQL is ready before using it
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build Docker Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./apps/web/Dockerfile
-          push: false
-          load: true
-          tags: formbricks-test:${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          secrets: |
-            database_url=${{ secrets.DUMMY_DATABASE_URL }}
-            encryption_key=${{ secrets.DUMMY_ENCRYPTION_KEY }}
-
-      - name: Verify PostgreSQL Connection
-        run: |
-          echo "Verifying PostgreSQL connection..."
-          # Install PostgreSQL client to test connection
-          sudo apt-get update && sudo apt-get install -y postgresql-client
-
-          # Test connection using psql
-          PGPASSWORD=test psql -h localhost -U test -d formbricks -c "\dt" || echo "Failed to connect to PostgreSQL"
-
-          # Show network configuration
-          echo "Network configuration:"
-          ip addr show
-          netstat -tulpn | grep 5432 || echo "No process listening on port 5432"
-
-      - name: Test Docker Image with Health Check
-        shell: bash
-        run: |
-          echo "🧪 Testing if the Docker image starts correctly..."
-
-          # Add extra docker run args to support host.docker.internal on Linux
-          DOCKER_RUN_ARGS="--add-host=host.docker.internal:host-gateway"
-
-          # Start the container with host.docker.internal pointing to the host
-          docker run --name formbricks-test \
-            $DOCKER_RUN_ARGS \
-            -p 3000:3000 \
-            -e DATABASE_URL="postgresql://test:test@host.docker.internal:5432/formbricks" \
-            -e ENCRYPTION_KEY="${{ secrets.DUMMY_ENCRYPTION_KEY }}" \
-            -d formbricks-test:${{ github.sha }}
-
-          # Give it more time to start up
-          echo "Waiting 45 seconds for application to start..."
-          sleep 45
-
-          # Check if the container is running
-          if [ "$(docker inspect -f '{{.State.Running}}' formbricks-test)" != "true" ]; then
-            echo "❌ Container failed to start properly!"
-            docker logs formbricks-test
-            exit 1
-          else
-            echo "✅ Container started successfully!"
-          fi
-
-          # Try connecting to PostgreSQL from inside the container
-          echo "Testing PostgreSQL connection from inside container..."
-          docker exec formbricks-test sh -c 'apt-get update && apt-get install -y postgresql-client && PGPASSWORD=test psql -h host.docker.internal -U test -d formbricks -c "\dt" || echo "Failed to connect to PostgreSQL from container"'
-
-          # Try to access the health endpoint
-          echo "🏥 Testing /health endpoint..."
-          MAX_RETRIES=10
-          RETRY_COUNT=0
-          HEALTH_CHECK_SUCCESS=false
-
-          set +e  # Disable exit on error to allow for retries
-
-          while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
-            RETRY_COUNT=$((RETRY_COUNT + 1))
-            echo "Attempt $RETRY_COUNT of $MAX_RETRIES..."
-            
-            # Show container logs before each attempt to help debugging
-            if [ $RETRY_COUNT -gt 1 ]; then
-              echo "📋 Current container logs:"
-              docker logs --tail 20 formbricks-test
-            fi
-            
-            # Get detailed curl output for debugging
-            HTTP_OUTPUT=$(curl -v -s -m 30 http://localhost:3000/health 2>&1)
-            CURL_EXIT_CODE=$?
-            
-            echo "Curl exit code: $CURL_EXIT_CODE"
-            echo "Curl output: $HTTP_OUTPUT"
-            
-            if [ $CURL_EXIT_CODE -eq 0 ]; then
-              STATUS_CODE=$(echo "$HTTP_OUTPUT" | grep -oP "HTTP/\d(\.\d)? \K\d+")
-              echo "Status code detected: $STATUS_CODE"
-              
-              if [ "$STATUS_CODE" = "200" ]; then
-                echo "✅ Health check successful!"
-                HEALTH_CHECK_SUCCESS=true
-                break
-              else
-                echo "❌ Health check returned non-200 status code: $STATUS_CODE"
-              fi
-            else
-              echo "❌ Curl command failed with exit code: $CURL_EXIT_CODE"
-            fi
-            
-            echo "Waiting 15 seconds before next attempt..."
-            sleep 15
-          done
-
-          # Show full container logs for debugging
-          echo "📋 Full container logs:"
-          docker logs formbricks-test
-
-          # Clean up the container
-          echo "🧹 Cleaning up..."
-          docker rm -f formbricks-test
-
-          # Exit with failure if health check did not succeed
-          if [ "$HEALTH_CHECK_SUCCESS" != "true" ]; then
-            echo "❌ Health check failed after $MAX_RETRIES attempts"
-            exit 1
-          fi
-
-          echo "✨ Docker validation complete - all checks passed!"

.github/workflows/e2e.yml

@@ -16,8 +16,6 @@ on:
 
 env:
   TELEMETRY_DISABLED: 1
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
 
 permissions:
   id-token: write

.github/workflows/sonarqube.yml

@@ -23,10 +23,10 @@ jobs:
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Setup Node.js 22.x
+      - name: Setup Node.js 20.x
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
         with:
-          node-version: 22.x
+          node-version: 20.x
 
       - name: Install pnpm
         uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
@@ -48,7 +48,7 @@ jobs:
         run: |
           pnpm test:coverage
       - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97
+        uses: SonarSource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.vscode/settings.json

@@ -1,8 +1,4 @@
 {
-  "sonarlint.connectedMode.project": {
-    "connectionId": "formbricks",
-    "projectKey": "formbricks_formbricks"
-  },
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.tsdk": "node_modules/typescript/lib"
 }

apps/demo/components/sidebar.tsx

@@ -27,7 +27,7 @@ const secondaryNavigation = [
 
 export function Sidebar(): React.JSX.Element {
   return (
-    <div className="flex grow flex-col overflow-y-auto bg-cyan-700 pb-4 pt-5">
+    <div className="flex flex-grow flex-col overflow-y-auto bg-cyan-700 pb-4 pt-5">
       <nav
         className="mt-5 flex flex-1 flex-col divide-y divide-cyan-800 overflow-y-auto"
         aria-label="Sidebar">
@@ -41,7 +41,7 @@ export function Sidebar(): React.JSX.Element {
                 "group flex items-center rounded-md px-2 py-2 text-sm font-medium leading-6"
               )}
               aria-current={item.current ? "page" : undefined}>
-              <item.icon className="mr-4 h-6 w-6 shrink-0 text-cyan-200" aria-hidden="true" />
+              <item.icon className="mr-4 h-6 w-6 flex-shrink-0 text-cyan-200" aria-hidden="true" />
               {item.name}
             </a>
           ))}

apps/demo/globals.css

@@ -1,23 +1,3 @@
-@import 'tailwindcss';
-
-@plugin '@tailwindcss/forms';
-
-@custom-variant dark (&:is(.dark *));
-
-/*
-  The default border color has changed to `currentcolor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentcolor);
-  }
-}
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

apps/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formbricks/demo",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "clean": "rimraf .turbo node_modules .next",
@@ -12,14 +12,10 @@
   },
   "dependencies": {
     "@formbricks/js": "workspace:*",
-    "@tailwindcss/forms": "0.5.9",
-    "@tailwindcss/postcss": "4.1.3",
-    "lucide-react": "0.486.0",
-    "next": "15.2.4",
-    "postcss": "8.5.3",
+    "lucide-react": "0.468.0",
+    "next": "15.2.3",
     "react": "19.0.0",
-    "react-dom": "19.0.0",
-    "tailwindcss": "4.1.3"
+    "react-dom": "19.0.0"
   },
   "devDependencies": {
     "@formbricks/config-typescript": "workspace:*",

apps/demo/pages/index.tsx

@@ -96,7 +96,7 @@ export default function AppPage(): React.JSX.Element {
             <p className="text-slate-700 dark:text-slate-300">
               Copy the environment ID of your Formbricks app to the env variable in /apps/demo/.env
             </p>
-            <Image src={fbsetup} alt="fb setup" className="rounded-xs mt-4" priority />
+            <Image src={fbsetup} alt="fb setup" className="mt-4 rounded" priority />
 
             <div className="mt-4 flex-col items-start text-sm text-slate-700 sm:flex sm:items-center sm:text-base dark:text-slate-300">
               <p className="mb-1 sm:mb-0 sm:mr-2">You&apos;re connected with env:</p>

apps/demo/postcss.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   plugins: {
-    "@tailwindcss/postcss": {},
+    tailwindcss: {},
+    autoprefixer: {},
   },
 };

apps/demo/tailwind.config.js

@@ -0,0 +1,13 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [
+    "./app/**/*.{js,ts,jsx,tsx}",
+    "./pages/**/*.{js,ts,jsx,tsx}",
+    "./components/**/*.{js,ts,jsx,tsx}",
+  ],
+  darkMode: "class",
+  theme: {
+    extend: {},
+  },
+  plugins: [require("@tailwindcss/forms")],
+};

apps/storybook/package.json

@@ -11,30 +11,30 @@
     "clean": "rimraf .turbo node_modules dist storybook-static"
   },
   "dependencies": {
-    "eslint-plugin-react-refresh": "0.4.19",
-    "react": "19.1.0",
-    "react-dom": "19.1.0"
+    "eslint-plugin-react-refresh": "0.4.16",
+    "react": "19.0.0",
+    "react-dom": "19.0.0"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "3.2.6",
+    "@chromatic-com/storybook": "3.2.2",
     "@formbricks/config-typescript": "workspace:*",
-    "@storybook/addon-a11y": "8.6.12",
-    "@storybook/addon-essentials": "8.6.12",
-    "@storybook/addon-interactions": "8.6.12",
-    "@storybook/addon-links": "8.6.12",
-    "@storybook/addon-onboarding": "8.6.12",
-    "@storybook/blocks": "8.6.12",
-    "@storybook/react": "8.6.12",
-    "@storybook/react-vite": "8.6.12",
-    "@storybook/test": "8.6.12",
-    "@typescript-eslint/eslint-plugin": "8.29.1",
-    "@typescript-eslint/parser": "8.29.1",
+    "@storybook/addon-a11y": "8.4.7",
+    "@storybook/addon-essentials": "8.4.7",
+    "@storybook/addon-interactions": "8.4.7",
+    "@storybook/addon-links": "8.4.7",
+    "@storybook/addon-onboarding": "8.4.7",
+    "@storybook/blocks": "8.4.7",
+    "@storybook/react": "8.4.7",
+    "@storybook/react-vite": "8.4.7",
+    "@storybook/test": "8.4.7",
+    "@typescript-eslint/eslint-plugin": "8.18.0",
+    "@typescript-eslint/parser": "8.18.0",
     "@vitejs/plugin-react": "4.3.4",
-    "esbuild": "0.25.2",
-    "eslint-plugin-storybook": "0.12.0",
+    "esbuild": "0.25.1",
+    "eslint-plugin-storybook": "0.11.1",
     "prop-types": "15.8.1",
-    "storybook": "8.6.12",
-    "tsup": "8.4.0",
-    "vite": "6.2.5"
+    "storybook": "8.4.7",
+    "tsup": "8.3.5",
+    "vite": "6.0.12"
   }
 }

apps/web/Dockerfile

@@ -22,7 +22,7 @@ RUN npm install -g corepack@latest
 RUN corepack enable
 
 # Install necessary build tools and compilers
-RUN apk update && apk add --no-cache cmake g++ gcc jq make openssl-dev python3
+RUN apk update && apk add --no-cache g++ cmake make gcc python3 openssl-dev jq
 
 # BuildKit secret handling without hardcoded fallback values
 # This approach relies entirely on secrets passed from GitHub Actions
@@ -40,6 +40,8 @@ RUN echo '#!/bin/sh' > /tmp/read-secrets.sh && \
     echo 'exec "$@"' >> /tmp/read-secrets.sh && \
     chmod +x /tmp/read-secrets.sh
 
+ARG SENTRY_AUTH_TOKEN
+
 # Increase Node.js memory limit as a regular build argument
 ARG NODE_OPTIONS="--max_old_space_size=4096"
 ENV NODE_OPTIONS=${NODE_OPTIONS}
@@ -85,60 +87,31 @@ RUN apk add --no-cache curl \
 
 WORKDIR /home/nextjs
 
-# Ensure no write permissions are assigned to the copied resources
-COPY --from=installer --chown=nextjs:nextjs /app/apps/web/.next/standalone ./
-RUN chmod -R 755 ./
-
 COPY --from=installer /app/apps/web/next.config.mjs .
-RUN chmod 644 ./next.config.mjs
-
 COPY --from=installer /app/apps/web/package.json .
-RUN chmod 644 ./package.json
+# Leverage output traces to reduce image size
 
+COPY --from=installer --chown=nextjs:nextjs /app/apps/web/.next/standalone ./
 COPY --from=installer --chown=nextjs:nextjs /app/apps/web/.next/static ./apps/web/.next/static
-RUN chmod -R 755 ./apps/web/.next/static
-
 COPY --from=installer --chown=nextjs:nextjs /app/apps/web/public ./apps/web/public
-RUN chmod -R 755 ./apps/web/public
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/database/schema.prisma ./packages/database/schema.prisma
-RUN chmod 644 ./packages/database/schema.prisma
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/database/package.json ./packages/database/package.json
-RUN chmod 644 ./packages/database/package.json
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/database/migration ./packages/database/migration
-RUN chmod -R 755 ./packages/database/migration
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/database/src ./packages/database/src
-RUN chmod -R 755 ./packages/database/src
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/database/node_modules ./packages/database/node_modules
-RUN chmod -R 755 ./packages/database/node_modules
-
 COPY --from=installer --chown=nextjs:nextjs /app/packages/logger/dist ./packages/database/node_modules/@formbricks/logger/dist
-RUN chmod -R 755 ./packages/database/node_modules/@formbricks/logger/dist
 
+# Copy Prisma-specific generated files
 COPY --from=installer --chown=nextjs:nextjs /app/node_modules/@prisma/client ./node_modules/@prisma/client
-RUN chmod -R 755 ./node_modules/@prisma/client
-
 COPY --from=installer --chown=nextjs:nextjs /app/node_modules/.prisma ./node_modules/.prisma
-RUN chmod -R 755 ./node_modules/.prisma
 
 COPY --from=installer --chown=nextjs:nextjs /prisma_version.txt .
-RUN chmod 644 ./prisma_version.txt
-
 COPY /docker/cronjobs /app/docker/cronjobs
-RUN chmod -R 755 /app/docker/cronjobs
 
+# Copy required dependencies
 COPY --from=installer /app/node_modules/@paralleldrive/cuid2 ./node_modules/@paralleldrive/cuid2
-RUN chmod -R 755 ./node_modules/@paralleldrive/cuid2
-
 COPY --from=installer /app/node_modules/@noble/hashes ./node_modules/@noble/hashes
-RUN chmod -R 755 ./node_modules/@noble/hashes
-
 COPY --from=installer /app/node_modules/zod ./node_modules/zod
-RUN chmod -R 755 ./node_modules/zod
 
 RUN npm install -g tsx typescript prisma pino-pretty
 

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/layout.test.tsx

@@ -1,120 +1,191 @@
-import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
-import { cleanup, render, screen } from "@testing-library/react";
-import { Session } from "next-auth";
+import "@testing-library/jest-dom/vitest";
+import { act, cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getEnvironment } from "@formbricks/lib/environment/service";
+import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
+import { getUser } from "@formbricks/lib/user/service";
 import { TEnvironment } from "@formbricks/types/environment";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { TOrganization } from "@formbricks/types/organizations";
 import { TUser } from "@formbricks/types/user";
 import SurveyEditorEnvironmentLayout from "./layout";
 
-// Mock sub-components to render identifiable elements
-vi.mock("@/modules/ui/components/environmentId-base-layout", () => ({
-  EnvironmentIdBaseLayout: ({ children, environmentId }: any) => (
-    <div data-testid="EnvironmentIdBaseLayout">
-      {environmentId}
-      {children}
-    </div>
-  ),
-}));
-vi.mock("@/modules/ui/components/dev-environment-banner", () => ({
-  DevEnvironmentBanner: ({ environment }: any) => (
-    <div data-testid="DevEnvironmentBanner">{environment.id}</div>
-  ),
+// mock all dependencies
+
+vi.mock("@formbricks/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
 }));
 
-// Mocks for dependencies
-vi.mock("@/modules/environments/lib/utils", () => ({
-  environmentIdLayoutChecks: vi.fn(),
-}));
-vi.mock("@formbricks/lib/environment/service", () => ({
-  getEnvironment: vi.fn(),
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
 }));
 vi.mock("next/navigation", () => ({
   redirect: vi.fn(),
 }));
+vi.mock("@formbricks/lib/environment/auth", () => ({
+  hasUserEnvironmentAccess: vi.fn(),
+}));
+vi.mock("@formbricks/lib/environment/service", () => ({
+  getEnvironment: vi.fn(),
+}));
+vi.mock("@formbricks/lib/organization/service", () => ({
+  getOrganizationByEnvironmentId: vi.fn(),
+}));
+vi.mock("@formbricks/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: vi.fn(() => {
+    return (key: string) => key; // trivial translator returning the key
+  }),
+}));
+
+// mock child components rendered by the layout:
+vi.mock("@/app/(app)/components/FormbricksClient", () => ({
+  FormbricksClient: () => <div data-testid="formbricks-client" />,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/components/PosthogIdentify", () => ({
+  PosthogIdentify: () => <div data-testid="posthog-identify" />,
+}));
+vi.mock("@/modules/ui/components/toaster-client", () => ({
+  ToasterClient: () => <div data-testid="mock-toaster" />,
+}));
+vi.mock("@/modules/ui/components/dev-environment-banner", () => ({
+  DevEnvironmentBanner: ({ environment }: { environment: TEnvironment }) => (
+    <div data-testid="dev-environment-banner">{environment?.id || "no-env"}</div>
+  ),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/components/ResponseFilterContext", () => ({
+  ResponseFilterProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="mock-response-filter-provider">{children}</div>
+  ),
+}));
 
 describe("SurveyEditorEnvironmentLayout", () => {
-  afterEach(() => {
+  beforeEach(() => {
     cleanup();
     vi.clearAllMocks();
   });
 
-  it("renders successfully when environment is found", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any, // Mock translation function, we don't need to implement it for the test
-      session: { user: { id: "user1" } } as Session,
-      user: { id: "user1", email: "user1@example.com" } as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
-    vi.mocked(getEnvironment).mockResolvedValueOnce({ id: "env1" } as TEnvironment);
+  it("redirects to /auth/login if there is no session", async () => {
+    // Mock no session
+    vi.mocked(getServerSession).mockResolvedValueOnce(null);
 
-    const result = await SurveyEditorEnvironmentLayout({
-      params: Promise.resolve({ environmentId: "env1" }),
-      children: <div data-testid="child">Survey Editor Content</div>,
+    const layoutElement = await SurveyEditorEnvironmentLayout({
+      params: { environmentId: "env-123" },
+      children: <div data-testid="child-content">Hello!</div>,
     });
 
-    render(result);
-
-    expect(screen.getByTestId("EnvironmentIdBaseLayout")).toHaveTextContent("env1");
-    expect(screen.getByTestId("DevEnvironmentBanner")).toHaveTextContent("env1");
-    expect(screen.getByTestId("child")).toHaveTextContent("Survey Editor Content");
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+    // No JSX is returned after redirect
+    expect(layoutElement).toBeUndefined();
   });
 
-  it("throws an error when environment is not found", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: { user: { id: "user1" } } as Session,
-      user: { id: "user1", email: "user1@example.com" } as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
+  it("throws error if user does not exist in DB", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user-123" } });
+    vi.mocked(getUser).mockResolvedValueOnce(null); // user not found
+
+    await expect(
+      SurveyEditorEnvironmentLayout({
+        params: { environmentId: "env-123" },
+        children: <div data-testid="child-content">Hello!</div>,
+      })
+    ).rejects.toThrow("common.user_not_found");
+  });
+
+  it("throws AuthorizationError if user does not have environment access", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user-123" } });
+    vi.mocked(getUser).mockResolvedValueOnce({ id: "user-123", email: "test@example.com" } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(false);
+
+    await expect(
+      SurveyEditorEnvironmentLayout({
+        params: { environmentId: "env-123" },
+        children: <div>Child</div>,
+      })
+    ).rejects.toThrow(AuthorizationError);
+  });
+
+  it("throws if no organization is found", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user-123" } });
+    vi.mocked(getUser).mockResolvedValueOnce({ id: "user-123" } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce(null);
+
+    await expect(
+      SurveyEditorEnvironmentLayout({
+        params: { environmentId: "env-123" },
+        children: <div data-testid="child-content">Hello from children!</div>,
+      })
+    ).rejects.toThrow("common.organization_not_found");
+  });
+
+  it("throws if no environment is found", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user-123" } });
+    vi.mocked(getUser).mockResolvedValueOnce({ id: "user-123" } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce({ id: "org-999" } as TOrganization);
     vi.mocked(getEnvironment).mockResolvedValueOnce(null);
 
     await expect(
       SurveyEditorEnvironmentLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
+        params: { environmentId: "env-123" },
+        children: <div>Child</div>,
       })
     ).rejects.toThrow("common.environment_not_found");
   });
 
-  it("calls redirect when session is null", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: undefined as unknown as Session,
-      user: undefined as unknown as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
-    vi.mocked(redirect).mockImplementationOnce(() => {
-      throw new Error("Redirect called");
+  it("renders environment layout if everything is valid", async () => {
+    // Provide all valid data
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user-123" } });
+    vi.mocked(getUser).mockResolvedValueOnce({ id: "user-123", email: "test@example.com" } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce({ id: "org-999" } as TOrganization);
+    vi.mocked(getEnvironment).mockResolvedValueOnce({
+      id: "env-123",
+      name: "My Test Environment",
+    } as unknown as TEnvironment);
+
+    // Because it's an async server component, we typically wrap in act(...)
+    let layoutElement: React.ReactNode;
+
+    await act(async () => {
+      layoutElement = await SurveyEditorEnvironmentLayout({
+        params: { environmentId: "env-123" },
+        children: <div data-testid="child-content">Hello from children!</div>,
+      });
+      render(layoutElement);
     });
 
-    await expect(
-      SurveyEditorEnvironmentLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
-      })
-    ).rejects.toThrow("Redirect called");
-  });
-
-  it("throws error if user is null", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: { user: { id: "user1" } } as Session,
-      user: undefined as unknown as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
-
-    vi.mocked(redirect).mockImplementationOnce(() => {
-      throw new Error("Redirect called");
-    });
-
-    await expect(
-      SurveyEditorEnvironmentLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
-      })
-    ).rejects.toThrow("common.user_not_found");
+    // Now confirm we got the child plus all the mocked sub-components
+    expect(screen.getByTestId("child-content")).toHaveTextContent("Hello from children!");
+    expect(screen.getByTestId("posthog-identify")).toBeInTheDocument();
+    expect(screen.getByTestId("formbricks-client")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-toaster")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-response-filter-provider")).toBeInTheDocument();
+    expect(screen.getByTestId("dev-environment-banner")).toHaveTextContent("env-123");
   });
 });

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/layout.tsx

@@ -1,24 +1,46 @@
-import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
+import { FormbricksClient } from "@/app/(app)/components/FormbricksClient";
+import { PosthogIdentify } from "@/app/(app)/environments/[environmentId]/components/PosthogIdentify";
+import { ResponseFilterProvider } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+import { authOptions } from "@/modules/auth/lib/authOptions";
 import { DevEnvironmentBanner } from "@/modules/ui/components/dev-environment-banner";
-import { EnvironmentIdBaseLayout } from "@/modules/ui/components/environmentId-base-layout";
+import { ToasterClient } from "@/modules/ui/components/toaster-client";
+import { getTranslate } from "@/tolgee/server";
+import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
+import { IS_POSTHOG_CONFIGURED } from "@formbricks/lib/constants";
+import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getEnvironment } from "@formbricks/lib/environment/service";
+import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
+import { getUser } from "@formbricks/lib/user/service";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 const SurveyEditorEnvironmentLayout = async (props) => {
   const params = await props.params;
 
   const { children } = props;
 
-  const { t, session, user, organization } = await environmentIdLayoutChecks(params.environmentId);
+  const t = await getTranslate();
+  const session = await getServerSession(authOptions);
 
-  if (!session) {
+  if (!session?.user) {
     return redirect(`/auth/login`);
   }
 
+  const user = await getUser(session.user.id);
   if (!user) {
     throw new Error(t("common.user_not_found"));
   }
 
+  const hasAccess = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
+  if (!hasAccess) {
+    throw new AuthorizationError(t("common.not_authorized"));
+  }
+
+  const organization = await getOrganizationByEnvironmentId(params.environmentId);
+  if (!organization) {
+    throw new Error(t("common.organization_not_found"));
+  }
+
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
@@ -26,16 +48,23 @@ const SurveyEditorEnvironmentLayout = async (props) => {
   }
 
   return (
-    <EnvironmentIdBaseLayout
-      environmentId={params.environmentId}
-      session={session}
-      user={user}
-      organization={organization}>
+    <ResponseFilterProvider>
+      <PosthogIdentify
+        session={session}
+        user={user}
+        environmentId={params.environmentId}
+        organizationId={organization.id}
+        organizationName={organization.name}
+        organizationBilling={organization.billing}
+        isPosthogEnabled={IS_POSTHOG_CONFIGURED}
+      />
+      <FormbricksClient userId={user.id} email={user.email} />
+      <ToasterClient />
       <div className="flex h-screen flex-col">
         <DevEnvironmentBanner environment={environment} />
         <div className="h-full overflow-y-auto bg-slate-50">{children}</div>
       </div>
-    </EnvironmentIdBaseLayout>
+    </ResponseFilterProvider>
   );
 };
 

apps/web/app/(app)/components/FormbricksClient.test.tsx

@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import { describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 import formbricks from "@formbricks/js";
 import { FormbricksClient } from "./FormbricksClient";
 
@@ -9,6 +9,14 @@ vi.mock("next/navigation", () => ({
   useSearchParams: () => new URLSearchParams("foo=bar"),
 }));
 
+// Mock the environment variables.
+vi.mock("@formbricks/lib/env", () => ({
+  env: {
+    NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID: "env-test",
+    NEXT_PUBLIC_FORMBRICKS_API_HOST: "https://api.test.com",
+  },
+}));
+
 // Mock the flag that enables Formbricks.
 vi.mock("@/app/lib/formbricks", () => ({
   formbricksEnabled: true,
@@ -26,21 +34,17 @@ vi.mock("@formbricks/js", () => ({
 }));
 
 describe("FormbricksClient", () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
   test("calls setup, setUserId, setEmail and registerRouteChange on mount when enabled", () => {
     const mockSetup = vi.spyOn(formbricks, "setup");
     const mockSetUserId = vi.spyOn(formbricks, "setUserId");
     const mockSetEmail = vi.spyOn(formbricks, "setEmail");
     const mockRegisterRouteChange = vi.spyOn(formbricks, "registerRouteChange");
 
-    render(
-      <FormbricksClient
-        userId="user-123"
-        email="test@example.com"
-        formbricksEnvironmentId="env-test"
-        formbricksApiHost="https://api.test.com"
-        formbricksEnabled={true}
-      />
-    );
+    render(<FormbricksClient userId="user-123" email="test@example.com" />);
 
     // Expect the first effect to call setup and assign the provided user details.
     expect(mockSetup).toHaveBeenCalledWith({
@@ -60,15 +64,7 @@ describe("FormbricksClient", () => {
     const mockSetEmail = vi.spyOn(formbricks, "setEmail");
     const mockRegisterRouteChange = vi.spyOn(formbricks, "registerRouteChange");
 
-    render(
-      <FormbricksClient
-        userId=""
-        email="test@example.com"
-        formbricksEnvironmentId="env-test"
-        formbricksApiHost="https://api.test.com"
-        formbricksEnabled={true}
-      />
-    );
+    render(<FormbricksClient userId="" email="test@example.com" />);
 
     // Since userId is falsy, the first effect should not call setup or assign user details.
     expect(mockSetup).not.toHaveBeenCalled();

apps/web/app/(app)/components/FormbricksClient.tsx

@@ -1,44 +1,32 @@
 "use client";
 
+import { formbricksEnabled } from "@/app/lib/formbricks";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useEffect } from "react";
 import formbricks from "@formbricks/js";
+import { env } from "@formbricks/lib/env";
 
-interface FormbricksClientProps {
-  userId: string;
-  email: string;
-  formbricksEnvironmentId?: string;
-  formbricksApiHost?: string;
-  formbricksEnabled?: boolean;
-}
-
-export const FormbricksClient = ({
-  userId,
-  email,
-  formbricksEnvironmentId,
-  formbricksApiHost,
-  formbricksEnabled,
-}: FormbricksClientProps) => {
+export const FormbricksClient = ({ userId, email }: { userId: string; email: string }) => {
   const pathname = usePathname();
   const searchParams = useSearchParams();
 
   useEffect(() => {
     if (formbricksEnabled && userId) {
       formbricks.setup({
-        environmentId: formbricksEnvironmentId ?? "",
-        appUrl: formbricksApiHost ?? "",
+        environmentId: env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID || "",
+        appUrl: env.NEXT_PUBLIC_FORMBRICKS_API_HOST || "",
       });
 
       formbricks.setUserId(userId);
       formbricks.setEmail(email);
     }
-  }, [userId, email, formbricksEnvironmentId, formbricksApiHost, formbricksEnabled]);
+  }, [userId, email]);
 
   useEffect(() => {
     if (formbricksEnabled) {
       formbricks.registerRouteChange();
     }
-  }, [pathname, searchParams, formbricksEnabled]);
+  }, [pathname, searchParams]);
 
   return null;
 };

apps/web/app/(app)/environments/[environmentId]/components/EnvironmentLayout.tsx

@@ -7,7 +7,7 @@ import { LimitsReachedBanner } from "@/modules/ui/components/limits-reached-bann
 import { PendingDowngradeBanner } from "@/modules/ui/components/pending-downgrade-banner";
 import { getTranslate } from "@/tolgee/server";
 import type { Session } from "next-auth";
-import { IS_DEVELOPMENT, IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
+import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import { getEnvironment, getEnvironments } from "@formbricks/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
@@ -111,7 +111,6 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
           organizationProjectsLimit={organizationProjectsLimit}
           user={user}
           isFormbricksCloud={IS_FORMBRICKS_CLOUD}
-          isDevelopment={IS_DEVELOPMENT}
           membershipRole={membershipRole}
           isMultiOrgEnabled={isMultiOrgEnabled}
           isLicenseActive={active}

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx

@@ -63,7 +63,6 @@ interface NavigationProps {
   projects: TProject[];
   isMultiOrgEnabled: boolean;
   isFormbricksCloud: boolean;
-  isDevelopment: boolean;
   membershipRole?: TOrganizationRole;
   organizationProjectsLimit: number;
   isLicenseActive: boolean;
@@ -80,7 +79,6 @@ export const MainNavigation = ({
   isFormbricksCloud,
   organizationProjectsLimit,
   isLicenseActive,
-  isDevelopment,
 }: NavigationProps) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -298,7 +296,7 @@ export const MainNavigation = ({
 
           <div>
             {/* New Version Available */}
-            {!isCollapsed && isOwnerOrManager && latestVersion && !isFormbricksCloud && !isDevelopment && (
+            {!isCollapsed && isOwnerOrManager && latestVersion && !isFormbricksCloud && (
               <Link
                 href="https://github.com/formbricks/formbricks/releases"
                 target="_blank"

apps/web/app/(app)/environments/[environmentId]/components/PosthogIdentify.test.tsx

@@ -1,7 +1,9 @@
+// PosthogIdentify.test.tsx
 import "@testing-library/jest-dom/vitest";
 import { cleanup, render } from "@testing-library/react";
 import { Session } from "next-auth";
 import { usePostHog } from "posthog-js/react";
+import React from "react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { TOrganizationBilling } from "@formbricks/types/organizations";
 import { TUser } from "@formbricks/types/user";

apps/web/app/(app)/environments/[environmentId]/layout.test.tsx

@@ -1,156 +1,250 @@
-import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
-import { cleanup, render, screen } from "@testing-library/react";
-import { Session } from "next-auth";
-import { redirect } from "next/navigation";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import "@testing-library/jest-dom/vitest";
+import { act, cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { notFound, redirect } from "next/navigation";
+import React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
+import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
+import { getUser } from "@formbricks/lib/user/service";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { TMembership } from "@formbricks/types/memberships";
 import { TOrganization } from "@formbricks/types/organizations";
 import { TProject } from "@formbricks/types/project";
 import { TUser } from "@formbricks/types/user";
 import EnvLayout from "./layout";
 
-// Mock sub-components to render identifiable elements
-vi.mock("@/app/(app)/environments/[environmentId]/components/EnvironmentLayout", () => ({
-  EnvironmentLayout: ({ children }: any) => <div data-testid="EnvironmentLayout">{children}</div>,
-}));
-vi.mock("@/modules/ui/components/environmentId-base-layout", () => ({
-  EnvironmentIdBaseLayout: ({ children, environmentId }: any) => (
-    <div data-testid="EnvironmentIdBaseLayout">
-      {environmentId}
-      {children}
-    </div>
-  ),
-}));
-vi.mock("@/modules/ui/components/toaster-client", () => ({
-  ToasterClient: () => <div data-testid="ToasterClient" />,
-}));
-vi.mock("../../components/FormbricksClient", () => ({
-  FormbricksClient: ({ userId, email }: any) => (
-    <div data-testid="FormbricksClient">
-      {userId}-{email}
-    </div>
-  ),
-}));
-vi.mock("./components/EnvironmentStorageHandler", () => ({
-  default: ({ environmentId }: any) => <div data-testid="EnvironmentStorageHandler">{environmentId}</div>,
+// mock all the dependencies
+
+vi.mock("@formbricks/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
 }));
 
-// Mocks for dependencies
-vi.mock("@/modules/environments/lib/utils", () => ({
-  environmentIdLayoutChecks: vi.fn(),
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: vi.fn(() => {
+    return (key: string) => {
+      return key;
+    };
+  }),
 }));
-vi.mock("@formbricks/lib/project/service", () => ({
-  getProjectByEnvironmentId: vi.fn(),
+
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+vi.mock("@formbricks/lib/environment/auth", () => ({
+  hasUserEnvironmentAccess: vi.fn(),
 }));
 vi.mock("@formbricks/lib/membership/service", () => ({
   getMembershipByUserIdOrganizationId: vi.fn(),
 }));
+vi.mock("@formbricks/lib/organization/service", () => ({
+  getOrganizationByEnvironmentId: vi.fn(),
+}));
+vi.mock("@formbricks/lib/project/service", () => ({
+  getProjectByEnvironmentId: vi.fn(),
+}));
+vi.mock("@formbricks/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@formbricks/lib/aiModels", () => ({
+  llmModel: {},
+}));
+
+// mock all the components that are rendered in the layout
+
+vi.mock("./components/PosthogIdentify", () => ({
+  PosthogIdentify: () => <div data-testid="posthog-identify" />,
+}));
+vi.mock("@/app/(app)/components/FormbricksClient", () => ({
+  FormbricksClient: () => <div data-testid="formbricks-client" />,
+}));
+vi.mock("@/modules/ui/components/toaster-client", () => ({
+  ToasterClient: () => <div data-testid="mock-toaster" />,
+}));
+vi.mock("./components/EnvironmentStorageHandler", () => ({
+  default: () => <div data-testid="mock-storage-handler" />,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/components/ResponseFilterContext", () => ({
+  ResponseFilterProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="mock-response-filter-provider">{children}</div>
+  ),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/components/EnvironmentLayout", () => ({
+  EnvironmentLayout: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="mock-environment-result">{children}</div>
+  ),
+}));
 
 describe("EnvLayout", () => {
-  afterEach(() => {
+  beforeEach(() => {
     cleanup();
   });
 
-  it("renders successfully when all dependencies return valid data", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any, // Mock translation function, we don't need to implement it for the test
-      session: { user: { id: "user1" } } as Session,
-      user: { id: "user1", email: "user1@example.com" } as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
-    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce({ id: "proj1" } as TProject);
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValueOnce({
-      id: "member1",
-    } as unknown as TMembership);
+  it("redirects to /auth/login if there is no session", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce(null);
 
-    const result = await EnvLayout({
-      params: Promise.resolve({ environmentId: "env1" }),
-      children: <div data-testid="child">Content</div>,
+    // Since it's an async server component, call EnvLayout yourself:
+    const layoutElement = await EnvLayout({
+      params: Promise.resolve({ environmentId: "env-123" }),
+      children: <div data-testid="child-content">Hello!</div>,
     });
-    render(result);
 
-    expect(screen.getByTestId("EnvironmentIdBaseLayout")).toHaveTextContent("env1");
-    expect(screen.getByTestId("EnvironmentStorageHandler")).toHaveTextContent("env1");
-    expect(screen.getByTestId("EnvironmentLayout")).toBeDefined();
-    expect(screen.getByTestId("child")).toHaveTextContent("Content");
+    // Because we have no session, we expect a redirect to "/auth/login"
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+
+    // If your code calls redirect() early and returns no JSX,
+    // layoutElement might be undefined or null.
+    expect(layoutElement).toBeUndefined();
   });
 
-  it("throws error if project is not found", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: { user: { id: "user1" } } as Session,
-      user: { id: "user1", email: "user1@example.com" } as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
+  it("redirects to /auth/login if user does not exist in DB", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
     });
-    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce(null);
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValueOnce({
-      id: "member1",
-    } as unknown as TMembership);
+
+    vi.mocked(getUser).mockResolvedValueOnce(null); // user not found
+
+    const layoutElement = await EnvLayout({
+      params: Promise.resolve({ environmentId: "env-123" }),
+      children: <div data-testid="child-content">Hello!</div>,
+    });
+
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+    expect(layoutElement).toBeUndefined();
+  });
+
+  it("throws AuthorizationError if user does not have environment access", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
+    });
+    vi.mocked(getUser).mockResolvedValueOnce({
+      id: "user-123",
+      email: "test@example.com",
+    } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(false);
 
     await expect(
       EnvLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
+        params: Promise.resolve({ environmentId: "env-123" }),
+        children: <div>Child</div>,
       })
-    ).rejects.toThrow("common.project_not_found");
+    ).rejects.toThrow(AuthorizationError);
   });
 
-  it("throws error if membership is not found", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: { user: { id: "user1" } } as Session,
-      user: { id: "user1", email: "user1@example.com" } as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
+  it("throws if no organization is found", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
     });
-    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce({ id: "proj1" } as TProject);
+    vi.mocked(getUser).mockResolvedValueOnce({
+      id: "user-123",
+      email: "test@example.com",
+    } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce(null);
+
+    await expect(
+      EnvLayout({
+        params: Promise.resolve({ environmentId: "env-123" }),
+        children: <div data-testid="child-content">Hello from children!</div>,
+      })
+    ).rejects.toThrow("common.organization_not_found");
+  });
+
+  it("throws if no project is found", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
+    });
+    vi.mocked(getUser).mockResolvedValueOnce({
+      id: "user-123",
+      email: "test@example.com",
+    } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce({ id: "org-999" } as TOrganization);
+    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce(null);
+
+    await expect(
+      EnvLayout({
+        params: Promise.resolve({ environmentId: "env-123" }),
+        children: <div>Child</div>,
+      })
+    ).rejects.toThrow("project_not_found");
+  });
+
+  it("calls notFound if membership is missing", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
+    });
+    vi.mocked(getUser).mockResolvedValueOnce({
+      id: "user-123",
+      email: "test@example.com",
+    } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce({ id: "org-999" } as TOrganization);
+    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce({ id: "proj-111" } as TProject);
     vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValueOnce(null);
 
     await expect(
       EnvLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
+        params: Promise.resolve({ environmentId: "env-123" }),
+        children: <div>Child</div>,
       })
-    ).rejects.toThrow("common.membership_not_found");
+    ).rejects.toThrow("membership_not_found");
   });
 
-  it("calls redirect when session is null", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: undefined as unknown as Session,
-      user: undefined as unknown as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
+  it("renders environment layout if everything is valid", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({
+      user: { id: "user-123" },
     });
-    vi.mocked(redirect).mockImplementationOnce(() => {
-      throw new Error("Redirect called");
+    vi.mocked(getUser).mockResolvedValueOnce({
+      id: "user-123",
+      email: "test@example.com",
+    } as TUser);
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce({ id: "org-999" } as TOrganization);
+    vi.mocked(getProjectByEnvironmentId).mockResolvedValueOnce({ id: "proj-111" } as TProject);
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValueOnce({
+      id: "membership-123",
+    } as unknown as TMembership);
+
+    let layoutElement: React.ReactNode;
+
+    await act(async () => {
+      layoutElement = await EnvLayout({
+        params: Promise.resolve({ environmentId: "env-123" }),
+        children: <div data-testid="child-content">Hello from children!</div>,
+      });
+
+      // Now render the fully resolved layout
+      render(layoutElement);
     });
 
-    await expect(
-      EnvLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
-      })
-    ).rejects.toThrow("Redirect called");
-  });
-
-  it("throws error if user is null", async () => {
-    vi.mocked(environmentIdLayoutChecks).mockResolvedValueOnce({
-      t: ((key: string) => key) as any,
-      session: { user: { id: "user1" } } as Session,
-      user: undefined as unknown as TUser,
-      organization: { id: "org1", name: "Org1", billing: {} } as TOrganization,
-    });
-
-    vi.mocked(redirect).mockImplementationOnce(() => {
-      throw new Error("Redirect called");
-    });
-
-    await expect(
-      EnvLayout({
-        params: Promise.resolve({ environmentId: "env1" }),
-        children: <div>Content</div>,
-      })
-    ).rejects.toThrow("common.user_not_found");
+    expect(screen.getByTestId("child-content")).toHaveTextContent("Hello from children!");
+    expect(screen.getByTestId("posthog-identify")).toBeInTheDocument();
+    expect(screen.getByTestId("formbricks-client")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-toaster")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-storage-handler")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-response-filter-provider")).toBeInTheDocument();
+    expect(screen.getByTestId("mock-environment-result")).toBeInTheDocument();
   });
 });

apps/web/app/(app)/environments/[environmentId]/layout.tsx

@@ -1,10 +1,20 @@
 import { EnvironmentLayout } from "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout";
-import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
-import { EnvironmentIdBaseLayout } from "@/modules/ui/components/environmentId-base-layout";
+import { ResponseFilterProvider } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+import { authOptions } from "@/modules/auth/lib/authOptions";
+import { ToasterClient } from "@/modules/ui/components/toaster-client";
+import { getTranslate } from "@/tolgee/server";
+import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
+import { IS_POSTHOG_CONFIGURED } from "@formbricks/lib/constants";
+import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
+import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
+import { getUser } from "@formbricks/lib/user/service";
+import { AuthorizationError } from "@formbricks/types/errors";
+import { FormbricksClient } from "../../components/FormbricksClient";
 import EnvironmentStorageHandler from "./components/EnvironmentStorageHandler";
+import { PosthogIdentify } from "./components/PosthogIdentify";
 
 const EnvLayout = async (props: {
   params: Promise<{ environmentId: string }>;
@@ -14,16 +24,27 @@ const EnvLayout = async (props: {
 
   const { children } = props;
 
-  const { t, session, user, organization } = await environmentIdLayoutChecks(params.environmentId);
+  const t = await getTranslate();
+  const session = await getServerSession(authOptions);
 
-  if (!session) {
+  if (!session?.user) {
     return redirect(`/auth/login`);
   }
 
+  const user = await getUser(session.user.id);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    return redirect(`/auth/login`);
   }
 
+  const hasAccess = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
+  if (!hasAccess) {
+    throw new AuthorizationError(t("common.not_authorized"));
+  }
+
+  const organization = await getOrganizationByEnvironmentId(params.environmentId);
+  if (!organization) {
+    throw new Error(t("common.organization_not_found"));
+  }
   const project = await getProjectByEnvironmentId(params.environmentId);
   if (!project) {
     throw new Error(t("common.project_not_found"));
@@ -36,16 +57,23 @@ const EnvLayout = async (props: {
   }
 
   return (
-    <EnvironmentIdBaseLayout
-      environmentId={params.environmentId}
-      session={session}
-      user={user}
-      organization={organization}>
+    <ResponseFilterProvider>
+      <PosthogIdentify
+        session={session}
+        user={user}
+        environmentId={params.environmentId}
+        organizationId={organization.id}
+        organizationName={organization.name}
+        organizationBilling={organization.billing}
+        isPosthogEnabled={IS_POSTHOG_CONFIGURED}
+      />
+      <FormbricksClient userId={user.id} email={user.email} />
+      <ToasterClient />
       <EnvironmentStorageHandler environmentId={params.environmentId} />
       <EnvironmentLayout environmentId={params.environmentId} session={session}>
         {children}
       </EnvironmentLayout>
-    </EnvironmentIdBaseLayout>
+    </ResponseFilterProvider>
   );
 };
 

apps/web/app/(app)/environments/[environmentId]/project/api-keys/loading.tsx

@@ -0,0 +1,3 @@
+import { APIKeysLoading } from "@/modules/projects/settings/api-keys/loading";
+
+export default APIKeysLoading;

apps/web/app/(app)/environments/[environmentId]/project/api-keys/page.tsx

@@ -0,0 +1,3 @@
+import { APIKeysPage } from "@/modules/projects/settings/api-keys/page";
+
+export default APIKeysPage;

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/api-keys/loading.tsx

@@ -1,6 +0,0 @@
-import Loading from "@/modules/organization/settings/api-keys/loading";
-import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
-
-export default function LoadingPage() {
-  return <Loading isFormbricksCloud={IS_FORMBRICKS_CLOUD} />;
-}

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/api-keys/page.tsx

@@ -1,3 +0,0 @@
-import { APIKeysPage } from "@/modules/organization/settings/api-keys/page";
-
-export default APIKeysPage;

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar.tsx

@@ -54,12 +54,6 @@ export const OrganizationSettingsNavbar = ({
       hidden: isFormbricksCloud || isPricingDisabled,
       current: pathname?.includes("/enterprise"),
     },
-    {
-      id: "api-keys",
-      label: t("common.api_keys"),
-      href: `/environments/${environmentId}/settings/api-keys`,
-      current: pathname?.includes("/api-keys"),
-    },
   ];
 
   return <SecondaryNavigation navigation={navigation} activeId={activeId} loading={loading} />;

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/page.test.tsx

@@ -33,16 +33,12 @@ vi.mock("@formbricks/lib/constants", () => ({
   WEBAPP_URL: "mock-webapp-url",
   SMTP_HOST: "mock-smtp-host",
   SMTP_PORT: "mock-smtp-port",
-  AI_AZURE_LLM_RESSOURCE_NAME: "mock-ai-azure-llm-ressource-name",
-  AI_AZURE_LLM_API_KEY: "mock-ai",
-  AI_AZURE_LLM_DEPLOYMENT_ID: "mock-ai-azure-llm-deployment-id",
-  AI_AZURE_EMBEDDINGS_RESSOURCE_NAME: "mock-ai-azure-embeddings-ressource-name",
-  AI_AZURE_EMBEDDINGS_API_KEY: "mock-ai-azure-embeddings-api-key",
-  AI_AZURE_EMBEDDINGS_DEPLOYMENT_ID: "mock-ai-azure-embeddings-deployment-id",
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: vi.fn(),
+  AI_AZURE_LLM_RESSOURCE_NAME: "mock-azure-llm-resource-name",
+  AI_AZURE_LLM_API_KEY: "mock-azure-llm-api-key",
+  AI_AZURE_LLM_DEPLOYMENT_ID: "mock-azure-llm-deployment-id",
+  AI_AZURE_EMBEDDINGS_RESSOURCE_NAME: "mock-azure-embeddings-resource-name",
+  AI_AZURE_EMBEDDINGS_API_KEY: "mock-azure-embeddings-api-key",
+  AI_AZURE_EMBEDDINGS_DEPLOYMENT_ID: "mock-azure-embeddings-deployment-id",
 }));
 
 vi.mock("@/tolgee/server", () => ({

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/DateQuestionSummary.tsx

@@ -35,16 +35,6 @@ export const DateQuestionSummary = ({
     );
   };
 
-  const renderResponseValue = (value: string) => {
-    const parsedDate = new Date(value);
-
-    const formattedDate = isNaN(parsedDate.getTime())
-      ? `${t("common.invalid_date")}(${value})`
-      : formatDateWithOrdinal(parsedDate);
-
-    return formattedDate;
-  };
-
   return (
     <div className="rounded-xl border border-slate-200 bg-white shadow-sm">
       <QuestionSummaryHeader questionSummary={questionSummary} survey={survey} />
@@ -80,8 +70,8 @@ export const DateQuestionSummary = ({
                   </div>
                 )}
               </div>
-              <div className="ph-no-capture col-span-2 pl-6 font-semibold whitespace-pre-wrap">
-                {renderResponseValue(response.value)}
+              <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
+                {formatDateWithOrdinal(new Date(response.value as string))}
               </div>
               <div className="px-4 text-slate-500 md:px-6">
                 {timeSince(new Date(response.updatedAt).toISOString(), locale)}

apps/web/app/(app)/layout.test.tsx

@@ -36,9 +36,6 @@ vi.mock("@formbricks/lib/constants", () => ({
   IS_POSTHOG_CONFIGURED: true,
   POSTHOG_API_HOST: "test-posthog-api-host",
   POSTHOG_API_KEY: "test-posthog-api-key",
-  FORMBRICKS_API_HOST: "mock-formbricks-api-host",
-  FORMBRICKS_ENVIRONMENT_ID: "mock-formbricks-environment-id",
-  IS_FORMBRICKS_ENABLED: true,
 }));
 
 vi.mock("@/app/(app)/components/FormbricksClient", () => ({
@@ -50,6 +47,12 @@ vi.mock("@/app/intercom/IntercomClientWrapper", () => ({
 vi.mock("@/modules/ui/components/no-mobile-overlay", () => ({
   NoMobileOverlay: () => <div data-testid="no-mobile-overlay" />,
 }));
+vi.mock("@/modules/ui/components/post-hog-client", () => ({
+  PHProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="ph-provider">{children}</div>
+  ),
+  PostHogPageview: () => <div data-testid="ph-pageview" />,
+}));
 vi.mock("@/modules/ui/components/toaster-client", () => ({
   ToasterClient: () => <div data-testid="toaster-client" />,
 }));
@@ -71,6 +74,8 @@ describe("(app) AppLayout", () => {
     render(element);
 
     expect(screen.getByTestId("no-mobile-overlay")).toBeInTheDocument();
+    expect(screen.getByTestId("ph-pageview")).toBeInTheDocument();
+    expect(screen.getByTestId("ph-provider")).toBeInTheDocument();
     expect(screen.getByTestId("mock-intercom-wrapper")).toBeInTheDocument();
     expect(screen.getByTestId("toaster-client")).toBeInTheDocument();
     expect(screen.getByTestId("child-content")).toHaveTextContent("Hello from children");

apps/web/app/(app)/layout.tsx

@@ -1,31 +1,18 @@
 import { FormbricksClient } from "@/app/(app)/components/FormbricksClient";
 import { IntercomClientWrapper } from "@/app/intercom/IntercomClientWrapper";
 import { authOptions } from "@/modules/auth/lib/authOptions";
-import { ClientLogout } from "@/modules/ui/components/client-logout";
 import { NoMobileOverlay } from "@/modules/ui/components/no-mobile-overlay";
 import { PHProvider, PostHogPageview } from "@/modules/ui/components/post-hog-client";
 import { ToasterClient } from "@/modules/ui/components/toaster-client";
 import { getServerSession } from "next-auth";
 import { Suspense } from "react";
-import {
-  FORMBRICKS_API_HOST,
-  FORMBRICKS_ENVIRONMENT_ID,
-  IS_FORMBRICKS_ENABLED,
-  IS_POSTHOG_CONFIGURED,
-  POSTHOG_API_HOST,
-  POSTHOG_API_KEY,
-} from "@formbricks/lib/constants";
+import { IS_POSTHOG_CONFIGURED, POSTHOG_API_HOST, POSTHOG_API_KEY } from "@formbricks/lib/constants";
 import { getUser } from "@formbricks/lib/user/service";
 
 const AppLayout = async ({ children }) => {
   const session = await getServerSession(authOptions);
   const user = session?.user?.id ? await getUser(session.user.id) : null;
 
-  // If user account is deactivated, log them out instead of rendering the app
-  if (user?.isActive === false) {
-    return <ClientLogout />;
-  }
-
   return (
     <>
       <NoMobileOverlay />
@@ -38,15 +25,7 @@ const AppLayout = async ({ children }) => {
       </Suspense>
       <PHProvider posthogEnabled={IS_POSTHOG_CONFIGURED}>
         <>
-          {user ? (
-            <FormbricksClient
-              userId={user.id}
-              email={user.email}
-              formbricksApiHost={FORMBRICKS_API_HOST}
-              formbricksEnvironmentId={FORMBRICKS_ENVIRONMENT_ID}
-              formbricksEnabled={IS_FORMBRICKS_ENABLED}
-            />
-          ) : null}
+          {user ? <FormbricksClient userId={user.id} email={user.email} /> : null}
           <IntercomClientWrapper user={user} />
           <ToasterClient />
           {children}

apps/web/app/api/v1/auth.test.ts

@@ -1,178 +0,0 @@
-import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
-import { getApiKeyWithPermissions } from "@/modules/organization/settings/api-keys/lib/api-key";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { describe, expect, it, vi } from "vitest";
-import { prisma } from "@formbricks/database";
-import { TAPIKeyEnvironmentPermission } from "@formbricks/types/auth";
-import { authenticateRequest } from "./auth";
-
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    apiKey: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
-    },
-  },
-}));
-
-vi.mock("@/modules/api/v2/management/lib/utils", () => ({
-  hashApiKey: vi.fn(),
-}));
-
-describe("getApiKeyWithPermissions", () => {
-  it("should return API key data with permissions when valid key is provided", async () => {
-    const mockApiKeyData = {
-      id: "api-key-id",
-      organizationId: "org-id",
-      hashedKey: "hashed-key",
-      createdAt: new Date(),
-      createdBy: "user-id",
-      lastUsedAt: null,
-      label: "Test API Key",
-      apiKeyEnvironments: [
-        {
-          environmentId: "env-1",
-          permission: "manage" as const,
-          environment: { id: "env-1" },
-        },
-      ],
-    };
-
-    vi.mocked(hashApiKey).mockReturnValue("hashed-key");
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(mockApiKeyData);
-    vi.mocked(prisma.apiKey.update).mockResolvedValue(mockApiKeyData);
-
-    const result = await getApiKeyWithPermissions("test-api-key");
-
-    expect(result).toEqual(mockApiKeyData);
-    expect(prisma.apiKey.update).toHaveBeenCalledWith({
-      where: { id: "api-key-id" },
-      data: { lastUsedAt: expect.any(Date) },
-    });
-  });
-
-  it("should return null when API key is not found", async () => {
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(null);
-
-    const result = await getApiKeyWithPermissions("invalid-key");
-
-    expect(result).toBeNull();
-  });
-});
-
-describe("hasPermission", () => {
-  const permissions: TAPIKeyEnvironmentPermission[] = [
-    {
-      environmentId: "env-1",
-      permission: "manage",
-      environmentType: "development",
-      projectId: "project-1",
-      projectName: "Project 1",
-    },
-    {
-      environmentId: "env-2",
-      permission: "write",
-      environmentType: "production",
-      projectId: "project-2",
-      projectName: "Project 2",
-    },
-    {
-      environmentId: "env-3",
-      permission: "read",
-      environmentType: "development",
-      projectId: "project-3",
-      projectName: "Project 3",
-    },
-  ];
-
-  it("should return true for manage permission with any method", () => {
-    expect(hasPermission(permissions, "env-1", "GET")).toBe(true);
-    expect(hasPermission(permissions, "env-1", "POST")).toBe(true);
-    expect(hasPermission(permissions, "env-1", "DELETE")).toBe(true);
-  });
-
-  it("should handle write permission correctly", () => {
-    expect(hasPermission(permissions, "env-2", "GET")).toBe(true);
-    expect(hasPermission(permissions, "env-2", "POST")).toBe(true);
-    expect(hasPermission(permissions, "env-2", "DELETE")).toBe(false);
-  });
-
-  it("should handle read permission correctly", () => {
-    expect(hasPermission(permissions, "env-3", "GET")).toBe(true);
-    expect(hasPermission(permissions, "env-3", "POST")).toBe(false);
-    expect(hasPermission(permissions, "env-3", "DELETE")).toBe(false);
-  });
-
-  it("should return false for non-existent environment", () => {
-    expect(hasPermission(permissions, "env-4", "GET")).toBe(false);
-  });
-});
-
-describe("authenticateRequest", () => {
-  it("should return authentication data for valid API key", async () => {
-    const request = new Request("http://localhost", {
-      headers: { "x-api-key": "valid-api-key" },
-    });
-
-    const mockApiKeyData = {
-      id: "api-key-id",
-      organizationId: "org-id",
-      hashedKey: "hashed-key",
-      createdAt: new Date(),
-      createdBy: "user-id",
-      lastUsedAt: null,
-      label: "Test API Key",
-      apiKeyEnvironments: [
-        {
-          environmentId: "env-1",
-          permission: "manage" as const,
-          environment: {
-            id: "env-1",
-            projectId: "project-1",
-            project: { name: "Project 1" },
-            type: "development",
-          },
-        },
-      ],
-    };
-
-    vi.mocked(hashApiKey).mockReturnValue("hashed-key");
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(mockApiKeyData);
-    vi.mocked(prisma.apiKey.update).mockResolvedValue(mockApiKeyData);
-
-    const result = await authenticateRequest(request);
-
-    expect(result).toEqual({
-      type: "apiKey",
-      environmentPermissions: [
-        {
-          environmentId: "env-1",
-          permission: "manage",
-          environmentType: "development",
-          projectId: "project-1",
-          projectName: "Project 1",
-        },
-      ],
-      hashedApiKey: "hashed-key",
-      apiKeyId: "api-key-id",
-      organizationId: "org-id",
-    });
-  });
-
-  it("should return null when no API key is provided", async () => {
-    const request = new Request("http://localhost");
-    const result = await authenticateRequest(request);
-    expect(result).toBeNull();
-  });
-
-  it("should return null when API key is invalid", async () => {
-    const request = new Request("http://localhost", {
-      headers: { "x-api-key": "invalid-api-key" },
-    });
-
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(null);
-
-    const result = await authenticateRequest(request);
-    expect(result).toBeNull();
-  });
-});

apps/web/app/api/v1/auth.ts

@@ -1,38 +1,25 @@
+import { getEnvironmentIdFromApiKey } from "@/app/api/v1/lib/api-key";
 import { responses } from "@/app/lib/api/response";
 import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
-import { getApiKeyWithPermissions } from "@/modules/organization/settings/api-keys/lib/api-key";
 import { TAuthenticationApiKey } from "@formbricks/types/auth";
 import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 
 export const authenticateRequest = async (request: Request): Promise<TAuthenticationApiKey | null> => {
   const apiKey = request.headers.get("x-api-key");
-  if (!apiKey) return null;
-
-  // Get API key with permissions
-  const apiKeyData = await getApiKeyWithPermissions(apiKey);
-  if (!apiKeyData) return null;
-
-  // In the route handlers, we'll do more specific permission checks
-  const environmentIds = apiKeyData.apiKeyEnvironments.map((env) => env.environmentId);
-  if (environmentIds.length === 0) return null;
-
-  const hashedApiKey = hashApiKey(apiKey);
-  const authentication: TAuthenticationApiKey = {
-    type: "apiKey",
-    environmentPermissions: apiKeyData.apiKeyEnvironments.map((env) => ({
-      environmentId: env.environmentId,
-      environmentType: env.environment.type,
-      permission: env.permission,
-      projectId: env.environment.projectId,
-      projectName: env.environment.project.name,
-    })),
-    hashedApiKey,
-    apiKeyId: apiKeyData.id,
-    organizationId: apiKeyData.organizationId,
-    organizationAccess: apiKeyData.organizationAccess,
-  };
-
-  return authentication;
+  if (apiKey) {
+    const environmentId = await getEnvironmentIdFromApiKey(apiKey);
+    if (environmentId) {
+      const hashedApiKey = hashApiKey(apiKey);
+      const authentication: TAuthenticationApiKey = {
+        type: "apiKey",
+        environmentId,
+        hashedApiKey,
+      };
+      return authentication;
+    }
+    return null;
+  }
+  return null;
 };
 
 export const handleErrorResponse = (error: any): Response => {

apps/web/app/api/v1/lib/api-key.ts

@@ -0,0 +1,49 @@
+import { apiKeyCache } from "@/lib/cache/api-key";
+import { Prisma } from "@prisma/client";
+import { cache as reactCache } from "react";
+import { prisma } from "@formbricks/database";
+import { cache } from "@formbricks/lib/cache";
+import { getHash } from "@formbricks/lib/crypto";
+import { validateInputs } from "@formbricks/lib/utils/validate";
+import { ZString } from "@formbricks/types/common";
+import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
+
+export const getEnvironmentIdFromApiKey = reactCache(async (apiKey: string): Promise<string | null> => {
+  const hashedKey = getHash(apiKey);
+  return cache(
+    async () => {
+      validateInputs([apiKey, ZString]);
+
+      if (!apiKey) {
+        throw new InvalidInputError("API key cannot be null or undefined.");
+      }
+
+      try {
+        const apiKeyData = await prisma.apiKey.findUnique({
+          where: {
+            hashedKey,
+          },
+          select: {
+            environmentId: true,
+          },
+        });
+
+        if (!apiKeyData) {
+          throw new ResourceNotFoundError("apiKey", apiKey);
+        }
+
+        return apiKeyData.environmentId;
+      } catch (error) {
+        if (error instanceof Prisma.PrismaClientKnownRequestError) {
+          throw new DatabaseError(error.message);
+        }
+
+        throw error;
+      }
+    },
+    [`management-api-getEnvironmentIdFromApiKey-${apiKey}`],
+    {
+      tags: [apiKeyCache.tag.byHashedKey(hashedKey)],
+    }
+  )();
+});

apps/web/app/api/v1/management/action-classes/[actionClassId]/route.ts

@@ -1,7 +1,6 @@
 import { authenticateRequest, handleErrorResponse } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { deleteActionClass, getActionClass, updateActionClass } from "@formbricks/lib/actionClass/service";
 import { logger } from "@formbricks/logger";
 import { TActionClass, ZActionClassInput } from "@formbricks/types/action-classes";
@@ -9,20 +8,15 @@ import { TAuthenticationApiKey } from "@formbricks/types/auth";
 
 const fetchAndAuthorizeActionClass = async (
   authentication: TAuthenticationApiKey,
-  actionClassId: string,
-  method: "GET" | "POST" | "PUT" | "DELETE"
+  actionClassId: string
 ): Promise<TActionClass | null> => {
-  // Get the action class
   const actionClass = await getActionClass(actionClassId);
   if (!actionClass) {
     return null;
   }
-
-  // Check if API key has permission to access this environment with appropriate permissions
-  if (!hasPermission(authentication.environmentPermissions, actionClass.environmentId, method)) {
+  if (actionClass.environmentId !== authentication.environmentId) {
     throw new Error("Unauthorized");
   }
-
   return actionClass;
 };
 
@@ -34,7 +28,7 @@ export const GET = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId, "GET");
+    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId);
     if (actionClass) {
       return responses.successResponse(actionClass);
     }
@@ -52,7 +46,7 @@ export const PUT = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId, "PUT");
+    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId);
     if (!actionClass) {
       return responses.notFoundResponse("Action Class", params.actionClassId);
     }
@@ -94,7 +88,7 @@ export const DELETE = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId, "DELETE");
+    const actionClass = await fetchAndAuthorizeActionClass(authentication, params.actionClassId);
     if (!actionClass) {
       return responses.notFoundResponse("Action Class", params.actionClassId);
     }

apps/web/app/api/v1/management/action-classes/lib/action-classes.test.ts

@@ -1,88 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { prisma } from "@formbricks/database";
-import { DatabaseError } from "@formbricks/types/errors";
-import { getActionClasses } from "./action-classes";
-
-// Mock the prisma client
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    actionClass: {
-      findMany: vi.fn(),
-    },
-  },
-}));
-
-describe("getActionClasses", () => {
-  const mockEnvironmentIds = ["env1", "env2"];
-  const mockActionClasses = [
-    {
-      id: "action1",
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      name: "Test Action 1",
-      description: "Test Description 1",
-      type: "click",
-      key: "test-key-1",
-      noCodeConfig: {},
-      environmentId: "env1",
-    },
-    {
-      id: "action2",
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      name: "Test Action 2",
-      description: "Test Description 2",
-      type: "pageview",
-      key: "test-key-2",
-      noCodeConfig: {},
-      environmentId: "env2",
-    },
-  ];
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it("should successfully fetch action classes for given environment IDs", async () => {
-    // Mock the prisma findMany response
-    vi.mocked(prisma.actionClass.findMany).mockResolvedValue(mockActionClasses);
-
-    const result = await getActionClasses(mockEnvironmentIds);
-
-    expect(result).toEqual(mockActionClasses);
-    expect(prisma.actionClass.findMany).toHaveBeenCalledWith({
-      where: {
-        environmentId: { in: mockEnvironmentIds },
-      },
-      select: expect.any(Object),
-      orderBy: {
-        createdAt: "asc",
-      },
-    });
-  });
-
-  it("should throw DatabaseError when prisma query fails", async () => {
-    // Mock the prisma findMany to throw an error
-    vi.mocked(prisma.actionClass.findMany).mockRejectedValue(new Error("Database error"));
-
-    await expect(getActionClasses(mockEnvironmentIds)).rejects.toThrow(DatabaseError);
-  });
-
-  it("should handle empty environment IDs array", async () => {
-    // Mock the prisma findMany response
-    vi.mocked(prisma.actionClass.findMany).mockResolvedValue([]);
-
-    const result = await getActionClasses([]);
-
-    expect(result).toEqual([]);
-    expect(prisma.actionClass.findMany).toHaveBeenCalledWith({
-      where: {
-        environmentId: { in: [] },
-      },
-      select: expect.any(Object),
-      orderBy: {
-        createdAt: "asc",
-      },
-    });
-  });
-});

apps/web/app/api/v1/management/action-classes/lib/action-classes.ts

@@ -1,51 +0,0 @@
-"use server";
-
-import "server-only";
-import { Prisma } from "@prisma/client";
-import { cache as reactCache } from "react";
-import { prisma } from "@formbricks/database";
-import { actionClassCache } from "@formbricks/lib/actionClass/cache";
-import { cache } from "@formbricks/lib/cache";
-import { validateInputs } from "@formbricks/lib/utils/validate";
-import { TActionClass } from "@formbricks/types/action-classes";
-import { ZId } from "@formbricks/types/common";
-import { DatabaseError } from "@formbricks/types/errors";
-
-const selectActionClass = {
-  id: true,
-  createdAt: true,
-  updatedAt: true,
-  name: true,
-  description: true,
-  type: true,
-  key: true,
-  noCodeConfig: true,
-  environmentId: true,
-} satisfies Prisma.ActionClassSelect;
-
-export const getActionClasses = reactCache(
-  async (environmentIds: string[]): Promise<TActionClass[]> =>
-    cache(
-      async () => {
-        validateInputs([environmentIds, ZId.array()]);
-
-        try {
-          return await prisma.actionClass.findMany({
-            where: {
-              environmentId: { in: environmentIds },
-            },
-            select: selectActionClass,
-            orderBy: {
-              createdAt: "asc",
-            },
-          });
-        } catch (error) {
-          throw new DatabaseError(`Database error when fetching actions for environment ${environmentIds}`);
-        }
-      },
-      environmentIds.map((environmentId) => `getActionClasses-management-api-${environmentId}`),
-      {
-        tags: environmentIds.map((environmentId) => actionClassCache.tag.byEnvironmentId(environmentId)),
-      }
-    )()
-);

apps/web/app/api/v1/management/action-classes/route.ts

@@ -1,24 +1,16 @@
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { createActionClass } from "@formbricks/lib/actionClass/service";
+import { createActionClass, getActionClasses } from "@formbricks/lib/actionClass/service";
 import { logger } from "@formbricks/logger";
 import { TActionClass, ZActionClassInput } from "@formbricks/types/action-classes";
 import { DatabaseError } from "@formbricks/types/errors";
-import { getActionClasses } from "./lib/action-classes";
 
 export const GET = async (request: Request) => {
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-
-    const environmentIds = authentication.environmentPermissions.map(
-      (permission) => permission.environmentId
-    );
-
-    const actionClasses = await getActionClasses(environmentIds);
-
+    const actionClasses: TActionClass[] = await getActionClasses(authentication.environmentId!);
     return responses.successResponse(actionClasses);
   } catch (error) {
     if (error instanceof DatabaseError) {
@@ -43,12 +35,6 @@ export const POST = async (request: Request): Promise<Response> => {
 
     const inputValidation = ZActionClassInput.safeParse(actionClassInput);
 
-    const environmentId = actionClassInput.environmentId;
-
-    if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-      return responses.unauthorizedResponse();
-    }
-
     if (!inputValidation.success) {
       return responses.badRequestResponse(
         "Fields are missing or incorrectly formatted",
@@ -57,7 +43,10 @@ export const POST = async (request: Request): Promise<Response> => {
       );
     }
 
-    const actionClass: TActionClass = await createActionClass(environmentId, inputValidation.data);
+    const actionClass: TActionClass = await createActionClass(
+      authentication.environmentId!,
+      inputValidation.data
+    );
     return responses.successResponse(actionClass);
   } catch (error) {
     if (error instanceof DatabaseError) {

apps/web/app/api/v1/management/me/route.ts

@@ -12,56 +12,29 @@ export const GET = async () => {
         hashedKey: hashApiKey(apiKey),
       },
       select: {
-        apiKeyEnvironments: {
+        environment: {
           select: {
-            environment: {
+            id: true,
+            createdAt: true,
+            updatedAt: true,
+            type: true,
+            project: {
               select: {
                 id: true,
-                type: true,
-                createdAt: true,
-                updatedAt: true,
-                projectId: true,
-                widgetSetupCompleted: true,
-                project: {
-                  select: {
-                    id: true,
-                    name: true,
-                  },
-                },
+                name: true,
               },
             },
-            permission: true,
+            appSetupCompleted: true,
           },
         },
       },
     });
-
     if (!apiKeyData) {
       return new Response("Not authenticated", {
         status: 401,
       });
     }
-
-    if (
-      apiKeyData.apiKeyEnvironments.length === 1 &&
-      apiKeyData.apiKeyEnvironments[0].permission === "manage"
-    ) {
-      return Response.json({
-        id: apiKeyData.apiKeyEnvironments[0].environment.id,
-        type: apiKeyData.apiKeyEnvironments[0].environment.type,
-        createdAt: apiKeyData.apiKeyEnvironments[0].environment.createdAt,
-        updatedAt: apiKeyData.apiKeyEnvironments[0].environment.updatedAt,
-        widgetSetupCompleted: apiKeyData.apiKeyEnvironments[0].environment.widgetSetupCompleted,
-        project: {
-          id: apiKeyData.apiKeyEnvironments[0].environment.projectId,
-          name: apiKeyData.apiKeyEnvironments[0].environment.project.name,
-        },
-      });
-    } else {
-      return new Response("You can't use this method with this API key", {
-        status: 400,
-      });
-    }
+    return Response.json(apiKeyData.environment);
   } else {
     const sessionUser = await getSessionUser();
     if (!sessionUser) {

apps/web/app/api/v1/management/responses/[responseId]/route.ts

@@ -1,33 +1,32 @@
 import { authenticateRequest, handleErrorResponse } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
+import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { deleteResponse, getResponse, updateResponse } from "@formbricks/lib/response/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { logger } from "@formbricks/logger";
-import { ZResponseUpdateInput } from "@formbricks/types/responses";
+import { TResponse, ZResponseUpdateInput } from "@formbricks/types/responses";
 
-async function fetchAndAuthorizeResponse(
-  responseId: string,
-  authentication: any,
-  requiredPermission: "GET" | "PUT" | "DELETE"
-) {
+const fetchAndValidateResponse = async (authentication: any, responseId: string): Promise<TResponse> => {
   const response = await getResponse(responseId);
-  if (!response) {
-    return { error: responses.notFoundResponse("Response", responseId) };
+  if (!response || !(await canUserAccessResponse(authentication, response))) {
+    throw new Error("Unauthorized");
   }
+  return response;
+};
 
+const canUserAccessResponse = async (authentication: any, response: TResponse): Promise<boolean> => {
   const survey = await getSurvey(response.surveyId);
-  if (!survey) {
-    return { error: responses.notFoundResponse("Survey", response.surveyId, true) };
-  }
+  if (!survey) return false;
 
-  if (!hasPermission(authentication.environmentPermissions, survey.environmentId, requiredPermission)) {
-    return { error: responses.unauthorizedResponse() };
+  if (authentication.type === "session") {
+    return await hasUserEnvironmentAccess(authentication.session.user.id, survey.environmentId);
+  } else if (authentication.type === "apiKey") {
+    return survey.environmentId === authentication.environmentId;
+  } else {
+    throw Error("Unknown authentication type");
   }
-
-  return { response };
-}
+};
 
 export const GET = async (
   request: Request,
@@ -37,11 +36,11 @@ export const GET = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-
-    const result = await fetchAndAuthorizeResponse(params.responseId, authentication, "GET");
-    if (result.error) return result.error;
-
-    return responses.successResponse(result.response);
+    const response = await fetchAndValidateResponse(authentication, params.responseId);
+    if (response) {
+      return responses.successResponse(response);
+    }
+    return responses.notFoundResponse("Response", params.responseId);
   } catch (error) {
     return handleErrorResponse(error);
   }
@@ -55,10 +54,10 @@ export const DELETE = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-
-    const result = await fetchAndAuthorizeResponse(params.responseId, authentication, "DELETE");
-    if (result.error) return result.error;
-
+    const response = await fetchAndValidateResponse(authentication, params.responseId);
+    if (!response) {
+      return responses.notFoundResponse("Response", params.responseId);
+    }
     const deletedResponse = await deleteResponse(params.responseId);
     return responses.successResponse(deletedResponse);
   } catch (error) {
@@ -74,10 +73,7 @@ export const PUT = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-
-    const result = await fetchAndAuthorizeResponse(params.responseId, authentication, "PUT");
-    if (result.error) return result.error;
-
+    await fetchAndValidateResponse(authentication, params.responseId);
     let responseUpdate;
     try {
       responseUpdate = await request.json();

apps/web/app/api/v1/management/responses/lib/response.ts

@@ -1,8 +1,6 @@
 import "server-only";
 import { Prisma } from "@prisma/client";
-import { cache as reactCache } from "react";
 import { prisma } from "@formbricks/database";
-import { cache } from "@formbricks/lib/cache";
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import {
   getMonthlyOrganizationResponseCount,
@@ -10,13 +8,11 @@ import {
 } from "@formbricks/lib/organization/service";
 import { sendPlanLimitsReachedEventToPosthogWeekly } from "@formbricks/lib/posthogServer";
 import { responseCache } from "@formbricks/lib/response/cache";
-import { getResponseContact } from "@formbricks/lib/response/service";
 import { calculateTtcTotal } from "@formbricks/lib/response/utils";
 import { responseNoteCache } from "@formbricks/lib/responseNote/cache";
 import { captureTelemetry } from "@formbricks/lib/telemetry";
 import { validateInputs } from "@formbricks/lib/utils/validate";
 import { logger } from "@formbricks/logger";
-import { ZId, ZOptionalNumber } from "@formbricks/types/common";
 import { TContactAttributes } from "@formbricks/types/contact-attribute";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
@@ -29,7 +25,6 @@ export const responseSelection = {
   updatedAt: true,
   surveyId: true,
   finished: true,
-  endingId: true,
   data: true,
   meta: true,
   ttc: true,
@@ -198,53 +193,3 @@ export const createResponse = async (responseInput: TResponseInput): Promise<TRe
     throw error;
   }
 };
-
-export const getResponsesByEnvironmentIds = reactCache(
-  async (environmentIds: string[], limit?: number, offset?: number): Promise<TResponse[]> =>
-    cache(
-      async () => {
-        validateInputs([environmentIds, ZId.array()], [limit, ZOptionalNumber], [offset, ZOptionalNumber]);
-        try {
-          const responses = await prisma.response.findMany({
-            where: {
-              survey: {
-                environmentId: { in: environmentIds },
-              },
-            },
-            select: responseSelection,
-            orderBy: [
-              {
-                createdAt: "desc",
-              },
-            ],
-            take: limit ? limit : undefined,
-            skip: offset ? offset : undefined,
-          });
-
-          const transformedResponses: TResponse[] = await Promise.all(
-            responses.map((responsePrisma) => {
-              return {
-                ...responsePrisma,
-                contact: getResponseContact(responsePrisma),
-                tags: responsePrisma.tags.map((tagPrisma: { tag: TTag }) => tagPrisma.tag),
-              };
-            })
-          );
-
-          return transformedResponses;
-        } catch (error) {
-          if (error instanceof Prisma.PrismaClientKnownRequestError) {
-            throw new DatabaseError(error.message);
-          }
-
-          throw error;
-        }
-      },
-      environmentIds.map(
-        (environmentId) => `getResponses-management-api-${environmentId}-${limit}-${offset}`
-      ),
-      {
-        tags: environmentIds.map((environmentId) => responseCache.tag.byEnvironmentId(environmentId)),
-      }
-    )()
-);

apps/web/app/api/v1/management/responses/route.ts

@@ -1,14 +1,13 @@
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { NextRequest } from "next/server";
-import { getResponses } from "@formbricks/lib/response/service";
+import { getResponses, getResponsesByEnvironmentId } from "@formbricks/lib/response/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { logger } from "@formbricks/logger";
 import { DatabaseError, InvalidInputError } from "@formbricks/types/errors";
 import { TResponse, ZResponseInput } from "@formbricks/types/responses";
-import { createResponse, getResponsesByEnvironmentIds } from "./lib/response";
+import { createResponse } from "./lib/response";
 
 export const GET = async (request: NextRequest) => {
   const searchParams = request.nextUrl.searchParams;
@@ -19,26 +18,14 @@ export const GET = async (request: NextRequest) => {
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    let allResponses: TResponse[] = [];
+    let environmentResponses: TResponse[] = [];
 
     if (surveyId) {
-      const survey = await getSurvey(surveyId);
-      if (!survey) {
-        return responses.notFoundResponse("Survey", surveyId, true);
-      }
-      if (!hasPermission(authentication.environmentPermissions, survey.environmentId, "GET")) {
-        return responses.unauthorizedResponse();
-      }
-      const surveyResponses = await getResponses(surveyId, limit, offset);
-      allResponses.push(...surveyResponses);
+      environmentResponses = await getResponses(surveyId, limit, offset);
     } else {
-      const environmentIds = authentication.environmentPermissions.map(
-        (permission) => permission.environmentId
-      );
-      const environmentResponses = await getResponsesByEnvironmentIds(environmentIds, limit, offset);
-      allResponses.push(...environmentResponses);
+      environmentResponses = await getResponsesByEnvironmentId(authentication.environmentId, limit, offset);
     }
-    return responses.successResponse(allResponses);
+    return responses.successResponse(environmentResponses);
   } catch (error) {
     if (error instanceof DatabaseError) {
       return responses.badRequestResponse(error.message);
@@ -52,6 +39,8 @@ export const POST = async (request: Request): Promise<Response> => {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
 
+    const environmentId = authentication.environmentId;
+
     let jsonInput;
 
     try {
@@ -61,6 +50,9 @@ export const POST = async (request: Request): Promise<Response> => {
       return responses.badRequestResponse("Malformed JSON input, please check your request body");
     }
 
+    // add environmentId to response
+    jsonInput.environmentId = environmentId;
+
     const inputValidation = ZResponseInput.safeParse(jsonInput);
 
     if (!inputValidation.success) {
@@ -73,12 +65,6 @@ export const POST = async (request: Request): Promise<Response> => {
 
     const responseInput = inputValidation.data;
 
-    const environmentId = responseInput.environmentId;
-
-    if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-      return responses.unauthorizedResponse();
-    }
-
     // get and check survey
     const survey = await getSurvey(responseInput.surveyId);
     if (!survey) {

apps/web/app/api/v1/management/surveys/[surveyId]/route.ts

@@ -3,28 +3,21 @@ import { deleteSurvey } from "@/app/api/v1/management/surveys/[surveyId]/lib/sur
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { getMultiLanguagePermission } from "@/modules/ee/license-check/lib/utils";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
 import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
 import { getSurvey, updateSurvey } from "@formbricks/lib/survey/service";
 import { logger } from "@formbricks/logger";
-import { TAuthenticationApiKey } from "@formbricks/types/auth";
-import { ZSurveyUpdateInput } from "@formbricks/types/surveys/types";
+import { TSurvey, ZSurveyUpdateInput } from "@formbricks/types/surveys/types";
 
-const fetchAndAuthorizeSurvey = async (
-  surveyId: string,
-  authentication: TAuthenticationApiKey,
-  requiredPermission: "GET" | "PUT" | "DELETE"
-) => {
+const fetchAndAuthorizeSurvey = async (authentication: any, surveyId: string): Promise<TSurvey | null> => {
   const survey = await getSurvey(surveyId);
   if (!survey) {
-    return { error: responses.notFoundResponse("Survey", surveyId) };
+    return null;
   }
-  if (!hasPermission(authentication.environmentPermissions, survey.environmentId, requiredPermission)) {
-    return { error: responses.unauthorizedResponse() };
+  if (survey.environmentId !== authentication.environmentId) {
+    throw new Error("Unauthorized");
   }
-
-  return { survey };
+  return survey;
 };
 
 export const GET = async (
@@ -35,9 +28,11 @@ export const GET = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const result = await fetchAndAuthorizeSurvey(params.surveyId, authentication, "GET");
-    if (result.error) return result.error;
-    return responses.successResponse(result.survey);
+    const survey = await fetchAndAuthorizeSurvey(authentication, params.surveyId);
+    if (survey) {
+      return responses.successResponse(survey);
+    }
+    return responses.notFoundResponse("Survey", params.surveyId);
   } catch (error) {
     return handleErrorResponse(error);
   }
@@ -51,8 +46,10 @@ export const DELETE = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const result = await fetchAndAuthorizeSurvey(params.surveyId, authentication, "DELETE");
-    if (result.error) return result.error;
+    const survey = await fetchAndAuthorizeSurvey(authentication, params.surveyId);
+    if (!survey) {
+      return responses.notFoundResponse("Survey", params.surveyId);
+    }
     const deletedSurvey = await deleteSurvey(params.surveyId);
     return responses.successResponse(deletedSurvey);
   } catch (error) {
@@ -68,10 +65,13 @@ export const PUT = async (
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const result = await fetchAndAuthorizeSurvey(params.surveyId, authentication, "PUT");
-    if (result.error) return result.error;
 
-    const organization = await getOrganizationByEnvironmentId(result.survey.environmentId);
+    const survey = await fetchAndAuthorizeSurvey(authentication, params.surveyId);
+    if (!survey) {
+      return responses.notFoundResponse("Survey", params.surveyId);
+    }
+
+    const organization = await getOrganizationByEnvironmentId(authentication.environmentId);
     if (!organization) {
       return responses.notFoundResponse("Organization", null);
     }
@@ -85,7 +85,7 @@ export const PUT = async (
     }
 
     const inputValidation = ZSurveyUpdateInput.safeParse({
-      ...result.survey,
+      ...survey,
       ...surveyUpdate,
     });
 

apps/web/app/api/v1/management/surveys/[surveyId]/singleUseIds/route.ts

@@ -1,6 +1,5 @@
 import { authenticateRequest, handleErrorResponse } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { NextRequest } from "next/server";
 import { getSurveyDomain } from "@formbricks/lib/getSurveyUrl";
 import { getSurvey } from "@formbricks/lib/survey/service";
@@ -18,8 +17,8 @@ export const GET = async (
     if (!survey) {
       return responses.notFoundResponse("Survey", params.surveyId);
     }
-    if (!hasPermission(authentication.environmentPermissions, survey.environmentId, "GET")) {
-      return responses.unauthorizedResponse();
+    if (survey.environmentId !== authentication.environmentId) {
+      throw new Error("Unauthorized");
     }
 
     if (!survey.singleUse || !survey.singleUse.enabled) {

apps/web/app/api/v1/management/surveys/lib/surveys.ts

@@ -1,48 +0,0 @@
-import "server-only";
-import { Prisma } from "@prisma/client";
-import { cache as reactCache } from "react";
-import { prisma } from "@formbricks/database";
-import { cache } from "@formbricks/lib/cache";
-import { surveyCache } from "@formbricks/lib/survey/cache";
-import { selectSurvey } from "@formbricks/lib/survey/service";
-import { transformPrismaSurvey } from "@formbricks/lib/survey/utils";
-import { validateInputs } from "@formbricks/lib/utils/validate";
-import { logger } from "@formbricks/logger";
-import { ZOptionalNumber } from "@formbricks/types/common";
-import { ZId } from "@formbricks/types/common";
-import { DatabaseError } from "@formbricks/types/errors";
-import { TSurvey } from "@formbricks/types/surveys/types";
-
-export const getSurveys = reactCache(
-  async (environmentIds: string[], limit?: number, offset?: number): Promise<TSurvey[]> =>
-    cache(
-      async () => {
-        validateInputs([environmentIds, ZId.array()], [limit, ZOptionalNumber], [offset, ZOptionalNumber]);
-
-        try {
-          const surveysPrisma = await prisma.survey.findMany({
-            where: {
-              environmentId: { in: environmentIds },
-            },
-            select: selectSurvey,
-            orderBy: {
-              updatedAt: "desc",
-            },
-            take: limit,
-            skip: offset,
-          });
-          return surveysPrisma.map((surveyPrisma) => transformPrismaSurvey<TSurvey>(surveyPrisma));
-        } catch (error) {
-          if (error instanceof Prisma.PrismaClientKnownRequestError) {
-            logger.error(error, "Error getting surveys");
-            throw new DatabaseError(error.message);
-          }
-          throw error;
-        }
-      },
-      environmentIds.map((environmentId) => `getSurveys-management-api-${environmentId}-${limit}-${offset}`),
-      {
-        tags: environmentIds.map((environmentId) => surveyCache.tag.byEnvironmentId(environmentId)),
-      }
-    )()
-);

apps/web/app/api/v1/management/surveys/route.ts

@@ -2,14 +2,12 @@ import { authenticateRequest } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { getMultiLanguagePermission } from "@/modules/ee/license-check/lib/utils";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
 import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
-import { createSurvey } from "@formbricks/lib/survey/service";
+import { createSurvey, getSurveys } from "@formbricks/lib/survey/service";
 import { logger } from "@formbricks/logger";
 import { DatabaseError } from "@formbricks/types/errors";
-import { ZSurveyCreateInputWithEnvironmentId } from "@formbricks/types/surveys/types";
-import { getSurveys } from "./lib/surveys";
+import { ZSurveyCreateInput } from "@formbricks/types/surveys/types";
 
 export const GET = async (request: Request) => {
   try {
@@ -20,11 +18,7 @@ export const GET = async (request: Request) => {
     const limit = searchParams.has("limit") ? Number(searchParams.get("limit")) : undefined;
     const offset = searchParams.has("offset") ? Number(searchParams.get("offset")) : undefined;
 
-    const environmentIds = authentication.environmentPermissions.map(
-      (permission) => permission.environmentId
-    );
-    const surveys = await getSurveys(environmentIds, limit, offset);
-
+    const surveys = await getSurveys(authentication.environmentId!, limit, offset);
     return responses.successResponse(surveys);
   } catch (error) {
     if (error instanceof DatabaseError) {
@@ -39,6 +33,11 @@ export const POST = async (request: Request): Promise<Response> => {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
 
+    const organization = await getOrganizationByEnvironmentId(authentication.environmentId);
+    if (!organization) {
+      return responses.notFoundResponse("Organization", null);
+    }
+
     let surveyInput;
     try {
       surveyInput = await request.json();
@@ -46,7 +45,8 @@ export const POST = async (request: Request): Promise<Response> => {
       logger.error({ error, url: request.url }, "Error parsing JSON");
       return responses.badRequestResponse("Malformed JSON input, please check your request body");
     }
-    const inputValidation = ZSurveyCreateInputWithEnvironmentId.safeParse(surveyInput);
+
+    const inputValidation = ZSurveyCreateInput.safeParse(surveyInput);
 
     if (!inputValidation.success) {
       return responses.badRequestResponse(
@@ -56,18 +56,8 @@ export const POST = async (request: Request): Promise<Response> => {
       );
     }
 
-    const environmentId = inputValidation.data.environmentId;
-
-    if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-      return responses.unauthorizedResponse();
-    }
-
-    const organization = await getOrganizationByEnvironmentId(environmentId);
-    if (!organization) {
-      return responses.notFoundResponse("Organization", null);
-    }
-
-    const surveyData = { ...inputValidation.data, environmentId };
+    const environmentId = authentication.environmentId;
+    const surveyData = { ...inputValidation.data, environmentId: undefined };
 
     if (surveyData.followUps?.length) {
       const isSurveyFollowUpsEnabled = await getSurveyFollowUpsPermission(organization.billing.plan);
@@ -83,7 +73,7 @@ export const POST = async (request: Request): Promise<Response> => {
       }
     }
 
-    const survey = await createSurvey(environmentId, { ...surveyData, environmentId: undefined });
+    const survey = await createSurvey(environmentId, surveyData);
     return responses.successResponse(survey);
   } catch (error) {
     if (error instanceof DatabaseError) {

apps/web/app/api/v1/webhooks/[webhookId]/route.ts

@@ -1,19 +1,18 @@
-import { authenticateRequest } from "@/app/api/v1/auth";
+import { getEnvironmentIdFromApiKey } from "@/app/api/v1/lib/api-key";
 import { deleteWebhook, getWebhook } from "@/app/api/v1/webhooks/[webhookId]/lib/webhook";
 import { responses } from "@/app/lib/api/response";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { headers } from "next/headers";
 import { logger } from "@formbricks/logger";
 
-export const GET = async (request: Request, props: { params: Promise<{ webhookId: string }> }) => {
+export const GET = async (_: Request, props: { params: Promise<{ webhookId: string }> }) => {
   const params = await props.params;
   const headersList = await headers();
   const apiKey = headersList.get("x-api-key");
   if (!apiKey) {
     return responses.notAuthenticatedResponse();
   }
-  const authentication = await authenticateRequest(request);
-  if (!authentication) {
+  const environmentId = await getEnvironmentIdFromApiKey(apiKey);
+  if (!environmentId) {
     return responses.notAuthenticatedResponse();
   }
 
@@ -22,7 +21,7 @@ export const GET = async (request: Request, props: { params: Promise<{ webhookId
   if (!webhook) {
     return responses.notFoundResponse("Webhook", params.webhookId);
   }
-  if (!hasPermission(authentication.environmentPermissions, webhook.environmentId, "GET")) {
+  if (webhook.environmentId !== environmentId) {
     return responses.unauthorizedResponse();
   }
   return responses.successResponse(webhook);
@@ -35,8 +34,8 @@ export const DELETE = async (request: Request, props: { params: Promise<{ webhoo
   if (!apiKey) {
     return responses.notAuthenticatedResponse();
   }
-  const authentication = await authenticateRequest(request);
-  if (!authentication) {
+  const environmentId = await getEnvironmentIdFromApiKey(apiKey);
+  if (!environmentId) {
     return responses.notAuthenticatedResponse();
   }
 
@@ -45,7 +44,7 @@ export const DELETE = async (request: Request, props: { params: Promise<{ webhoo
   if (!webhook) {
     return responses.notFoundResponse("Webhook", params.webhookId);
   }
-  if (!hasPermission(authentication.environmentPermissions, webhook.environmentId, "DELETE")) {
+  if (webhook.environmentId !== environmentId) {
     return responses.unauthorizedResponse();
   }
 

apps/web/app/api/v1/webhooks/lib/webhook.ts

@@ -8,20 +8,17 @@ import { validateInputs } from "@formbricks/lib/utils/validate";
 import { ZId, ZOptionalNumber } from "@formbricks/types/common";
 import { DatabaseError, InvalidInputError } from "@formbricks/types/errors";
 
-export const createWebhook = async (webhookInput: TWebhookInput): Promise<Webhook> => {
-  validateInputs([webhookInput, ZWebhookInput]);
+export const createWebhook = async (environmentId: string, webhookInput: TWebhookInput): Promise<Webhook> => {
+  validateInputs([environmentId, ZId], [webhookInput, ZWebhookInput]);
 
   try {
     const createdWebhook = await prisma.webhook.create({
       data: {
-        url: webhookInput.url,
-        name: webhookInput.name,
-        source: webhookInput.source,
+        ...webhookInput,
         surveyIds: webhookInput.surveyIds || [],
-        triggers: webhookInput.triggers || [],
         environment: {
           connect: {
-            id: webhookInput.environmentId,
+            id: environmentId,
           },
         },
       },
@@ -40,24 +37,22 @@ export const createWebhook = async (webhookInput: TWebhookInput): Promise<Webhoo
     }
 
     if (!(error instanceof InvalidInputError)) {
-      throw new DatabaseError(
-        `Database error when creating webhook for environment ${webhookInput.environmentId}`
-      );
+      throw new DatabaseError(`Database error when creating webhook for environment ${environmentId}`);
     }
 
     throw error;
   }
 };
 
-export const getWebhooks = (environmentIds: string[], page?: number): Promise<Webhook[]> =>
+export const getWebhooks = (environmentId: string, page?: number): Promise<Webhook[]> =>
   cache(
     async () => {
-      validateInputs([environmentIds, ZId.array()], [page, ZOptionalNumber]);
+      validateInputs([environmentId, ZId], [page, ZOptionalNumber]);
 
       try {
         const webhooks = await prisma.webhook.findMany({
           where: {
-            environmentId: { in: environmentIds },
+            environmentId: environmentId,
           },
           take: page ? ITEMS_PER_PAGE : undefined,
           skip: page ? ITEMS_PER_PAGE * (page - 1) : undefined,
@@ -71,8 +66,8 @@ export const getWebhooks = (environmentIds: string[], page?: number): Promise<We
         throw error;
       }
     },
-    environmentIds.map((environmentId) => `getWebhooks-${environmentId}-${page}`),
+    [`getWebhooks-${environmentId}-${page}`],
     {
-      tags: environmentIds.map((environmentId) => webhookCache.tag.byEnvironmentId(environmentId)),
+      tags: [webhookCache.tag.byEnvironmentId(environmentId)],
     }
   )();

apps/web/app/api/v1/webhooks/route.ts

@@ -1,33 +1,42 @@
-import { authenticateRequest } from "@/app/api/v1/auth";
+import { getEnvironmentIdFromApiKey } from "@/app/api/v1/lib/api-key";
 import { createWebhook, getWebhooks } from "@/app/api/v1/webhooks/lib/webhook";
 import { ZWebhookInput } from "@/app/api/v1/webhooks/types/webhooks";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
+import { headers } from "next/headers";
 import { DatabaseError, InvalidInputError } from "@formbricks/types/errors";
 
-export const GET = async (request: Request) => {
-  const authentication = await authenticateRequest(request);
-  if (!authentication) {
+export const GET = async () => {
+  const headersList = await headers();
+  const apiKey = headersList.get("x-api-key");
+  if (!apiKey) {
     return responses.notAuthenticatedResponse();
   }
+  const environmentId = await getEnvironmentIdFromApiKey(apiKey);
+  if (!environmentId) {
+    return responses.notAuthenticatedResponse();
+  }
+
+  // get webhooks from database
   try {
-    const environmentIds = authentication.environmentPermissions.map(
-      (permission) => permission.environmentId
-    );
-    const webhooks = await getWebhooks(environmentIds);
-    return responses.successResponse(webhooks);
+    const webhooks = await getWebhooks(environmentId);
+    return Response.json({ data: webhooks });
   } catch (error) {
     if (error instanceof DatabaseError) {
-      return responses.internalServerErrorResponse(error.message);
+      return responses.badRequestResponse(error.message);
     }
-    throw error;
+    return responses.internalServerErrorResponse(error.message);
   }
 };
 
 export const POST = async (request: Request) => {
-  const authentication = await authenticateRequest(request);
-  if (!authentication) {
+  const headersList = await headers();
+  const apiKey = headersList.get("x-api-key");
+  if (!apiKey) {
+    return responses.notAuthenticatedResponse();
+  }
+  const environmentId = await getEnvironmentIdFromApiKey(apiKey);
+  if (!environmentId) {
     return responses.notAuthenticatedResponse();
   }
   const webhookInput = await request.json();
@@ -41,19 +50,9 @@ export const POST = async (request: Request) => {
     );
   }
 
-  const environmentId = inputValidation.data.environmentId;
-
-  if (!environmentId) {
-    return responses.badRequestResponse("Environment ID is required");
-  }
-
-  if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-    return responses.unauthorizedResponse();
-  }
-
   // add webhook to database
   try {
-    const webhook = await createWebhook(inputValidation.data);
+    const webhook = await createWebhook(environmentId, inputValidation.data);
     return responses.successResponse(webhook);
   } catch (error) {
     if (error instanceof InvalidInputError) {

apps/web/app/api/v1/webhooks/types/webhooks.ts

@@ -11,7 +11,6 @@ export const ZWebhookInput = ZWebhook.partial({
   surveyIds: true,
   triggers: true,
   url: true,
-  environmentId: true,
 });
 
 export type TWebhookInput = z.infer<typeof ZWebhookInput>;

apps/web/app/api/v2/management/roles/route.ts

@@ -0,0 +1,3 @@
+import { GET } from "@/modules/api/v2/management/roles/route";
+
+export { GET };

apps/web/app/api/v2/management/surveys/[surveyId]/contact-links/segments/[segmentId]/route.ts

@@ -1,3 +0,0 @@
-import { GET } from "@/modules/api/v2/management/surveys/[surveyId]/contact-links/segments/[segmentId]/route";
-
-export { GET };

apps/web/app/api/v2/me/route.ts

@@ -1,3 +0,0 @@
-import { GET } from "@/modules/api/v2/me/route";
-
-export { GET };

apps/web/app/api/v2/organizations/[organizationId]/project-teams/route.ts

@@ -1,3 +0,0 @@
-import { DELETE, GET, POST, PUT } from "@/modules/api/v2/organizations/[organizationId]/project-teams/route";
-
-export { GET, POST, PUT, DELETE };

apps/web/app/api/v2/organizations/[organizationId]/teams/[teamId]/route.ts

@@ -1,3 +0,0 @@
-import { DELETE, GET, PUT } from "@/modules/api/v2/organizations/[organizationId]/teams/[teamId]/route";
-
-export { GET, PUT, DELETE };

apps/web/app/api/v2/organizations/[organizationId]/teams/route.ts

@@ -1,3 +0,0 @@
-import { GET, POST } from "@/modules/api/v2/organizations/[organizationId]/teams/route";
-
-export { GET, POST };

apps/web/app/api/v2/organizations/[organizationId]/users/route.ts

@@ -1,3 +0,0 @@
-import { GET, PATCH, POST } from "@/modules/api/v2/organizations/[organizationId]/users/route";
-
-export { GET, POST, PATCH };

apps/web/app/api/v2/roles/route.ts

@@ -1,3 +0,0 @@
-import { GET } from "@/modules/api/v2/roles/route";
-
-export { GET };

apps/web/app/layout.test.tsx

@@ -40,6 +40,10 @@ vi.mock("@/tolgee/server", () => ({
   getTolgee: vi.fn(),
 }));
 
+vi.mock("@vercel/speed-insights/next", () => ({
+  SpeedInsights: () => <div data-testid="speed-insights">SpeedInsights</div>,
+}));
+
 vi.mock("@/modules/ui/components/post-hog-client", () => ({
   PHProvider: ({ children, posthogEnabled }: { children: React.ReactNode; posthogEnabled: boolean }) => (
     <div data-testid="ph-provider">
@@ -97,6 +101,11 @@ describe("RootLayout", () => {
     const element = await RootLayout({ children });
     render(element);
 
+    // log env vercel
+    console.log("vercel", process.env.VERCEL);
+
+    expect(screen.getByTestId("speed-insights")).toBeInTheDocument();
+    expect(screen.getByTestId("ph-provider")).toBeInTheDocument();
     expect(screen.getByTestId("tolgee-next-provider")).toBeInTheDocument();
     expect(screen.getByTestId("sentry-provider")).toBeInTheDocument();
     expect(screen.getByTestId("child")).toHaveTextContent("Child Content");

apps/web/app/layout.tsx

@@ -1,11 +1,13 @@
 import { SentryProvider } from "@/app/sentry/SentryProvider";
+import { PHProvider } from "@/modules/ui/components/post-hog-client";
 import { TolgeeNextProvider } from "@/tolgee/client";
 import { getLocale } from "@/tolgee/language";
 import { getTolgee } from "@/tolgee/server";
 import { TolgeeStaticData } from "@tolgee/react";
+import { SpeedInsights } from "@vercel/speed-insights/next";
 import { Metadata } from "next";
 import React from "react";
-import { SENTRY_DSN } from "@formbricks/lib/constants";
+import { IS_POSTHOG_CONFIGURED, SENTRY_DSN } from "@formbricks/lib/constants";
 import "../modules/ui/globals.css";
 
 export const metadata: Metadata = {
@@ -25,10 +27,13 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
   return (
     <html lang={locale} translate="no">
       <body className="flex h-dvh flex-col transition-all ease-in-out">
+        {process.env.VERCEL === "1" && <SpeedInsights sampleRate={0.1} />}
         <SentryProvider sentryDsn={SENTRY_DSN}>
-          <TolgeeNextProvider language={locale} staticData={staticData as unknown as TolgeeStaticData}>
-            {children}
-          </TolgeeNextProvider>
+          <PHProvider posthogEnabled={IS_POSTHOG_CONFIGURED}>
+            <TolgeeNextProvider language={locale} staticData={staticData as unknown as TolgeeStaticData}>
+              {children}
+            </TolgeeNextProvider>
+          </PHProvider>
         </SentryProvider>
       </body>
     </html>

apps/web/app/lib/formbricks.ts

@@ -1,6 +1,10 @@
 import formbricks from "@formbricks/js";
+import { env } from "@formbricks/lib/env";
 import { FORMBRICKS_LOGGED_IN_WITH_LS } from "@formbricks/lib/localStorage";
 
+export const formbricksEnabled =
+  typeof env.NEXT_PUBLIC_FORMBRICKS_API_HOST && env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID;
+
 export const formbricksLogout = async () => {
   const loggedInWith = localStorage.getItem(FORMBRICKS_LOGGED_IN_WITH_LS);
   localStorage.clear();

apps/web/app/sentry/SentryProvider.test.tsx

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/nextjs";
 import { cleanup, render, screen } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { SentryProvider } from "./SentryProvider";
 
 vi.mock("@sentry/nextjs", async () => {

apps/web/app/sentry/SentryProvider.tsx

@@ -47,8 +47,6 @@ export const SentryProvider = ({ children, sentryDsn }: SentryProviderProps) =>
         },
       });
     }
-    // We only want to run this once
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return <>{children}</>;

apps/web/app/storage/[environmentId]/[accessType]/[fileName]/lib/get-file.ts

@@ -19,7 +19,7 @@ export const getFile = async (
         headers: {
           "Content-Type": metaData.contentType,
           "Content-Disposition": "attachment",
-          "Cache-Control": "public, max-age=300, s-maxage=300, stale-while-revalidate=300",
+          "Cache-Control": "public, max-age=1200, s-maxage=1200, stale-while-revalidate=300",
           Vary: "Accept-Encoding",
         },
       });
@@ -35,7 +35,10 @@ export const getFile = async (
       status: 302,
       headers: {
         Location: signedUrl,
-        "Cache-Control": "public, max-age=300, s-maxage=300, stale-while-revalidate=300",
+        "Cache-Control":
+          accessType === "public"
+            ? `public, max-age=3600, s-maxage=3600, stale-while-revalidate=300`
+            : `public, max-age=600, s-maxage=3600, stale-while-revalidate=300`,
       },
     });
   } catch (error: unknown) {

apps/web/lib/cache/api-key.ts

@@ -2,8 +2,8 @@ import { revalidateTag } from "next/cache";
 
 interface RevalidateProps {
   id?: string;
+  environmentId?: string;
   hashedKey?: string;
-  organizationId?: string;
 }
 
 export const apiKeyCache = {
@@ -11,24 +11,24 @@ export const apiKeyCache = {
     byId(id: string) {
       return `apiKeys-${id}`;
     },
+    byEnvironmentId(environmentId: string) {
+      return `environments-${environmentId}-apiKeys`;
+    },
     byHashedKey(hashedKey: string) {
       return `apiKeys-${hashedKey}-apiKey`;
     },
-    byOrganizationId(organizationId: string) {
-      return `organizations-${organizationId}-apiKeys`;
-    },
   },
-  revalidate({ id, hashedKey, organizationId }: RevalidateProps): void {
+  revalidate({ id, environmentId, hashedKey }: RevalidateProps): void {
     if (id) {
       revalidateTag(this.tag.byId(id));
     }
 
+    if (environmentId) {
+      revalidateTag(this.tag.byEnvironmentId(environmentId));
+    }
+
     if (hashedKey) {
       revalidateTag(this.tag.byHashedKey(hashedKey));
     }
-
-    if (organizationId) {
-      revalidateTag(this.tag.byOrganizationId(organizationId));
-    }
   },
 };

apps/web/lib/utils/helper.ts

@@ -155,7 +155,7 @@ export const getOrganizationIdFromApiKeyId = async (apiKeyId: string) => {
     throw new ResourceNotFoundError("apiKey", apiKeyId);
   }
 
-  return apiKeyFromServer.organizationId;
+  return await getOrganizationIdFromEnvironmentId(apiKeyFromServer.environmentId);
 };
 
 export const getOrganizationIdFromInviteId = async (inviteId: string) => {
@@ -240,6 +240,15 @@ export const getProjectIdFromSegmentId = async (segmentId: string) => {
   return await getProjectIdFromEnvironmentId(segment.environmentId);
 };
 
+export const getProjectIdFromApiKeyId = async (apiKeyId: string) => {
+  const apiKey = await getApiKey(apiKeyId);
+  if (!apiKey) {
+    throw new ResourceNotFoundError("apiKey", apiKeyId);
+  }
+
+  return await getProjectIdFromEnvironmentId(apiKey.environmentId);
+};
+
 export const getProjectIdFromActionClassId = async (actionClassId: string) => {
   const actionClass = await getActionClass(actionClassId);
   if (!actionClass) {

apps/web/lib/utils/services.ts

@@ -51,7 +51,7 @@ export const getActionClass = reactCache(
 );
 
 export const getApiKey = reactCache(
-  async (apiKeyId: string): Promise<{ organizationId: string } | null> =>
+  async (apiKeyId: string): Promise<{ environmentId: string } | null> =>
     cache(
       async () => {
         validateInputs([apiKeyId, ZString]);
@@ -66,7 +66,7 @@ export const getApiKey = reactCache(
               id: apiKeyId,
             },
             select: {
-              organizationId: true,
+              environmentId: true,
             },
           });
 

apps/web/modules/analysis/components/SingleResponseCard/components/RenderResponse.tsx

@@ -67,11 +67,10 @@ export const RenderResponse: React.FC<RenderResponseProps> = ({
       break;
     case TSurveyQuestionTypeEnum.Date:
       if (typeof responseData === "string") {
-        const parsedDate = new Date(responseData);
-
-        const formattedDate = isNaN(parsedDate.getTime()) ? responseData : formatDateWithOrdinal(parsedDate);
-
-        return <p className="ph-no-capture my-1 truncate font-normal text-slate-700">{formattedDate}</p>;
+        const formattedDateString = formatDateWithOrdinal(new Date(responseData));
+        return (
+          <p className="ph-no-capture my-1 truncate font-normal text-slate-700">{formattedDateString}</p>
+        );
       }
       break;
     case TSurveyQuestionTypeEnum.PictureSelection:
@@ -101,7 +100,7 @@ export const RenderResponse: React.FC<RenderResponseProps> = ({
               return (
                 <p
                   key={rowValueInSelectedLanguage}
-                  className="ph-no-capture my-1 font-normal text-slate-700 capitalize">
+                  className="ph-no-capture my-1 font-normal capitalize text-slate-700">
                   {rowValueInSelectedLanguage}:{processResponseData(responseData[rowValueInSelectedLanguage])}
                 </p>
               );

apps/web/modules/api/v2/auth/authenticate-request.ts

@@ -1,34 +0,0 @@
-import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
-import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
-import { getApiKeyWithPermissions } from "@/modules/organization/settings/api-keys/lib/api-key";
-import { TAuthenticationApiKey } from "@formbricks/types/auth";
-import { Result, err, ok } from "@formbricks/types/error-handlers";
-
-export const authenticateRequest = async (
-  request: Request
-): Promise<Result<TAuthenticationApiKey, ApiErrorResponseV2>> => {
-  const apiKey = request.headers.get("x-api-key");
-  if (!apiKey) return err({ type: "unauthorized" });
-
-  const apiKeyData = await getApiKeyWithPermissions(apiKey);
-
-  if (!apiKeyData) return err({ type: "unauthorized" });
-
-  const hashedApiKey = hashApiKey(apiKey);
-
-  const authentication: TAuthenticationApiKey = {
-    type: "apiKey",
-    environmentPermissions: apiKeyData.apiKeyEnvironments.map((env) => ({
-      environmentId: env.environmentId,
-      environmentType: env.environment.type,
-      permission: env.permission,
-      projectId: env.environment.projectId,
-      projectName: env.environment.project.name,
-    })),
-    hashedApiKey,
-    apiKeyId: apiKeyData.id,
-    organizationId: apiKeyData.organizationId,
-    organizationAccess: apiKeyData.organizationAccess,
-  };
-  return ok(authentication);
-};

apps/web/modules/api/v2/auth/tests/authenticate-request.test.ts

@@ -1,114 +0,0 @@
-import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
-import { describe, expect, it, vi } from "vitest";
-import { prisma } from "@formbricks/database";
-import { authenticateRequest } from "../authenticate-request";
-
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    apiKey: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
-    },
-  },
-}));
-
-vi.mock("@/modules/api/v2/management/lib/utils", () => ({
-  hashApiKey: vi.fn(),
-}));
-
-describe("authenticateRequest", () => {
-  it("should return authentication data if apiKey is valid", async () => {
-    const request = new Request("http://localhost", {
-      headers: { "x-api-key": "valid-api-key" },
-    });
-
-    const mockApiKeyData = {
-      id: "api-key-id",
-      organizationId: "org-id",
-      createdAt: new Date(),
-      createdBy: "user-id",
-      lastUsedAt: null,
-      label: "Test API Key",
-      hashedKey: "hashed-api-key",
-      apiKeyEnvironments: [
-        {
-          environmentId: "env-id-1",
-          permission: "manage",
-          environment: {
-            id: "env-id-1",
-            projectId: "project-id-1",
-            type: "development",
-            project: { name: "Project 1" },
-          },
-        },
-        {
-          environmentId: "env-id-2",
-          permission: "read",
-          environment: {
-            id: "env-id-2",
-            projectId: "project-id-2",
-            type: "production",
-            project: { name: "Project 2" },
-          },
-        },
-      ],
-    };
-
-    vi.mocked(hashApiKey).mockReturnValue("hashed-api-key");
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(mockApiKeyData);
-    vi.mocked(prisma.apiKey.update).mockResolvedValue(mockApiKeyData);
-
-    const result = await authenticateRequest(request);
-
-    expect(result.ok).toBe(true);
-    if (result.ok) {
-      expect(result.data).toEqual({
-        type: "apiKey",
-        environmentPermissions: [
-          {
-            environmentId: "env-id-1",
-            permission: "manage",
-            environmentType: "development",
-            projectId: "project-id-1",
-            projectName: "Project 1",
-          },
-          {
-            environmentId: "env-id-2",
-            permission: "read",
-            environmentType: "production",
-            projectId: "project-id-2",
-            projectName: "Project 2",
-          },
-        ],
-        hashedApiKey: "hashed-api-key",
-        apiKeyId: "api-key-id",
-        organizationId: "org-id",
-      });
-    }
-  });
-
-  it("should return unauthorized error if apiKey is not found", async () => {
-    const request = new Request("http://localhost", {
-      headers: { "x-api-key": "invalid-api-key" },
-    });
-    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(null);
-
-    const result = await authenticateRequest(request);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error).toEqual({ type: "unauthorized" });
-    }
-  });
-
-  it("should return unauthorized error if apiKey is missing", async () => {
-    const request = new Request("http://localhost");
-
-    const result = await authenticateRequest(request);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error).toEqual({ type: "unauthorized" });
-    }
-  });
-});

apps/web/modules/api/v2/lib/response.ts

@@ -122,11 +122,9 @@ const notFoundResponse = ({
 const conflictResponse = ({
   cors = false,
   cache = "private, no-store",
-  details = [],
 }: {
   cors?: boolean;
   cache?: string;
-  details?: ApiErrorDetails;
 } = {}) => {
   const headers = {
     ...(cors && corsHeaders),
@@ -138,7 +136,6 @@ const conflictResponse = ({
       error: {
         code: 409,
         message: "Conflict",
-        details,
       },
     },
     {
@@ -235,7 +232,7 @@ const internalServerErrorResponse = ({
 const successResponse = ({
   data,
   meta,
-  cors = true,
+  cors = false,
   cache = "private, no-store",
 }: {
   data: Object;

apps/web/modules/api/v2/lib/tests/response.test.ts

@@ -85,15 +85,13 @@ describe("API Responses", () => {
 
   describe("conflictResponse", () => {
     test("return a 409 response", async () => {
-      const details = [{ field: "resource", issue: "already exists" }];
-      const res = responses.conflictResponse({ details });
+      const res = responses.conflictResponse();
       expect(res.status).toBe(409);
       const body = await res.json();
       expect(body).toEqual({
         error: {
           code: 409,
           message: "Conflict",
-          details,
         },
       });
     });

apps/web/modules/api/v2/lib/utils.ts

@@ -16,7 +16,7 @@ export const handleApiError = (request: Request, err: ApiErrorResponseV2): Respo
     case "not_found":
       return responses.notFoundResponse({ details: err.details });
     case "conflict":
-      return responses.conflictResponse({ details: err.details });
+      return responses.conflictResponse();
     case "unprocessable_entity":
       return responses.unprocessableEntityResponse({ details: err.details });
     case "too_many_requests":

apps/web/modules/api/v2/management/auth/authenticate-request.ts

@@ -0,0 +1,34 @@
+import { getEnvironmentIdFromApiKey } from "@/modules/api/v2/management/lib/api-key";
+import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
+import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { Result, err, ok } from "@formbricks/types/error-handlers";
+
+export const authenticateRequest = async (
+  request: Request
+): Promise<Result<TAuthenticationApiKey, ApiErrorResponseV2>> => {
+  const apiKey = request.headers.get("x-api-key");
+
+  if (apiKey) {
+    const environmentIdResult = await getEnvironmentIdFromApiKey(apiKey);
+    if (!environmentIdResult.ok) {
+      return err(environmentIdResult.error);
+    }
+    const environmentId = environmentIdResult.data;
+    const hashedApiKey = hashApiKey(apiKey);
+    if (environmentId) {
+      const authentication: TAuthenticationApiKey = {
+        type: "apiKey",
+        environmentId,
+        hashedApiKey,
+      };
+      return ok(authentication);
+    }
+    return err({
+      type: "forbidden",
+    });
+  }
+  return err({
+    type: "unauthorized",
+  });
+};

apps/web/modules/api/v2/management/auth/check-authorization.ts

@@ -0,0 +1,18 @@
+import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { Result, err, okVoid } from "@formbricks/types/error-handlers";
+
+export const checkAuthorization = ({
+  authentication,
+  environmentId,
+}: {
+  authentication: TAuthenticationApiKey;
+  environmentId: string;
+}): Result<void, ApiErrorResponseV2> => {
+  if (authentication.type === "apiKey" && authentication.environmentId !== environmentId) {
+    return err({
+      type: "unauthorized",
+    });
+  }
+  return okVoid();
+};

apps/web/modules/api/v2/management/auth/tests/api-wrapper.test.ts

@@ -1,7 +1,7 @@
-import { apiWrapper } from "@/modules/api/v2/auth/api-wrapper";
-import { authenticateRequest } from "@/modules/api/v2/auth/authenticate-request";
 import { checkRateLimitAndThrowError } from "@/modules/api/v2/lib/rate-limit";
 import { handleApiError } from "@/modules/api/v2/lib/utils";
+import { apiWrapper } from "@/modules/api/v2/management/auth/api-wrapper";
+import { authenticateRequest } from "@/modules/api/v2/management/auth/authenticate-request";
 import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
 import { describe, expect, it, vi } from "vitest";
 import { z } from "zod";

apps/web/modules/api/v2/management/auth/tests/authenticate-request.test.ts

@@ -0,0 +1,73 @@
+import { getEnvironmentIdFromApiKey } from "@/modules/api/v2/management/lib/api-key";
+import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
+import { describe, expect, it, vi } from "vitest";
+import { err, ok } from "@formbricks/types/error-handlers";
+import { authenticateRequest } from "../authenticate-request";
+
+vi.mock("@/modules/api/v2/management/lib/api-key", () => ({
+  getEnvironmentIdFromApiKey: vi.fn(),
+}));
+
+vi.mock("@/modules/api/v2/management/lib/utils", () => ({
+  hashApiKey: vi.fn(),
+}));
+
+describe("authenticateRequest", () => {
+  it("should return authentication data if apiKey is valid", async () => {
+    const request = new Request("http://localhost", {
+      headers: { "x-api-key": "valid-api-key" },
+    });
+    vi.mocked(getEnvironmentIdFromApiKey).mockResolvedValue(ok("env-id"));
+    vi.mocked(hashApiKey).mockReturnValue("hashed-api-key");
+
+    const result = await authenticateRequest(request);
+
+    expect(result.ok).toBe(true);
+    if (result.ok) {
+      expect(result.data).toEqual({
+        type: "apiKey",
+        environmentId: "env-id",
+        hashedApiKey: "hashed-api-key",
+      });
+    }
+  });
+
+  it("should return forbidden error if environmentId is not found", async () => {
+    const request = new Request("http://localhost", {
+      headers: { "x-api-key": "invalid-api-key" },
+    });
+    vi.mocked(getEnvironmentIdFromApiKey).mockResolvedValue(err({ type: "forbidden" }));
+
+    const result = await authenticateRequest(request);
+
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error).toEqual({ type: "forbidden" });
+    }
+  });
+
+  it("should return forbidden error if environmentId is empty", async () => {
+    const request = new Request("http://localhost", {
+      headers: { "x-api-key": "invalid-api-key" },
+    });
+    vi.mocked(getEnvironmentIdFromApiKey).mockResolvedValue(ok(""));
+
+    const result = await authenticateRequest(request);
+
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error).toEqual({ type: "forbidden" });
+    }
+  });
+
+  it("should return unauthorized error if apiKey is missing", async () => {
+    const request = new Request("http://localhost");
+
+    const result = await authenticateRequest(request);
+
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error).toEqual({ type: "unauthorized" });
+    }
+  });
+});

apps/web/modules/api/v2/management/auth/tests/check-authorization.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { checkAuthorization } from "../check-authorization";
+
+describe("checkAuthorization", () => {
+  it("should return ok if authentication is valid", () => {
+    const authentication: TAuthenticationApiKey = {
+      type: "apiKey",
+      environmentId: "env-id",
+      hashedApiKey: "hashed-api-key",
+    };
+    const result = checkAuthorization({ authentication, environmentId: "env-id" });
+
+    expect(result.ok).toBe(true);
+  });
+
+  it("should return unauthorized error if environmentId does not match", () => {
+    const authentication: TAuthenticationApiKey = {
+      type: "apiKey",
+      environmentId: "env-id",
+      hashedApiKey: "hashed-api-key",
+    };
+    const result = checkAuthorization({ authentication, environmentId: "different-env-id" });
+
+    expect(result.ok).toBe(false);
+
+    if (!result.ok) {
+      expect(result.error).toEqual({ type: "unauthorized" });
+    }
+  });
+});

apps/web/modules/api/v2/management/contact-attribute-keys/lib/openapi.ts

@@ -7,7 +7,6 @@ import {
   ZContactAttributeKeyInput,
   ZGetContactAttributeKeysFilter,
 } from "@/modules/api/v2/management/contact-attribute-keys/types/contact-attribute-keys";
-import { managementServer } from "@/modules/api/v2/management/lib/openapi";
 import { z } from "zod";
 import { ZodOpenApiOperationObject, ZodOpenApiPathsObject } from "zod-openapi";
 import { ZContactAttributeKey } from "@formbricks/types/contact-attribute-key";
@@ -55,12 +54,10 @@ export const createContactAttributeKeyEndpoint: ZodOpenApiOperationObject = {
 
 export const contactAttributeKeyPaths: ZodOpenApiPathsObject = {
   "/contact-attribute-keys": {
-    servers: managementServer,
     get: getContactAttributeKeysEndpoint,
     post: createContactAttributeKeyEndpoint,
   },
   "/contact-attribute-keys/{id}": {
-    servers: managementServer,
     get: getContactAttributeKeyEndpoint,
     put: updateContactAttributeKeyEndpoint,
     delete: deleteContactAttributeKeyEndpoint,

apps/web/modules/api/v2/management/contact-attributes/lib/openapi.ts

@@ -7,7 +7,6 @@ import {
   ZContactAttributeInput,
   ZGetContactAttributesFilter,
 } from "@/modules/api/v2/management/contact-attributes/types/contact-attributes";
-import { managementServer } from "@/modules/api/v2/management/lib/openapi";
 import { z } from "zod";
 import { ZodOpenApiOperationObject, ZodOpenApiPathsObject } from "zod-openapi";
 import { ZContactAttribute } from "@formbricks/types/contact-attribute";
@@ -55,12 +54,10 @@ export const createContactAttributeEndpoint: ZodOpenApiOperationObject = {
 
 export const contactAttributePaths: ZodOpenApiPathsObject = {
   "/contact-attributes": {
-    servers: managementServer,
     get: getContactAttributesEndpoint,
     post: createContactAttributeEndpoint,
   },
   "/contact-attributes/{id}": {
-    servers: managementServer,
     get: getContactAttributeEndpoint,
     put: updateContactAttributeEndpoint,
     delete: deleteContactAttributeEndpoint,

apps/web/modules/api/v2/management/contacts/lib/openapi.ts

@@ -4,7 +4,6 @@ import {
   updateContactEndpoint,
 } from "@/modules/api/v2/management/contacts/[contactId]/lib/openapi";
 import { ZContactInput, ZGetContactsFilter } from "@/modules/api/v2/management/contacts/types/contacts";
-import { managementServer } from "@/modules/api/v2/management/lib/openapi";
 import { z } from "zod";
 import { ZodOpenApiOperationObject, ZodOpenApiPathsObject } from "zod-openapi";
 import { ZContact } from "@formbricks/database/zod/contact";
@@ -57,12 +56,10 @@ export const createContactEndpoint: ZodOpenApiOperationObject = {
 
 export const contactPaths: ZodOpenApiPathsObject = {
   "/contacts": {
-    servers: managementServer,
     get: getContactsEndpoint,
     post: createContactEndpoint,
   },
   "/contacts/{id}": {
-    servers: managementServer,
     get: getContactEndpoint,
     put: updateContactEndpoint,
     delete: deleteContactEndpoint,

apps/web/modules/api/v2/management/lib/api-key.ts

@@ -0,0 +1,44 @@
+import { apiKeyCache } from "@/lib/cache/api-key";
+import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
+import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
+import { cache as reactCache } from "react";
+import { prisma } from "@formbricks/database";
+import { cache } from "@formbricks/lib/cache";
+import { Result, err, ok } from "@formbricks/types/error-handlers";
+
+export const getEnvironmentIdFromApiKey = reactCache(async (apiKey: string) => {
+  const hashedKey = hashApiKey(apiKey);
+  return cache(
+    async (): Promise<Result<string, ApiErrorResponseV2>> => {
+      if (!apiKey) {
+        return err({
+          type: "bad_request",
+          details: [{ field: "apiKey", issue: "API key cannot be null or undefined." }],
+        });
+      }
+
+      try {
+        const apiKeyData = await prisma.apiKey.findUnique({
+          where: {
+            hashedKey,
+          },
+          select: {
+            environmentId: true,
+          },
+        });
+
+        if (!apiKeyData) {
+          return err({ type: "not_found", details: [{ field: "apiKey", issue: "not found" }] });
+        }
+
+        return ok(apiKeyData.environmentId);
+      } catch (error) {
+        return err({ type: "internal_server_error", details: [{ field: "apiKey", issue: error.message }] });
+      }
+    },
+    [`management-api-getEnvironmentIdFromApiKey-${hashedKey}`],
+    {
+      tags: [apiKeyCache.tag.byHashedKey(hashedKey)],
+    }
+  )();
+});

apps/web/modules/api/v2/management/lib/openapi.ts

@@ -1,6 +0,0 @@
-export const managementServer = [
-  {
-    url: `https://app.formbricks.com/api/v2/management`,
-    description: "Formbricks Management API",
-  },
-];

apps/web/modules/api/v2/management/lib/tests/api-key.test.ts

@@ -0,0 +1,81 @@
+import { apiKey, environmentId } from "./__mocks__/api-key.mock";
+import { getEnvironmentIdFromApiKey } from "@/modules/api/v2/management/lib/api-key";
+import { hashApiKey } from "@/modules/api/v2/management/lib/utils";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    apiKey: {
+      findUnique: vi.fn(),
+    },
+  },
+}));
+
+vi.mock("@/modules/api/v2/management/lib/utils", () => ({
+  hashApiKey: vi.fn((input: string) => `hashed-${input}`),
+}));
+
+describe("getEnvironmentIdFromApiKey", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns a bad_request error if apiKey is empty", async () => {
+    const result = await getEnvironmentIdFromApiKey("");
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error.type).toBe("bad_request");
+      expect(result.error.details).toEqual([
+        { field: "apiKey", issue: "API key cannot be null or undefined." },
+      ]);
+    }
+  });
+
+  test("returns a not_found error when no apiKey record is found in the database", async () => {
+    vi.mocked(hashApiKey).mockImplementation((input: string) => `hashed-${input}`);
+    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue(null);
+
+    const result = await getEnvironmentIdFromApiKey(apiKey);
+    expect(prisma.apiKey.findUnique).toHaveBeenCalledWith({
+      where: { hashedKey: `hashed-${apiKey}` },
+      select: { environmentId: true },
+    });
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error.type).toBe("not_found");
+      expect(result.error.details).toEqual([{ field: "apiKey", issue: "not found" }]);
+    }
+  });
+
+  test("returns ok with environmentId when a valid apiKey record is found", async () => {
+    vi.mocked(hashApiKey).mockImplementation((input: string) => `hashed-${input}`);
+    vi.mocked(prisma.apiKey.findUnique).mockResolvedValue({ environmentId });
+
+    const result = await getEnvironmentIdFromApiKey(apiKey);
+    expect(prisma.apiKey.findUnique).toHaveBeenCalledWith({
+      where: { hashedKey: `hashed-${apiKey}` },
+      select: { environmentId: true },
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) {
+      expect(result.data).toBe(environmentId);
+    }
+  });
+
+  test("returns internal_server_error when an exception occurs during the database lookup", async () => {
+    vi.mocked(hashApiKey).mockImplementation((input: string) => `hashed-${input}`);
+    vi.mocked(prisma.apiKey.findUnique).mockRejectedValue(new Error("Database failure"));
+
+    const result = await getEnvironmentIdFromApiKey(apiKey);
+    expect(prisma.apiKey.findUnique).toHaveBeenCalledWith({
+      where: { hashedKey: `hashed-${apiKey}` },
+      select: { environmentId: true },
+    });
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error.type).toBe("internal_server_error");
+      expect(result.error.details).toEqual([{ field: "apiKey", issue: "Database failure" }]);
+    }
+  });
+});

apps/web/modules/api/v2/management/lib/utils.ts

@@ -9,12 +9,7 @@ export function pickCommonFilter<T extends TGetFilter>(params: T) {
   return { limit, skip, sortBy, order, startDate, endDate };
 }
 
-type HasFindMany =
-  | Prisma.WebhookFindManyArgs
-  | Prisma.ResponseFindManyArgs
-  | Prisma.TeamFindManyArgs
-  | Prisma.ProjectTeamFindManyArgs
-  | Prisma.UserFindManyArgs;
+type HasFindMany = Prisma.WebhookFindManyArgs | Prisma.ResponseFindManyArgs;
 
 export function buildCommonFilterQuery<T extends HasFindMany>(query: T, params: TGetFilter): T {
   const { limit, skip, sortBy, order, startDate, endDate } = params || {};

apps/web/modules/api/v2/management/responses/[responseId]/lib/openapi.ts

@@ -1,4 +1,4 @@
-import { ZResponseIdSchema } from "@/modules/api/v2/management/responses/[responseId]/types/responses";
+import { responseIdSchema } from "@/modules/api/v2/management/responses/[responseId]/types/responses";
 import { makePartialSchema } from "@/modules/api/v2/types/openapi-response";
 import { z } from "zod";
 import { ZodOpenApiOperationObject } from "zod-openapi";
@@ -11,7 +11,7 @@ export const getResponseEndpoint: ZodOpenApiOperationObject = {
   description: "Gets a response from the database.",
   requestParams: {
     path: z.object({
-      id: ZResponseIdSchema,
+      id: responseIdSchema,
     }),
   },
   tags: ["Management API > Responses"],
@@ -34,7 +34,7 @@ export const deleteResponseEndpoint: ZodOpenApiOperationObject = {
   tags: ["Management API > Responses"],
   requestParams: {
     path: z.object({
-      id: ZResponseIdSchema,
+      id: responseIdSchema,
     }),
   },
   responses: {
@@ -56,7 +56,7 @@ export const updateResponseEndpoint: ZodOpenApiOperationObject = {
   tags: ["Management API > Responses"],
   requestParams: {
     path: z.object({
-      id: ZResponseIdSchema,
+      id: responseIdSchema,
     }),
   },
   requestBody: {

apps/web/modules/api/v2/management/responses/[responseId]/lib/response.ts

@@ -1,7 +1,7 @@
 import { deleteDisplay } from "@/modules/api/v2/management/responses/[responseId]/lib/display";
 import { getSurveyQuestions } from "@/modules/api/v2/management/responses/[responseId]/lib/survey";
 import { findAndDeleteUploadedFilesInResponse } from "@/modules/api/v2/management/responses/[responseId]/lib/utils";
-import { ZResponseUpdateSchema } from "@/modules/api/v2/management/responses/[responseId]/types/responses";
+import { responseUpdateSchema } from "@/modules/api/v2/management/responses/[responseId]/types/responses";
 import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
 import { Response } from "@prisma/client";
 import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
@@ -98,7 +98,7 @@ export const deleteResponse = async (responseId: string): Promise<Result<Respons
 
 export const updateResponse = async (
   responseId: string,
-  responseInput: z.infer<typeof ZResponseUpdateSchema>
+  responseInput: z.infer<typeof responseUpdateSchema>
 ): Promise<Result<Response, ApiErrorResponseV2>> => {
   try {
     const updatedResponse = await prisma.response.update({

apps/web/modules/api/v2/management/responses/[responseId]/route.ts

@@ -1,21 +1,21 @@
-import { authenticatedApiClient } from "@/modules/api/v2/auth/authenticated-api-client";
 import { responses } from "@/modules/api/v2/lib/response";
 import { handleApiError } from "@/modules/api/v2/lib/utils";
+import { authenticatedApiClient } from "@/modules/api/v2/management/auth/authenticated-api-client";
+import { checkAuthorization } from "@/modules/api/v2/management/auth/check-authorization";
 import { getEnvironmentId } from "@/modules/api/v2/management/lib/helper";
 import {
   deleteResponse,
   getResponse,
   updateResponse,
 } from "@/modules/api/v2/management/responses/[responseId]/lib/response";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
 import { z } from "zod";
-import { ZResponseIdSchema, ZResponseUpdateSchema } from "./types/responses";
+import { responseIdSchema, responseUpdateSchema } from "./types/responses";
 
 export const GET = async (request: Request, props: { params: Promise<{ responseId: string }> }) =>
   authenticatedApiClient({
     request,
     schemas: {
-      params: z.object({ responseId: ZResponseIdSchema }),
+      params: z.object({ responseId: responseIdSchema }),
     },
     externalParams: props.params,
     handler: async ({ authentication, parsedInput }) => {
@@ -33,10 +33,13 @@ export const GET = async (request: Request, props: { params: Promise<{ responseI
         return handleApiError(request, environmentIdResult.error);
       }
 
-      if (!hasPermission(authentication.environmentPermissions, environmentIdResult.data, "GET")) {
-        return handleApiError(request, {
-          type: "unauthorized",
-        });
+      const checkAuthorizationResult = await checkAuthorization({
+        authentication,
+        environmentId: environmentIdResult.data,
+      });
+
+      if (!checkAuthorizationResult.ok) {
+        return handleApiError(request, checkAuthorizationResult.error);
       }
 
       const response = await getResponse(params.responseId);
@@ -52,7 +55,7 @@ export const DELETE = async (request: Request, props: { params: Promise<{ respon
   authenticatedApiClient({
     request,
     schemas: {
-      params: z.object({ responseId: ZResponseIdSchema }),
+      params: z.object({ responseId: responseIdSchema }),
     },
     externalParams: props.params,
     handler: async ({ authentication, parsedInput }) => {
@@ -70,10 +73,13 @@ export const DELETE = async (request: Request, props: { params: Promise<{ respon
         return handleApiError(request, environmentIdResult.error);
       }
 
-      if (!hasPermission(authentication.environmentPermissions, environmentIdResult.data, "DELETE")) {
-        return handleApiError(request, {
-          type: "unauthorized",
-        });
+      const checkAuthorizationResult = await checkAuthorization({
+        authentication,
+        environmentId: environmentIdResult.data,
+      });
+
+      if (!checkAuthorizationResult.ok) {
+        return handleApiError(request, checkAuthorizationResult.error);
       }
 
       const response = await deleteResponse(params.responseId);
@@ -91,8 +97,8 @@ export const PUT = (request: Request, props: { params: Promise<{ responseId: str
     request,
     externalParams: props.params,
     schemas: {
-      params: z.object({ responseId: ZResponseIdSchema }),
-      body: ZResponseUpdateSchema,
+      params: z.object({ responseId: responseIdSchema }),
+      body: responseUpdateSchema,
     },
     handler: async ({ authentication, parsedInput }) => {
       const { body, params } = parsedInput;
@@ -109,10 +115,13 @@ export const PUT = (request: Request, props: { params: Promise<{ responseId: str
         return handleApiError(request, environmentIdResult.error);
       }
 
-      if (!hasPermission(authentication.environmentPermissions, environmentIdResult.data, "PUT")) {
-        return handleApiError(request, {
-          type: "unauthorized",
-        });
+      const checkAuthorizationResult = await checkAuthorization({
+        authentication,
+        environmentId: environmentIdResult.data,
+      });
+
+      if (!checkAuthorizationResult.ok) {
+        return handleApiError(request, checkAuthorizationResult.error);
       }
 
       const response = await updateResponse(params.responseId, body);

apps/web/modules/api/v2/management/responses/[responseId]/types/responses.ts

@@ -4,7 +4,7 @@ import { ZResponse } from "@formbricks/database/zod/responses";
 
 extendZodWithOpenApi(z);
 
-export const ZResponseIdSchema = z
+export const responseIdSchema = z
   .string()
   .cuid2()
   .openapi({
@@ -16,7 +16,7 @@ export const ZResponseIdSchema = z
     },
   });
 
-export const ZResponseUpdateSchema = ZResponse.omit({
+export const responseUpdateSchema = ZResponse.omit({
   id: true,
   surveyId: true,
 }).openapi({

apps/web/modules/api/v2/management/responses/lib/openapi.ts

@@ -1,4 +1,3 @@
-import { managementServer } from "@/modules/api/v2/management/lib/openapi";
 import {
   deleteResponseEndpoint,
   getResponseEndpoint,
@@ -6,6 +5,7 @@ import {
 } from "@/modules/api/v2/management/responses/[responseId]/lib/openapi";
 import { ZGetResponsesFilter, ZResponseInput } from "@/modules/api/v2/management/responses/types/responses";
 import { makePartialSchema, responseWithMetaSchema } from "@/modules/api/v2/types/openapi-response";
+import { z } from "zod";
 import { ZodOpenApiOperationObject, ZodOpenApiPathsObject } from "zod-openapi";
 import { ZResponse } from "@formbricks/database/zod/responses";
 
@@ -14,7 +14,7 @@ export const getResponsesEndpoint: ZodOpenApiOperationObject = {
   summary: "Get responses",
   description: "Gets responses from the database.",
   requestParams: {
-    query: ZGetResponsesFilter.sourceType(),
+    query: ZGetResponsesFilter.sourceType().required(),
   },
   tags: ["Management API > Responses"],
   responses: {
@@ -22,7 +22,7 @@ export const getResponsesEndpoint: ZodOpenApiOperationObject = {
       description: "Responses retrieved successfully.",
       content: {
         "application/json": {
-          schema: responseWithMetaSchema(makePartialSchema(ZResponse)),
+          schema: z.array(responseWithMetaSchema(makePartialSchema(ZResponse))),
         },
       },
     },
@@ -57,12 +57,10 @@ export const createResponseEndpoint: ZodOpenApiOperationObject = {
 
 export const responsePaths: ZodOpenApiPathsObject = {
   "/responses": {
-    servers: managementServer,
     get: getResponsesEndpoint,
     post: createResponseEndpoint,
   },
   "/responses/{id}": {
-    servers: managementServer,
     get: getResponseEndpoint,
     put: updateResponseEndpoint,
     delete: deleteResponseEndpoint,

apps/web/modules/api/v2/management/responses/lib/response.ts

@@ -130,18 +130,16 @@ export const createResponse = async (
 };
 
 export const getResponses = async (
-  environmentIds: string[],
+  environmentId: string,
   params: TGetResponsesFilter
 ): Promise<Result<ApiResponseWithMeta<Response[]>, ApiErrorResponseV2>> => {
   try {
-    const query = getResponsesQuery(environmentIds, params);
-
     const [responses, count] = await prisma.$transaction([
       prisma.response.findMany({
-        ...query,
+        ...getResponsesQuery(environmentId, params),
       }),
       prisma.response.count({
-        where: query.where,
+        where: getResponsesQuery(environmentId, params).where,
       }),
     ]);
 

apps/web/modules/api/v2/management/responses/lib/tests/utils.test.ts

@@ -11,12 +11,12 @@ vi.mock("@/modules/api/v2/management/lib/utils", () => ({
 
 describe("getResponsesQuery", () => {
   it("adds surveyId to where clause if provided", () => {
-    const result = getResponsesQuery(["env-id"], { surveyId: "survey123" } as TGetResponsesFilter);
+    const result = getResponsesQuery("env-id", { surveyId: "survey123" } as TGetResponsesFilter);
     expect(result?.where?.surveyId).toBe("survey123");
   });
 
   it("adds contactId to where clause if provided", () => {
-    const result = getResponsesQuery(["env-id"], { contactId: "contact123" } as TGetResponsesFilter);
+    const result = getResponsesQuery("env-id", { contactId: "contact123" } as TGetResponsesFilter);
     expect(result?.where?.contactId).toBe("contact123");
   });
 
@@ -24,12 +24,12 @@ describe("getResponsesQuery", () => {
     vi.mocked(pickCommonFilter).mockReturnValueOnce({ someFilter: true } as any);
     vi.mocked(buildCommonFilterQuery).mockReturnValueOnce({ where: { combined: true } as any });
 
-    const result = getResponsesQuery(["env-id"], { surveyId: "test" } as TGetResponsesFilter);
+    const result = getResponsesQuery("env-id", { surveyId: "test" } as TGetResponsesFilter);
     expect(pickCommonFilter).toHaveBeenCalledWith({ surveyId: "test" });
     expect(buildCommonFilterQuery).toHaveBeenCalledWith(
       expect.objectContaining<Prisma.ResponseFindManyArgs>({
         where: {
-          survey: { environmentId: { in: ["env-id"] } },
+          survey: { environmentId: "env-id" },
           surveyId: "test",
         },
       }),

apps/web/modules/api/v2/management/responses/lib/utils.ts

@@ -2,11 +2,11 @@ import { buildCommonFilterQuery, pickCommonFilter } from "@/modules/api/v2/manag
 import { TGetResponsesFilter } from "@/modules/api/v2/management/responses/types/responses";
 import { Prisma } from "@prisma/client";
 
-export const getResponsesQuery = (environmentIds: string[], params?: TGetResponsesFilter) => {
+export const getResponsesQuery = (environmentId: string, params?: TGetResponsesFilter) => {
   let query: Prisma.ResponseFindManyArgs = {
     where: {
       survey: {
-        environmentId: { in: environmentIds },
+        environmentId,
       },
     },
   };

apps/web/modules/api/v2/management/responses/route.ts

@@ -1,10 +1,9 @@
-import { authenticatedApiClient } from "@/modules/api/v2/auth/authenticated-api-client";
 import { responses } from "@/modules/api/v2/lib/response";
 import { handleApiError } from "@/modules/api/v2/lib/utils";
+import { authenticatedApiClient } from "@/modules/api/v2/management/auth/authenticated-api-client";
+import { checkAuthorization } from "@/modules/api/v2/management/auth/check-authorization";
 import { getEnvironmentId } from "@/modules/api/v2/management/lib/helper";
 import { ZGetResponsesFilter, ZResponseInput } from "@/modules/api/v2/management/responses/types/responses";
-import { hasPermission } from "@/modules/organization/settings/api-keys/lib/utils";
-import { Response } from "@prisma/client";
 import { NextRequest } from "next/server";
 import { createResponse, getResponses } from "./lib/response";
 
@@ -24,20 +23,15 @@ export const GET = async (request: NextRequest) =>
         });
       }
 
-      const environmentIds = authentication.environmentPermissions.map(
-        (permission) => permission.environmentId
-      );
+      const environmentId = authentication.environmentId;
 
-      const environmentResponses: Response[] = [];
-      const res = await getResponses(environmentIds, query);
+      const res = await getResponses(environmentId, query);
 
-      if (!res.ok) {
-        return handleApiError(request, res.error);
+      if (res.ok) {
+        return responses.successResponse(res.data);
       }
 
-      environmentResponses.push(...res.data.data);
-
-      return responses.successResponse({ data: environmentResponses });
+      return handleApiError(request, res.error);
     },
   });
 
@@ -65,10 +59,13 @@ export const POST = async (request: Request) =>
 
       const environmentId = environmentIdResult.data;
 
-      if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-        return handleApiError(request, {
-          type: "unauthorized",
-        });
+      const checkAuthorizationResult = await checkAuthorization({
+        authentication,
+        environmentId,
+      });
+
+      if (!checkAuthorizationResult.ok) {
+        return handleApiError(request, checkAuthorizationResult.error);
       }
 
       // if there is a createdAt but no updatedAt, set updatedAt to createdAt
@@ -81,6 +78,6 @@ export const POST = async (request: Request) =>
         return handleApiError(request, createResponseResult.error);
       }
 
-      return responses.successResponse({ data: createResponseResult.data });
+      return responses.successResponse({ data: createResponseResult.data, cors: true });
     },
   });

apps/web/modules/api/v2/management/roles/lib/openapi.ts

@@ -1,19 +1,18 @@
-import { makePartialSchema } from "@/modules/api/v2/types/openapi-response";
+import { z } from "zod";
 import { ZodOpenApiOperationObject, ZodOpenApiPathsObject } from "zod-openapi";
-import { ZRoles } from "@formbricks/database/zod/roles";
 
 export const getRolesEndpoint: ZodOpenApiOperationObject = {
   operationId: "getRoles",
   summary: "Get roles",
   description: "Gets roles from the database.",
   requestParams: {},
-  tags: ["Roles"],
+  tags: ["Management API > Roles"],
   responses: {
     "200": {
       description: "Roles retrieved successfully.",
       content: {
         "application/json": {
-          schema: makePartialSchema(ZRoles),
+          schema: z.array(z.string()),
         },
       },
     },