Trigger Checks

.codex/environments/environment.toml

@@ -1,9 +0,0 @@
-# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
-version = 1
-name = "formbricks"
-
-[setup]
-script = '''
-pnpm install
-pnpm dev:setup
-'''

.env.example

@@ -94,12 +94,6 @@ EMAIL_VERIFICATION_DISABLED=1
 # Password Reset. If you enable Password Reset functionality you have to setup SMTP-Settings, too.
 PASSWORD_RESET_DISABLED=1
 
-# Password reset token lifetime in minutes. Must be between 5 and 120 if set.
-# PASSWORD_RESET_TOKEN_LIFETIME_MINUTES=30
-
-# Development-only helper: log the password reset link to the server console instead of sending reset emails.
-# DEBUG_SHOW_RESET_LINK=1
-
 # Email login. Disable the ability for users to login with email.
 # EMAIL_AUTH_DISABLED=1
 
@@ -138,31 +132,6 @@ AZUREAD_CLIENT_ID=
 AZUREAD_CLIENT_SECRET=
 AZUREAD_TENANT_ID=
 
-# Configure Formbricks AI at the instance level
-# Set the provider used for AI features on this instance.
-# Accepted values for AI_PROVIDER: aws, gcp, azure
-# Set AI_MODEL to the provider-specific model or deployment name and configure the matching credentials below.
-# AI_PROVIDER=gcp
-# AI_MODEL=gemini-2.5-flash
-
-# Google Vertex AI credentials
-# AI_GCP_PROJECT=
-# AI_GCP_LOCATION=
-# AI_GCP_CREDENTIALS_JSON=
-# AI_GCP_APPLICATION_CREDENTIALS=
-
-# Amazon Bedrock credentials
-# AI_AWS_REGION=
-# AI_AWS_ACCESS_KEY_ID=
-# AI_AWS_SECRET_ACCESS_KEY=
-# AI_AWS_SESSION_TOKEN=
-
-# Azure AI / Microsoft Foundry credentials
-# AI_AZURE_BASE_URL=
-# AI_AZURE_RESOURCE_NAME=
-# AI_AZURE_API_KEY=
-# AI_AZURE_API_VERSION=v1
-
 # OpenID Connect (OIDC) configuration
 # OIDC_CLIENT_ID=
 # OIDC_CLIENT_SECRET=
@@ -216,14 +185,6 @@ ENTERPRISE_LICENSE_KEY=
 # Ignore Rate Limiting across the Formbricks app
 # RATE_LIMITING_DISABLED=1
 
-# Disable telemetry reporting (usage stats sent to Formbricks). Ignored when an EE license is active.
-# TELEMETRY_DISABLED=1
-
-# Allow webhook URLs to point to internal/private network addresses (e.g. localhost, 192.168.x.x)
-# WARNING: Only enable this if you understand the SSRF risks. Useful for self-hosted instances
-# that need to send webhooks to internal services.
-# DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS=1
-
 # OpenTelemetry OTLP endpoint (base URL, exporters append /v1/traces and /v1/metrics)
 # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
 # OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf

.gitignore

@@ -45,7 +45,7 @@ yarn-error.log*
 .direnv
 
 # Playwright
-**/test-results/
+/test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/

.husky/pre-commit

@@ -1,13 +1 @@
-#!/usr/bin/env sh
-
-if command -v pnpm >/dev/null 2>&1; then
-  pnpm lint-staged
-elif command -v npm >/dev/null 2>&1; then
-  npm exec --yes pnpm@10.32.1 lint-staged
-elif command -v corepack >/dev/null 2>&1; then
-  corepack pnpm lint-staged
-else
-  echo "Error: pnpm, npm, and corepack are unavailable in this Git hook PATH."
-  echo "Install Node.js tooling or update your PATH, then retry the commit."
-  exit 127
-fi
+pnpm lint-staged

README.md

@@ -127,10 +127,34 @@ Formbricks has a hosted cloud offering with a generous free plan to get you up a
 
 Formbricks is available Open-Source under AGPLv3 license. You can host Formbricks on your own servers using Docker without a subscription.
 
+If you opt for self-hosting Formbricks, here are a few options to consider:
+
 #### Docker
 
 To get started with self-hosting with Docker, take a look at our [self-hosting docs](https://formbricks.com/docs/self-hosting/deployment).
 
+#### Community-managed One Click Hosting
+
+##### Railway
+
+You can deploy Formbricks on [Railway](https://railway.app) using the button below.
+
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/PPDzCd)
+
+##### RepoCloud
+
+Or you can also deploy Formbricks on [RepoCloud](https://repocloud.io) using the button below.
+
+[![Deploy on RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=254)
+
+##### Zeabur
+
+Or you can also deploy Formbricks on [Zeabur](https://zeabur.com) using the button below.
+
+[![Deploy to Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/G4TUJL)
+
+<a id="development"></a>
+
 ## 👨‍💻 Development
 
 ### Prerequisites
@@ -223,4 +247,4 @@ We currently do not offer Formbricks white-labeled. That means that we don't sel
 
 The Enterprise Edition allows us to fund the development of Formbricks sustainably. It guarantees that the free and open-source surveying infrastructure we're building will be around for decades to come.
 
-<a id="readme-de"></a>
+<p align="right"><a href="#top">🔼 Back to top</a></p>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/page.tsx

@@ -1,6 +1,5 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
 import { getEnvironment } from "@/lib/environment/service";
 import { getPublicDomain } from "@/lib/getPublicUrl";
@@ -21,12 +20,12 @@ const Page = async (props: ConnectPageProps) => {
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   const channel = project.config.channel || null;

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/page.tsx

@@ -1,7 +1,6 @@
 import { XIcon } from "lucide-react";
 import { getServerSession } from "next-auth";
 import Link from "next/link";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { XMTemplateList } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList";
 import { getEnvironment } from "@/lib/environment/service";
 import { getProjectByEnvironmentId, getUserProjects } from "@/lib/project/service";
@@ -24,22 +23,22 @@ const Page = async (props: XMTemplatePageProps) => {
   const environment = await getEnvironment(params.environmentId);
   const t = await getTranslate();
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   const projects = await getUserProjects(session.user.id, organizationId);

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/page.tsx

@@ -26,8 +26,7 @@ const Page = async (props: { params: Promise<{ organizationId: string }> }) => {
   const isMultiOrgEnabled = await getIsMultiOrgEnabled();
 
   const membership = await getMembershipByUserIdOrganizationId(session.user.id, organization.id);
-  const { isMember, isBilling } = getAccessFlags(membership?.role);
-  const isMembershipPending = membership?.role === undefined;
+  const { isMember } = getAccessFlags(membership?.role);
 
   return (
     <div className="flex min-h-full min-w-full flex-row">
@@ -46,8 +45,6 @@ const Page = async (props: { params: Promise<{ organizationId: string }> }) => {
               isOwnerOrManager={false}
               isAccessControlAllowed={false}
               isMember={isMember}
-              isBilling={isBilling}
-              isMembershipPending={isMembershipPending}
               environments={[]}
             />
           </div>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/layout.tsx

@@ -1,6 +1,6 @@
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
-import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { canUserAccessOrganization } from "@/lib/organization/auth";
 import { getOrganization } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
@@ -25,7 +25,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const isAuthorized = await canUserAccessOrganization(session.user.id, params.organizationId);
@@ -36,7 +36,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
 
   return (

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/layout.tsx

@@ -1,6 +1,5 @@
 import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getOrganization } from "@/lib/organization/service";
@@ -29,7 +28,7 @@ const OnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const [organizationProjectsLimit, organizationProjectsCount] = await Promise.all([

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/page.tsx

@@ -1,7 +1,6 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { TProjectConfigChannel, TProjectConfigIndustry, TProjectMode } from "@formbricks/types/project";
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
 import { ProjectSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/ProjectSettings";
@@ -46,7 +45,7 @@ const Page = async (props: ProjectSettingsPageProps) => {
   const isAccessControlAllowed = await getAccessControlPermission(organization.id);
 
   if (!organizationTeams) {
-    throw new ResourceNotFoundError(t("common.team"), null);
+    throw new Error(t("common.organization_teams_not_found"));
   }
 
   const publicDomain = getPublicDomain();

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

@@ -1,5 +1,4 @@
 import { redirect } from "next/navigation";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getEnvironment } from "@/lib/environment/service";
 import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
 
@@ -18,13 +17,13 @@ const SurveyEditorEnvironmentLayout = async (props: {
   }
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   return (

apps/web/app/(app)/environments/[environmentId]/actions.ts

@@ -2,11 +2,7 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import {
-  AuthorizationError,
-  OperationNotAllowedError,
-  ResourceNotFoundError,
-} from "@formbricks/types/errors";
+import { AuthorizationError, OperationNotAllowedError } from "@formbricks/types/errors";
 import { ZProjectUpdateInput } from "@formbricks/types/project";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getOrganization } from "@/lib/organization/service";
@@ -50,7 +46,7 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
     const organization = await getOrganization(organizationId);
 
     if (!organization) {
-      throw new ResourceNotFoundError("Organization", organizationId);
+      throw new Error("Organization not found");
     }
 
     const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);

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

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { MainNavigation } from "@/app/(app)/environments/[environmentId]/components/MainNavigation";
 import { TopControlBar } from "@/app/(app)/environments/[environmentId]/components/TopControlBar";
 import { IS_DEVELOPMENT, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
@@ -43,7 +42,7 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
 
   // Validate that project permission exists for members
   if (isMember && !projectPermission) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_permission_not_found"));
   }
 
   return (
@@ -75,10 +74,6 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
           isDevelopment={IS_DEVELOPMENT}
           membershipRole={membership.role}
           publicDomain={publicDomain}
-          isMultiOrgEnabled={isMultiOrgEnabled}
-          organizationProjectsLimit={organizationProjectsLimit}
-          isLicenseActive={active}
-          isAccessControlAllowed={isAccessControlAllowed}
         />
         <div id="mainContent" className="flex flex-1 flex-col overflow-hidden bg-slate-50">
           <TopControlBar

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

@@ -2,59 +2,42 @@
 
 import {
   ArrowUpRightIcon,
-  Building2Icon,
   ChevronRightIcon,
   Cog,
-  FoldersIcon,
-  Loader2,
   LogOutIcon,
   MessageCircle,
   PanelLeftCloseIcon,
   PanelLeftOpenIcon,
-  PlusIcon,
   RocketIcon,
-  SettingsIcon,
   UserCircleIcon,
   UserIcon,
+  WorkflowIcon,
 } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
-import { useCallback, useEffect, useMemo, useState, useTransition } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TOrganizationRole } from "@formbricks/types/memberships";
 import { TOrganization } from "@formbricks/types/organizations";
 import { TUser } from "@formbricks/types/user";
-import {
-  getOrganizationsForSwitcherAction,
-  getProjectsForSwitcherAction,
-} from "@/app/(app)/environments/[environmentId]/actions";
 import { NavigationLink } from "@/app/(app)/environments/[environmentId]/components/NavigationLink";
 import { isNewerVersion } from "@/app/(app)/environments/[environmentId]/lib/utils";
 import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
-import { getBillingFallbackPath } from "@/lib/membership/navigation";
 import { getAccessFlags } from "@/lib/membership/utils";
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
 import { TrialAlert } from "@/modules/ee/billing/components/trial-alert";
-import { CreateOrganizationModal } from "@/modules/organization/components/CreateOrganizationModal";
-import { CreateProjectModal } from "@/modules/projects/components/create-project-modal";
-import { ProjectLimitModal } from "@/modules/projects/components/project-limit-modal";
 import { getLatestStableFbReleaseAction } from "@/modules/projects/settings/(setup)/app-connection/actions";
 import { ProfileAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
 import {
   DropdownMenu,
-  DropdownMenuCheckboxItem,
   DropdownMenuContent,
-  DropdownMenuGroup,
   DropdownMenuItem,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
-import { ModalButton } from "@/modules/ui/components/upgrade-prompt";
 import packageJson from "../../../../../package.json";
 
 interface NavigationProps {
@@ -66,31 +49,8 @@ interface NavigationProps {
   isDevelopment: boolean;
   membershipRole?: TOrganizationRole;
   publicDomain: string;
-  isMultiOrgEnabled: boolean;
-  organizationProjectsLimit: number;
-  isLicenseActive: boolean;
-  isAccessControlAllowed: boolean;
 }
 
-const isActiveProjectSetting = (pathname: string, settingId: string): boolean => {
-  if (pathname.includes("/settings/")) {
-    return false;
-  }
-
-  const pattern = new RegExp(`/workspace/${settingId}(?:/|$)`);
-  return pattern.test(pathname);
-};
-
-const isActiveOrganizationSetting = (pathname: string, settingId: string): boolean => {
-  const accountSettingsPattern = /\/settings\/(profile|account|notifications|security|appearance)(?:\/|$)/;
-  if (accountSettingsPattern.test(pathname)) {
-    return false;
-  }
-
-  const pattern = new RegExp(`/settings/${settingId}(?:/|$)`);
-  return pattern.test(pathname);
-};
-
 export const MainNavigation = ({
   environment,
   organization,
@@ -100,10 +60,6 @@ export const MainNavigation = ({
   isFormbricksCloud,
   isDevelopment,
   publicDomain,
-  isMultiOrgEnabled,
-  organizationProjectsLimit,
-  isLicenseActive,
-  isAccessControlAllowed,
 }: NavigationProps) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -113,12 +69,7 @@ export const MainNavigation = ({
   const [latestVersion, setLatestVersion] = useState("");
   const { signOut: signOutWithAudit } = useSignOut({ id: user.id, email: user.email });
 
-  const [isPending, startTransition] = useTransition();
-  const { isManager, isOwner, isBilling, isMember } = getAccessFlags(membershipRole);
-  const isMembershipPending = membershipRole === undefined;
-  const disabledNavigationMessage = isMembershipPending
-    ? t("common.loading")
-    : t("common.you_are_not_authorized_to_perform_this_action");
+  const { isManager, isOwner, isBilling } = getAccessFlags(membershipRole);
 
   const isOwnerOrManager = isManager || isOwner;
 
@@ -155,7 +106,6 @@ export const MainNavigation = ({
         icon: MessageCircle,
         isActive: pathname?.includes("/surveys"),
         isHidden: false,
-        disabled: isMembershipPending || isBilling,
       },
       {
         href: `/environments/${environment.id}/contacts`,
@@ -165,17 +115,22 @@ export const MainNavigation = ({
           pathname?.includes("/contacts") ||
           pathname?.includes("/segments") ||
           pathname?.includes("/attributes"),
-        disabled: isMembershipPending || isBilling,
+      },
+      {
+        name: t("common.workflows"),
+        href: `/environments/${environment.id}/workflows`,
+        icon: WorkflowIcon,
+        isActive: pathname?.includes("/workflows"),
+        isHidden: !isFormbricksCloud,
       },
       {
         name: t("common.configuration"),
         href: `/environments/${environment.id}/workspace/general`,
         icon: Cog,
         isActive: pathname?.includes("/workspace"),
-        disabled: isMembershipPending || isBilling,
       },
     ],
-    [t, environment.id, pathname, isMembershipPending, isBilling]
+    [t, environment.id, pathname, isFormbricksCloud]
   );
 
   const dropdownNavigation = [
@@ -198,183 +153,6 @@ export const MainNavigation = ({
     },
   ];
 
-  const [isWorkspaceDropdownOpen, setIsWorkspaceDropdownOpen] = useState(false);
-  const [isOrganizationDropdownOpen, setIsOrganizationDropdownOpen] = useState(false);
-  const [projects, setProjects] = useState<{ id: string; name: string }[]>([]);
-  const [organizations, setOrganizations] = useState<{ id: string; name: string }[]>([]);
-  const [isLoadingProjects, setIsLoadingProjects] = useState(false);
-  const [hasInitializedProjects, setHasInitializedProjects] = useState(false);
-  const [isLoadingOrganizations, setIsLoadingOrganizations] = useState(false);
-  const [workspaceLoadError, setWorkspaceLoadError] = useState<string | null>(null);
-  const [organizationLoadError, setOrganizationLoadError] = useState<string | null>(null);
-  const [openCreateProjectModal, setOpenCreateProjectModal] = useState(false);
-  const [openCreateOrganizationModal, setOpenCreateOrganizationModal] = useState(false);
-  const [openProjectLimitModal, setOpenProjectLimitModal] = useState(false);
-
-  const renderSwitcherError = (error: string, onRetry: () => void, retryLabel: string) => (
-    <div className="px-2 py-4">
-      <p className="mb-2 text-sm text-red-600">{error}</p>
-      <button onClick={onRetry} className="text-xs text-slate-600 underline hover:text-slate-800">
-        {retryLabel}
-      </button>
-    </div>
-  );
-
-  const projectSettings = [
-    {
-      id: "general",
-      label: t("common.general"),
-      href: `/environments/${environment.id}/workspace/general`,
-    },
-    {
-      id: "look",
-      label: t("common.look_and_feel"),
-      href: `/environments/${environment.id}/workspace/look`,
-    },
-    {
-      id: "app-connection",
-      label: t("common.website_and_app_connection"),
-      href: `/environments/${environment.id}/workspace/app-connection`,
-    },
-    {
-      id: "integrations",
-      label: t("common.integrations"),
-      href: `/environments/${environment.id}/workspace/integrations`,
-    },
-    {
-      id: "teams",
-      label: t("common.team_access"),
-      href: `/environments/${environment.id}/workspace/teams`,
-    },
-    {
-      id: "languages",
-      label: t("common.survey_languages"),
-      href: `/environments/${environment.id}/workspace/languages`,
-    },
-    {
-      id: "tags",
-      label: t("common.tags"),
-      href: `/environments/${environment.id}/workspace/tags`,
-    },
-  ];
-
-  const organizationSettings = [
-    {
-      id: "general",
-      label: t("common.general"),
-      href: `/environments/${environment.id}/settings/general`,
-    },
-    {
-      id: "teams",
-      label: t("common.members_and_teams"),
-      href: `/environments/${environment.id}/settings/teams`,
-    },
-    {
-      id: "api-keys",
-      label: t("common.api_keys"),
-      href: `/environments/${environment.id}/settings/api-keys`,
-      hidden: !isOwnerOrManager,
-    },
-    {
-      id: "domain",
-      label: t("common.domain"),
-      href: `/environments/${environment.id}/settings/domain`,
-      hidden: isFormbricksCloud,
-    },
-    {
-      id: "billing",
-      label: t("common.billing"),
-      href: `/environments/${environment.id}/settings/billing`,
-      hidden: !isFormbricksCloud,
-    },
-    {
-      id: "enterprise",
-      label: t("common.enterprise_license"),
-      href: `/environments/${environment.id}/settings/enterprise`,
-      hidden: isFormbricksCloud || isMember,
-    },
-  ];
-
-  const loadProjects = useCallback(async () => {
-    setIsLoadingProjects(true);
-    setWorkspaceLoadError(null);
-
-    try {
-      const result = await getProjectsForSwitcherAction({ organizationId: organization.id });
-      if (result?.data) {
-        const sorted = [...result.data].sort((a, b) => a.name.localeCompare(b.name));
-        setProjects(sorted);
-      } else {
-        setWorkspaceLoadError(getFormattedErrorMessage(result) || t("common.failed_to_load_workspaces"));
-      }
-    } catch (error) {
-      const formattedError =
-        typeof error === "object" && error !== null
-          ? getFormattedErrorMessage(error as { serverError?: string; validationErrors?: unknown })
-          : "";
-      setWorkspaceLoadError(
-        formattedError || (error instanceof Error ? error.message : t("common.failed_to_load_workspaces"))
-      );
-    } finally {
-      setIsLoadingProjects(false);
-      setHasInitializedProjects(true);
-    }
-  }, [organization.id, t]);
-
-  useEffect(() => {
-    if (!isWorkspaceDropdownOpen || projects.length > 0 || isLoadingProjects || workspaceLoadError) {
-      return;
-    }
-
-    loadProjects();
-  }, [isWorkspaceDropdownOpen, projects.length, isLoadingProjects, workspaceLoadError, loadProjects]);
-
-  const loadOrganizations = useCallback(async () => {
-    setIsLoadingOrganizations(true);
-    setOrganizationLoadError(null);
-
-    try {
-      const result = await getOrganizationsForSwitcherAction({ organizationId: organization.id });
-      if (result?.data) {
-        const sorted = [...result.data].sort((a, b) => a.name.localeCompare(b.name));
-        setOrganizations(sorted);
-      } else {
-        setOrganizationLoadError(
-          getFormattedErrorMessage(result) || t("common.failed_to_load_organizations")
-        );
-      }
-    } catch (error) {
-      const formattedError =
-        typeof error === "object" && error !== null
-          ? getFormattedErrorMessage(error as { serverError?: string; validationErrors?: unknown })
-          : "";
-      setOrganizationLoadError(
-        formattedError || (error instanceof Error ? error.message : t("common.failed_to_load_organizations"))
-      );
-    } finally {
-      setIsLoadingOrganizations(false);
-    }
-  }, [organization.id, t]);
-
-  useEffect(() => {
-    if (
-      !isOrganizationDropdownOpen ||
-      organizations.length > 0 ||
-      isLoadingOrganizations ||
-      organizationLoadError
-    ) {
-      return;
-    }
-
-    loadOrganizations();
-  }, [
-    isOrganizationDropdownOpen,
-    organizations.length,
-    isLoadingOrganizations,
-    organizationLoadError,
-    loadOrganizations,
-  ]);
-
   useEffect(() => {
     async function loadReleases() {
       const res = await getLatestStableFbReleaseAction();
@@ -404,79 +182,7 @@ export const MainNavigation = ({
     organization.billing?.stripe?.trialEnd,
   ]);
 
-  const mainNavigationLink = isBilling
-    ? getBillingFallbackPath(environment.id, isFormbricksCloud)
-    : `/environments/${environment.id}/surveys/`;
-
-  const handleProjectChange = (projectId: string) => {
-    if (projectId === project.id) return;
-    startTransition(() => {
-      router.push(`/workspaces/${projectId}/`);
-    });
-  };
-
-  const handleOrganizationChange = (organizationId: string) => {
-    if (organizationId === organization.id) return;
-    startTransition(() => {
-      router.push(`/organizations/${organizationId}/`);
-    });
-  };
-
-  const handleSettingNavigation = (href: string) => {
-    startTransition(() => {
-      router.push(href);
-    });
-  };
-
-  const handleProjectCreate = () => {
-    if (!hasInitializedProjects || isLoadingProjects) {
-      return;
-    }
-
-    if (projects.length >= organizationProjectsLimit) {
-      setOpenProjectLimitModal(true);
-      return;
-    }
-
-    setOpenCreateProjectModal(true);
-  };
-
-  const projectLimitModalButtons = (): [ModalButton, ModalButton] => {
-    if (isFormbricksCloud) {
-      return [
-        {
-          text: t("environments.settings.billing.upgrade"),
-          href: `/environments/${environment.id}/settings/billing`,
-        },
-        {
-          text: t("common.cancel"),
-          onClick: () => setOpenProjectLimitModal(false),
-        },
-      ];
-    }
-
-    return [
-      {
-        text: t("environments.settings.billing.upgrade"),
-        href: isLicenseActive
-          ? `/environments/${environment.id}/settings/enterprise`
-          : "https://formbricks.com/upgrade-self-hosted-license",
-      },
-      {
-        text: t("common.cancel"),
-        onClick: () => setOpenProjectLimitModal(false),
-      },
-    ];
-  };
-
-  const switcherTriggerClasses = cn(
-    "w-full border-t px-3 py-3 text-left transition-colors duration-200 hover:bg-slate-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-500 focus-visible:ring-inset",
-    isCollapsed ? "flex items-center justify-center" : ""
-  );
-
-  const switcherIconClasses =
-    "flex h-9 w-9 items-center justify-center rounded-full bg-slate-100 text-slate-600";
-  const isInitialProjectsLoading = isWorkspaceDropdownOpen && !hasInitializedProjects && !workspaceLoadError;
+  const mainNavigationLink = `/environments/${environment.id}/${isBilling ? "settings/billing/" : "surveys/"}`;
 
   return (
     <>
@@ -516,24 +222,24 @@ export const MainNavigation = ({
             </div>
 
             {/* Main Nav Switch */}
-            <ul>
-              {mainNavigation.map(
-                (item) =>
-                  !item.isHidden && (
-                    <NavigationLink
-                      key={item.name}
-                      href={item.href}
-                      isActive={item.isActive}
-                      isCollapsed={isCollapsed}
-                      isTextVisible={isTextVisible}
-                      disabled={item.disabled}
-                      disabledMessage={item.disabled ? disabledNavigationMessage : undefined}
-                      linkText={item.name}>
-                      <item.icon strokeWidth={1.5} />
-                    </NavigationLink>
-                  )
-              )}
-            </ul>
+            {!isBilling && (
+              <ul>
+                {mainNavigation.map(
+                  (item) =>
+                    !item.isHidden && (
+                      <NavigationLink
+                        key={item.name}
+                        href={item.href}
+                        isActive={item.isActive}
+                        isCollapsed={isCollapsed}
+                        isTextVisible={isTextVisible}
+                        linkText={item.name}>
+                        <item.icon strokeWidth={1.5} />
+                      </NavigationLink>
+                    )
+                )}
+              </ul>
+            )}
           </div>
 
           <div>
@@ -557,210 +263,38 @@ export const MainNavigation = ({
               </Link>
             )}
 
-            <div className="flex flex-col">
-              <DropdownMenu onOpenChange={setIsWorkspaceDropdownOpen}>
-                <DropdownMenuTrigger asChild id="workspaceDropdownTrigger" className={switcherTriggerClasses}>
-                  <button
-                    type="button"
-                    aria-label={isCollapsed ? t("common.change_workspace") : undefined}
-                    className={cn("flex w-full items-center gap-3", isCollapsed && "justify-center")}>
-                    <span className={switcherIconClasses}>
-                      <FoldersIcon className="h-4 w-4" strokeWidth={1.5} />
-                    </span>
-                    {!isCollapsed && !isTextVisible && (
-                      <>
-                        <div className="grow overflow-hidden">
-                          <p className="truncate text-sm font-bold text-slate-700">{project.name}</p>
-                          <p className="text-sm text-slate-500">{t("common.workspace")}</p>
-                        </div>
-                        {isPending && (
-                          <Loader2 className="h-4 w-4 animate-spin text-slate-600" strokeWidth={1.5} />
-                        )}
-                        <ChevronRightIcon className="h-4 w-4 shrink-0 text-slate-600" strokeWidth={1.5} />
-                      </>
-                    )}
-                  </button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent side="right" sideOffset={10} alignOffset={5} align="end">
-                  <div className="px-2 py-1.5 text-sm font-medium text-slate-500">
-                    <FoldersIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
-                    {t("common.change_workspace")}
-                  </div>
-                  {(isLoadingProjects || isInitialProjectsLoading) && (
-                    <div className="flex items-center justify-center py-2">
-                      <Loader2 className="h-4 w-4 animate-spin" />
-                    </div>
-                  )}
-                  {!isLoadingProjects &&
-                    !isInitialProjectsLoading &&
-                    workspaceLoadError &&
-                    renderSwitcherError(
-                      workspaceLoadError,
-                      () => {
-                        setWorkspaceLoadError(null);
-                        setProjects([]);
-                      },
-                      t("common.try_again")
-                    )}
-                  {!isLoadingProjects && !isInitialProjectsLoading && !workspaceLoadError && (
-                    <>
-                      <DropdownMenuGroup className="max-h-[300px] overflow-y-auto">
-                        {projects.map((proj) => (
-                          <DropdownMenuCheckboxItem
-                            key={proj.id}
-                            checked={proj.id === project.id}
-                            onClick={() => handleProjectChange(proj.id)}
-                            className="cursor-pointer">
-                            {proj.name}
-                          </DropdownMenuCheckboxItem>
-                        ))}
-                      </DropdownMenuGroup>
-                      {isOwnerOrManager && (
-                        <DropdownMenuCheckboxItem
-                          onClick={handleProjectCreate}
-                          className="w-full cursor-pointer justify-between">
-                          <span>{t("common.add_new_workspace")}</span>
-                          <PlusIcon className="ml-2 h-4 w-4" strokeWidth={1.5} />
-                        </DropdownMenuCheckboxItem>
-                      )}
-                    </>
-                  )}
-                  <DropdownMenuSeparator />
-                  <DropdownMenuGroup>
-                    <div className="px-2 py-1.5 text-sm font-medium text-slate-500">
-                      <Cog className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
-                      {t("common.workspace_configuration")}
-                    </div>
-                    {projectSettings.map((setting) => (
-                      <DropdownMenuCheckboxItem
-                        key={setting.id}
-                        checked={isActiveProjectSetting(pathname, setting.id)}
-                        onClick={() => handleSettingNavigation(setting.href)}
-                        className="cursor-pointer">
-                        {setting.label}
-                      </DropdownMenuCheckboxItem>
-                    ))}
-                  </DropdownMenuGroup>
-                </DropdownMenuContent>
-              </DropdownMenu>
-
-              <DropdownMenu onOpenChange={setIsOrganizationDropdownOpen}>
-                <DropdownMenuTrigger
-                  asChild
-                  id="organizationDropdownTriggerSidebar"
-                  className={switcherTriggerClasses}>
-                  <button
-                    type="button"
-                    aria-label={isCollapsed ? t("common.change_organization") : undefined}
-                    className={cn("flex w-full items-center gap-3", isCollapsed && "justify-center")}>
-                    <span className={switcherIconClasses}>
-                      <Building2Icon className="h-4 w-4" strokeWidth={1.5} />
-                    </span>
-                    {!isCollapsed && !isTextVisible && (
-                      <>
-                        <div className="grow overflow-hidden">
-                          <p className="truncate text-sm font-bold text-slate-700">{organization.name}</p>
-                          <p className="text-sm text-slate-500">{t("common.organization")}</p>
-                        </div>
-                        {isPending && (
-                          <Loader2 className="h-4 w-4 animate-spin text-slate-600" strokeWidth={1.5} />
-                        )}
-                        <ChevronRightIcon className="h-4 w-4 shrink-0 text-slate-600" strokeWidth={1.5} />
-                      </>
-                    )}
-                  </button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent side="right" sideOffset={10} alignOffset={5} align="end">
-                  <div className="px-2 py-1.5 text-sm font-medium text-slate-500">
-                    <Building2Icon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
-                    {t("common.change_organization")}
-                  </div>
-                  {isLoadingOrganizations && (
-                    <div className="flex items-center justify-center py-2">
-                      <Loader2 className="h-4 w-4 animate-spin" />
-                    </div>
-                  )}
-                  {!isLoadingOrganizations &&
-                    organizationLoadError &&
-                    renderSwitcherError(
-                      organizationLoadError,
-                      () => {
-                        setOrganizationLoadError(null);
-                        setOrganizations([]);
-                      },
-                      t("common.try_again")
-                    )}
-                  {!isLoadingOrganizations && !organizationLoadError && (
-                    <>
-                      <DropdownMenuGroup className="max-h-[300px] overflow-y-auto">
-                        {organizations.map((org) => (
-                          <DropdownMenuCheckboxItem
-                            key={org.id}
-                            checked={org.id === organization.id}
-                            onClick={() => handleOrganizationChange(org.id)}
-                            className="cursor-pointer">
-                            {org.name}
-                          </DropdownMenuCheckboxItem>
-                        ))}
-                      </DropdownMenuGroup>
-                      {isMultiOrgEnabled && (
-                        <DropdownMenuCheckboxItem
-                          onClick={() => setOpenCreateOrganizationModal(true)}
-                          className="w-full cursor-pointer justify-between">
-                          <span>{t("common.create_new_organization")}</span>
-                          <PlusIcon className="ml-2 h-4 w-4" strokeWidth={1.5} />
-                        </DropdownMenuCheckboxItem>
-                      )}
-                    </>
-                  )}
-                  <DropdownMenuSeparator />
-                  <DropdownMenuGroup>
-                    <div className="px-2 py-1.5 text-sm font-medium text-slate-500">
-                      <SettingsIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
-                      {t("common.organization_settings")}
-                    </div>
-                    {organizationSettings.map((setting) => {
-                      if (setting.hidden) return null;
-                      return (
-                        <DropdownMenuCheckboxItem
-                          key={setting.id}
-                          checked={isActiveOrganizationSetting(pathname, setting.id)}
-                          onClick={() => handleSettingNavigation(setting.href)}
-                          className="cursor-pointer">
-                          {setting.label}
-                        </DropdownMenuCheckboxItem>
-                      );
-                    })}
-                  </DropdownMenuGroup>
-                </DropdownMenuContent>
-              </DropdownMenu>
-
+            {/* User Switch */}
+            <div className="flex items-center">
               <DropdownMenu>
                 <DropdownMenuTrigger
                   asChild
                   id="userDropdownTrigger"
-                  className={cn(switcherTriggerClasses, "rounded-br-xl")}>
-                  <button
-                    type="button"
-                    aria-label={isCollapsed ? t("common.account_settings") : undefined}
-                    className={cn("flex w-full items-center gap-3", isCollapsed && "justify-center")}>
-                    <span className={switcherIconClasses}>
-                      <ProfileAvatar userId={user.id} />
-                    </span>
+                  className="w-full rounded-br-xl border-t py-4 transition-colors duration-200 hover:bg-slate-50 focus:outline-none">
+                  <div
+                    className={cn(
+                      "flex cursor-pointer flex-row items-center gap-3",
+                      isCollapsed ? "justify-center px-2" : "px-4"
+                    )}>
+                    <ProfileAvatar userId={user.id} />
                     {!isCollapsed && !isTextVisible && (
                       <>
-                        <div className="grow overflow-hidden">
+                        <div
+                          className={cn(isTextVisible ? "opacity-0" : "opacity-100", "grow overflow-hidden")}>
                           <p
                             title={user?.email}
-                            className="ph-no-capture ph-no-capture -mb-0.5 truncate text-sm font-bold text-slate-700">
+                            className={cn(
+                              "ph-no-capture ph-no-capture -mb-0.5 truncate text-sm font-bold text-slate-700"
+                            )}>
                             {user?.name ? <span>{user?.name}</span> : <span>{user?.email}</span>}
                           </p>
-                          <p className="text-sm text-slate-500">{t("common.account")}</p>
+                          <p className="text-sm text-slate-700">{t("common.account")}</p>
                         </div>
-                        <ChevronRightIcon className="h-4 w-4 shrink-0 text-slate-600" strokeWidth={1.5} />
+                        <ChevronRightIcon
+                          className={cn("h-5 w-5 shrink-0 text-slate-700 hover:text-slate-500")}
+                        />
                       </>
                     )}
-                  </button>
+                  </div>
                 </DropdownMenuTrigger>
 
                 <DropdownMenuContent
@@ -769,6 +303,8 @@ export const MainNavigation = ({
                   sideOffset={10}
                   alignOffset={5}
                   align="end">
+                  {/* Dropdown Items */}
+
                   {dropdownNavigation.map((link) => (
                     <Link
                       href={link.href}
@@ -782,6 +318,7 @@ export const MainNavigation = ({
                       </DropdownMenuItem>
                     </Link>
                   ))}
+                  {/* Logout */}
                   <DropdownMenuItem
                     onClick={async () => {
                       const loginUrl = `${publicDomain}/auth/login`;
@@ -804,28 +341,6 @@ export const MainNavigation = ({
           </div>
         </aside>
       )}
-      {openProjectLimitModal && (
-        <ProjectLimitModal
-          open={openProjectLimitModal}
-          setOpen={setOpenProjectLimitModal}
-          buttons={projectLimitModalButtons()}
-          projectLimit={organizationProjectsLimit}
-        />
-      )}
-      {openCreateProjectModal && (
-        <CreateProjectModal
-          open={openCreateProjectModal}
-          setOpen={setOpenCreateProjectModal}
-          organizationId={organization.id}
-          isAccessControlAllowed={isAccessControlAllowed}
-        />
-      )}
-      {openCreateOrganizationModal && (
-        <CreateOrganizationModal
-          open={openCreateOrganizationModal}
-          setOpen={setOpenCreateOrganizationModal}
-        />
-      )}
     </>
   );
 };

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

@@ -1,7 +1,6 @@
 import Link from "next/link";
 import React from "react";
 import { cn } from "@/lib/cn";
-import { Popover, PopoverContent, PopoverTrigger } from "@/modules/ui/components/popover";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
 
 interface NavigationLinkProps {
@@ -11,8 +10,6 @@ interface NavigationLinkProps {
   children: React.ReactNode;
   linkText: string;
   isTextVisible: boolean;
-  disabled?: boolean;
-  disabledMessage?: string;
 }
 
 export const NavigationLink = ({
@@ -22,34 +19,10 @@ export const NavigationLink = ({
   children,
   linkText,
   isTextVisible = true,
-  disabled = false,
-  disabledMessage,
 }: NavigationLinkProps) => {
-  const tooltipText = disabled ? disabledMessage || linkText : linkText;
   const activeClass = "bg-slate-50 border-r-4 border-brand-dark font-semibold text-slate-900";
   const inactiveClass =
     "hover:bg-slate-50 border-r-4 border-transparent hover:border-slate-300 transition-all duration-150 ease-in-out";
-  const disabledClass = "cursor-not-allowed border-r-4 border-transparent text-slate-400";
-  const getColorClass = (baseClass: string) => {
-    if (disabled) {
-      return disabledClass;
-    }
-
-    return cn(baseClass, isActive ? activeClass : inactiveClass);
-  };
-
-  const collapsedColorClass = getColorClass("text-slate-700 hover:text-slate-900");
-  const expandedColorClass = getColorClass("text-slate-600 hover:text-slate-900");
-
-  const label = (
-    <span
-      className={cn(
-        "ml-2 flex transition-opacity duration-100",
-        isTextVisible ? "opacity-0" : "opacity-100"
-      )}>
-      {linkText}
-    </span>
-  );
 
   return (
     <>
@@ -57,37 +30,35 @@ export const NavigationLink = ({
         <TooltipProvider delayDuration={0}>
           <Tooltip>
             <TooltipTrigger asChild>
-              <li className={cn("mb-1 ml-2 rounded-l-md py-2 pl-2 text-sm", collapsedColorClass)}>
-                {disabled ? (
-                  <div className="flex items-center">{children}</div>
-                ) : (
-                  <Link href={href}>{children}</Link>
-                )}
+              <li
+                className={cn(
+                  "mb-1 ml-2 rounded-l-md py-2 pl-2 text-sm text-slate-700 hover:text-slate-900",
+                  isActive ? activeClass : inactiveClass
+                )}>
+                <Link href={href} className="flex items-center">
+                  {children}
+                </Link>
               </li>
             </TooltipTrigger>
-            <TooltipContent side="right">{tooltipText}</TooltipContent>
+            <TooltipContent side="right">{linkText}</TooltipContent>
           </Tooltip>
         </TooltipProvider>
       ) : (
-        <li className={cn("mb-1 rounded-l-md py-2 pl-5 text-sm", expandedColorClass)}>
-          {disabled ? (
-            <Popover>
-              <PopoverTrigger asChild>
-                <div className="flex items-center">
-                  {children}
-                  {label}
-                </div>
-              </PopoverTrigger>
-              <PopoverContent className="w-fit max-w-72 px-3 py-2 text-sm text-slate-700">
-                {disabledMessage || linkText}
-              </PopoverContent>
-            </Popover>
-          ) : (
-            <Link href={href} className="flex items-center">
-              {children}
-              {label}
-            </Link>
-          )}
+        <li
+          className={cn(
+            "mb-1 rounded-l-md py-2 pl-5 text-sm text-slate-600 hover:text-slate-900",
+            isActive ? activeClass : inactiveClass
+          )}>
+          <Link href={href} className="flex items-center">
+            {children}
+            <span
+              className={cn(
+                "ml-2 flex transition-opacity duration-100",
+                isTextVisible ? "opacity-0" : "opacity-100"
+              )}>
+              {linkText}
+            </span>
+          </Link>
         </li>
       )}
     </>

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

@@ -31,8 +31,7 @@ export const TopControlBar = ({
   isAccessControlAllowed,
   membershipRole,
 }: TopControlBarProps) => {
-  const { isMember, isBilling } = getAccessFlags(membershipRole);
-  const isMembershipPending = membershipRole === undefined;
+  const { isMember } = getAccessFlags(membershipRole);
   const { environment } = useEnvironment();
 
   return (
@@ -50,8 +49,6 @@ export const TopControlBar = ({
         isLicenseActive={isLicenseActive}
         isOwnerOrManager={isOwnerOrManager}
         isMember={isMember}
-        isBilling={isBilling}
-        isMembershipPending={isMembershipPending}
         isAccessControlAllowed={isAccessControlAllowed}
       />
     </div>

apps/web/app/(app)/environments/[environmentId]/components/organization-breadcrumb.tsx

@@ -25,7 +25,6 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
-import { Popover, PopoverContent, PopoverTrigger } from "@/modules/ui/components/popover";
 import { useOrganization } from "../context/environment-context";
 
 interface OrganizationBreadcrumbProps {
@@ -36,7 +35,6 @@ interface OrganizationBreadcrumbProps {
   isFormbricksCloud: boolean;
   isMember: boolean;
   isOwnerOrManager: boolean;
-  isMembershipPending: boolean;
 }
 
 const isActiveOrganizationSetting = (pathname: string, settingId: string): boolean => {
@@ -58,7 +56,6 @@ export const OrganizationBreadcrumb = ({
   isFormbricksCloud,
   isMember,
   isOwnerOrManager,
-  isMembershipPending,
 }: OrganizationBreadcrumbProps) => {
   const { t } = useTranslation();
   const [isOrganizationDropdownOpen, setIsOrganizationDropdownOpen] = useState(false);
@@ -145,10 +142,7 @@ export const OrganizationBreadcrumb = ({
       id: "api-keys",
       label: t("common.api_keys"),
       href: `/environments/${currentEnvironmentId}/settings/api-keys`,
-      disabled: isMembershipPending || !isOwnerOrManager,
-      disabledMessage: isMembershipPending
-        ? t("common.loading")
-        : t("common.you_are_not_authorized_to_perform_this_action"),
+      hidden: !isOwnerOrManager,
     },
     {
       id: "domain",
@@ -166,11 +160,7 @@ export const OrganizationBreadcrumb = ({
       id: "enterprise",
       label: t("common.enterprise_license"),
       href: `/environments/${currentEnvironmentId}/settings/enterprise`,
-      hidden: isFormbricksCloud,
-      disabled: isMembershipPending || isMember,
-      disabledMessage: isMembershipPending
-        ? t("common.loading")
-        : t("common.you_are_not_authorized_to_perform_this_action"),
+      hidden: isFormbricksCloud || isMember,
     },
   ];
 
@@ -252,30 +242,14 @@ export const OrganizationBreadcrumb = ({
 
               {organizationSettings.map((setting) => {
                 return setting.hidden ? null : (
-                  <div key={setting.id}>
-                    {setting.disabled ? (
-                      <Popover>
-                        <PopoverTrigger asChild>
-                          <button
-                            type="button"
-                            aria-disabled="true"
-                            className="relative flex w-full cursor-not-allowed select-none items-center rounded-lg py-1.5 pl-8 pr-2 text-sm font-medium text-slate-400">
-                            {setting.label}
-                          </button>
-                        </PopoverTrigger>
-                        <PopoverContent className="w-fit max-w-72 px-3 py-2 text-sm text-slate-700">
-                          {setting.disabledMessage}
-                        </PopoverContent>
-                      </Popover>
-                    ) : (
-                      <DropdownMenuCheckboxItem
-                        checked={isActiveOrganizationSetting(pathname, setting.id)}
-                        onClick={() => handleSettingChange(setting.href)}
-                        className="cursor-pointer">
-                        {setting.label}
-                      </DropdownMenuCheckboxItem>
-                    )}
-                  </div>
+                  <DropdownMenuCheckboxItem
+                    key={setting.id}
+                    checked={isActiveOrganizationSetting(pathname, setting.id)}
+                    hidden={setting.hidden}
+                    onClick={() => handleSettingChange(setting.href)}
+                    className="cursor-pointer">
+                    {setting.label}
+                  </DropdownMenuCheckboxItem>
                 );
               })}
             </div>

apps/web/app/(app)/environments/[environmentId]/components/project-and-org-switch.tsx

@@ -18,8 +18,6 @@ interface ProjectAndOrgSwitchProps {
   isLicenseActive: boolean;
   isOwnerOrManager: boolean;
   isMember: boolean;
-  isBilling: boolean;
-  isMembershipPending: boolean;
   isAccessControlAllowed: boolean;
 }
 
@@ -37,8 +35,6 @@ export const ProjectAndOrgSwitch = ({
   isOwnerOrManager,
   isAccessControlAllowed,
   isMember,
-  isBilling,
-  isMembershipPending,
 }: ProjectAndOrgSwitchProps) => {
   const currentEnvironment = environments.find((env) => env.id === currentEnvironmentId);
   const showEnvironmentBreadcrumb = currentEnvironment?.type === "development";
@@ -54,7 +50,6 @@ export const ProjectAndOrgSwitch = ({
           isFormbricksCloud={isFormbricksCloud}
           isMember={isMember}
           isOwnerOrManager={isOwnerOrManager}
-          isMembershipPending={isMembershipPending}
         />
         {currentProjectId && currentEnvironmentId && (
           <ProjectBreadcrumb
@@ -68,8 +63,6 @@ export const ProjectAndOrgSwitch = ({
             isLicenseActive={isLicenseActive}
             isAccessControlAllowed={isAccessControlAllowed}
             isEnvironmentBreadcrumbVisible={showEnvironmentBreadcrumb}
-            isBilling={isBilling}
-            isMembershipPending={isMembershipPending}
           />
         )}
         {showEnvironmentBreadcrumb && (

apps/web/app/(app)/environments/[environmentId]/components/project-breadcrumb.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import * as Sentry from "@sentry/nextjs";
-import { ChevronDownIcon, ChevronRightIcon, CogIcon, FoldersIcon, Loader2, PlusIcon } from "lucide-react";
+import { ChevronDownIcon, ChevronRightIcon, CogIcon, HotelIcon, Loader2, PlusIcon } from "lucide-react";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useState, useTransition } from "react";
 import { useTranslation } from "react-i18next";
@@ -19,7 +19,6 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/modules/ui/components/dropdown-menu";
-import { Popover, PopoverContent, PopoverTrigger } from "@/modules/ui/components/popover";
 import { ModalButton } from "@/modules/ui/components/upgrade-prompt";
 import { useProject } from "../context/environment-context";
 
@@ -34,8 +33,6 @@ interface ProjectBreadcrumbProps {
   currentEnvironmentId: string;
   isAccessControlAllowed: boolean;
   isEnvironmentBreadcrumbVisible: boolean;
-  isBilling: boolean;
-  isMembershipPending: boolean;
 }
 
 const isActiveProjectSetting = (pathname: string, settingId: string): boolean => {
@@ -59,8 +56,6 @@ export const ProjectBreadcrumb = ({
   currentEnvironmentId,
   isAccessControlAllowed,
   isEnvironmentBreadcrumbVisible,
-  isBilling,
-  isMembershipPending,
 }: ProjectBreadcrumbProps) => {
   const { t } = useTranslation();
   const [isProjectDropdownOpen, setIsProjectDropdownOpen] = useState(false);
@@ -139,10 +134,6 @@ export const ProjectBreadcrumb = ({
       href: `/environments/${currentEnvironmentId}/workspace/tags`,
     },
   ];
-  const areProjectSettingsDisabled = isMembershipPending || isBilling;
-  const projectSettingsDisabledMessage = isMembershipPending
-    ? t("common.loading")
-    : t("common.you_are_not_authorized_to_perform_this_action");
 
   if (!currentProject) {
     const errorMessage = `Workspace not found for workspace id: ${currentProjectId}`;
@@ -207,7 +198,7 @@ export const ProjectBreadcrumb = ({
           id="projectDropdownTrigger"
           asChild>
           <div className="flex items-center gap-1">
-            <FoldersIcon className="h-3 w-3" strokeWidth={1.5} />
+            <HotelIcon className="h-3 w-3" strokeWidth={1.5} />
             <span>{projectName}</span>
             {isPending && <Loader2 className="h-3 w-3 animate-spin" strokeWidth={1.5} />}
             {isEnvironmentBreadcrumbVisible && !isProjectDropdownOpen ? (
@@ -220,7 +211,7 @@ export const ProjectBreadcrumb = ({
 
         <DropdownMenuContent align="start" className="mt-2">
           <div className="px-2 py-1.5 text-sm font-medium text-slate-500">
-            <FoldersIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
+            <HotelIcon className="mr-2 inline h-4 w-4" strokeWidth={1.5} />
             {t("common.choose_workspace")}
           </div>
           {isLoadingProjects && (
@@ -256,24 +247,7 @@ export const ProjectBreadcrumb = ({
                   </DropdownMenuCheckboxItem>
                 ))}
               </DropdownMenuGroup>
-              {isMembershipPending || !isOwnerOrManager ? (
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <button
-                      type="button"
-                      aria-disabled="true"
-                      className="relative flex w-full cursor-not-allowed select-none items-center justify-between rounded-lg py-1.5 pl-8 pr-2 text-sm font-medium text-slate-400">
-                      <span>{t("common.add_new_workspace")}</span>
-                      <PlusIcon className="ml-2 h-4 w-4" strokeWidth={1.5} />
-                    </button>
-                  </PopoverTrigger>
-                  <PopoverContent className="w-fit max-w-72 px-3 py-2 text-sm text-slate-700">
-                    {isMembershipPending
-                      ? t("common.loading")
-                      : t("common.you_are_not_authorized_to_perform_this_action")}
-                  </PopoverContent>
-                </Popover>
-              ) : (
+              {isOwnerOrManager && (
                 <DropdownMenuCheckboxItem
                   onClick={handleAddProject}
                   className="w-full cursor-pointer justify-between">
@@ -290,30 +264,13 @@ export const ProjectBreadcrumb = ({
               {t("common.workspace_configuration")}
             </div>
             {projectSettings.map((setting) => (
-              <div key={setting.id}>
-                {areProjectSettingsDisabled ? (
-                  <Popover>
-                    <PopoverTrigger asChild>
-                      <button
-                        type="button"
-                        aria-disabled="true"
-                        className="relative flex w-full cursor-not-allowed select-none items-center rounded-lg py-1.5 pl-8 pr-2 text-sm font-medium text-slate-400">
-                        {setting.label}
-                      </button>
-                    </PopoverTrigger>
-                    <PopoverContent className="w-fit max-w-72 px-3 py-2 text-sm text-slate-700">
-                      {projectSettingsDisabledMessage}
-                    </PopoverContent>
-                  </Popover>
-                ) : (
-                  <DropdownMenuCheckboxItem
-                    checked={isActiveProjectSetting(pathname, setting.id)}
-                    onClick={() => handleProjectSettingsNavigation(setting.id)}
-                    className="cursor-pointer">
-                    {setting.label}
-                  </DropdownMenuCheckboxItem>
-                )}
-              </div>
+              <DropdownMenuCheckboxItem
+                key={setting.id}
+                checked={isActiveProjectSetting(pathname, setting.id)}
+                onClick={() => handleProjectSettingsNavigation(setting.id)}
+                className="cursor-pointer">
+                {setting.label}
+              </DropdownMenuCheckboxItem>
             ))}
           </DropdownMenuGroup>
         </DropdownMenuContent>

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

@@ -1,6 +1,5 @@
 import { redirect } from "next/navigation";
 import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
-import { getBillingFallbackPath } from "@/lib/membership/navigation";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
@@ -13,7 +12,11 @@ const EnvironmentPage = async (props: { params: Promise<{ environmentId: string
   const { isBilling } = getAccessFlags(currentUserMembership?.role);
 
   if (isBilling) {
-    return redirect(getBillingFallbackPath(params.environmentId, IS_FORMBRICKS_CLOUD));
+    if (IS_FORMBRICKS_CLOUD) {
+      return redirect(`/environments/${params.environmentId}/settings/billing`);
+    } else {
+      return redirect(`/environments/${params.environmentId}/settings/enterprise`);
+    }
   }
 
   return redirect(`/environments/${params.environmentId}/surveys`);

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

@@ -1,5 +1,4 @@
 import { getServerSession } from "next-auth";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -21,15 +20,15 @@ const AccountSettingsLayout = async (props: {
   ]);
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   return <>{children}</>;

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/page.tsx

@@ -1,6 +1,5 @@
 import { getServerSession } from "next-auth";
 import { prisma } from "@formbricks/database";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TUserNotificationSettings } from "@formbricks/types/user";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
@@ -147,18 +146,18 @@ const Page = async (props: {
   const t = await getTranslate();
   const session = await getServerSession(authOptions);
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
   const autoDisableNotificationType = searchParams["type"];
   const autoDisableNotificationElementId = searchParams["elementId"];
 
   const [user, memberships] = await Promise.all([getUser(session.user.id), getMemberships(session.user.id)]);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   if (!memberships) {
-    throw new ResourceNotFoundError(t("common.membership"), null);
+    throw new Error(t("common.membership_not_found"));
   }
 
   if (user?.notificationSettings) {

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts

@@ -10,16 +10,15 @@ import {
   getIsEmailUnique,
   verifyUserPassword,
 } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/lib/user";
-import { EMAIL_VERIFICATION_DISABLED, PASSWORD_RESET_DISABLED } from "@/lib/constants";
+import { EMAIL_VERIFICATION_DISABLED } from "@/lib/constants";
 import { getUser, updateUser } from "@/lib/user/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
-import { requestPasswordReset } from "@/modules/auth/forgot-password/lib/password-reset-service";
 import { updateBrevoCustomer } from "@/modules/auth/lib/brevo";
 import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
-import { sendVerificationNewEmail } from "@/modules/email";
+import { sendForgotPasswordEmail, sendVerificationNewEmail } from "@/modules/email";
 
 function buildUserUpdatePayload(parsedInput: TUserPersonalInfoUpdateInput): TUserUpdateInput {
   return {
@@ -86,15 +85,11 @@ export const updateUserAction = authenticatedActionClient.inputSchema(ZUserPerso
 
 export const resetPasswordAction = authenticatedActionClient.action(
   withAuditLogging("passwordReset", "user", async ({ ctx }) => {
-    if (PASSWORD_RESET_DISABLED) {
-      throw new OperationNotAllowedError("Password reset is disabled");
-    }
-
     if (ctx.user.identityProvider !== "email") {
       throw new OperationNotAllowedError("Password reset is not allowed for this user.");
     }
 
-    await requestPasswordReset(ctx.user, "profile");
+    await sendForgotPasswordEmail(ctx.user);
 
     ctx.auditLoggingCtx.userId = ctx.user.id;
 

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/EditProfileDetailsForm.tsx

@@ -116,14 +116,10 @@ export const EditProfileDetailsForm = ({
       setShowModal(true);
     } else {
       try {
-        const result = await updateUserAction({
+        await updateUserAction({
           ...data,
           name: data.name.trim(),
         });
-        if (result?.serverError) {
-          toast.error(getFormattedErrorMessage(result));
-          return;
-        }
         toast.success(t("environments.settings.profile.profile_updated_successfully"));
         window.location.reload();
         form.reset(data);

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/page.tsx

@@ -1,4 +1,3 @@
-import { AuthenticationError } from "@formbricks/types/errors";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { AccountSecurity } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity";
 import { EMAIL_VERIFICATION_DISABLED, IS_FORMBRICKS_CLOUD, PASSWORD_RESET_DISABLED } from "@/lib/constants";
@@ -29,7 +28,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const user = session?.user ? await getUser(session.user.id) : null;
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const isPasswordResetEnabled = !PASSWORD_RESET_DISABLED && user.identityProvider === "email";

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

@@ -22,9 +22,8 @@ export const OrganizationSettingsNavbar = ({
   loading,
 }: OrganizationSettingsNavbarProps) => {
   const pathname = usePathname();
-  const { isMember, isOwner, isManager } = getAccessFlags(membershipRole);
-  const isOwnerOrManager = isOwner || isManager;
-  const isMembershipPending = membershipRole === undefined || loading;
+  const { isMember, isOwner } = getAccessFlags(membershipRole);
+  const isPricingDisabled = isMember;
   const { t } = useTranslation();
 
   const navigation = [
@@ -46,10 +45,7 @@ export const OrganizationSettingsNavbar = ({
       label: t("common.api_keys"),
       href: `/environments/${environmentId}/settings/api-keys`,
       current: pathname?.includes("/api-keys"),
-      disabled: isMembershipPending || !isOwnerOrManager,
-      disabledMessage: isMembershipPending
-        ? t("common.loading")
-        : t("common.you_are_not_authorized_to_perform_this_action"),
+      hidden: !isOwner,
     },
     {
       id: "domain",
@@ -62,18 +58,14 @@ export const OrganizationSettingsNavbar = ({
       id: "billing",
       label: t("common.billing"),
       href: `/environments/${environmentId}/settings/billing`,
-      hidden: !isFormbricksCloud,
+      hidden: !isFormbricksCloud || loading,
       current: pathname?.includes("/billing"),
     },
     {
       id: "enterprise",
       label: t("common.enterprise_license"),
       href: `/environments/${environmentId}/settings/enterprise`,
-      hidden: isFormbricksCloud,
-      disabled: isMembershipPending || isMember,
-      disabledMessage: isMembershipPending
-        ? t("common.loading")
-        : t("common.you_are_not_authorized_to_perform_this_action"),
+      hidden: isFormbricksCloud || isPricingDisabled,
       current: pathname?.includes("/enterprise"),
     },
   ];

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

@@ -1,5 +1,4 @@
 import { notFound } from "next/navigation";
-import { AuthenticationError } from "@formbricks/types/errors";
 import { IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getTranslate } from "@/lingodotdev/server";
 import { getWhiteLabelPermission } from "@/modules/ee/license-check/lib/utils";
@@ -26,7 +25,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   );
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const hasWhiteLabelPermission = await getWhiteLabelPermission(organization.id);

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/actions.test.ts

@@ -1,218 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { AuthorizationError, OperationNotAllowedError } from "@formbricks/types/errors";
-import { updateOrganizationAISettingsAction } from "./actions";
-import { ZOrganizationAISettingsInput } from "./schemas";
-
-const mocks = vi.hoisted(() => ({
-  isInstanceAIConfigured: vi.fn(),
-  checkAuthorizationUpdated: vi.fn(),
-  deleteOrganization: vi.fn(),
-  getOrganization: vi.fn(),
-  getIsMultiOrgEnabled: vi.fn(),
-  getTranslate: vi.fn(),
-  updateOrganization: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/action-client", () => ({
-  authenticatedActionClient: {
-    inputSchema: vi.fn(() => ({
-      action: vi.fn((fn) => fn),
-    })),
-  },
-}));
-
-vi.mock("@/lib/utils/action-client/action-client-middleware", () => ({
-  checkAuthorizationUpdated: mocks.checkAuthorizationUpdated,
-}));
-
-vi.mock("@/lib/organization/service", () => ({
-  deleteOrganization: mocks.deleteOrganization,
-  getOrganization: mocks.getOrganization,
-  updateOrganization: mocks.updateOrganization,
-}));
-
-vi.mock("@/lib/ai/service", () => ({
-  isInstanceAIConfigured: mocks.isInstanceAIConfigured,
-}));
-
-vi.mock("@/lingodotdev/server", () => ({
-  getTranslate: mocks.getTranslate,
-}));
-
-vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
-  withAuditLogging: vi.fn((_eventName, _objectType, fn) => fn),
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsMultiOrgEnabled: mocks.getIsMultiOrgEnabled,
-}));
-
-const organizationId = "cm9gptbhg0000192zceq9ayuc";
-
-describe("organization AI settings actions", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    mocks.checkAuthorizationUpdated.mockResolvedValue(undefined);
-    mocks.getOrganization.mockResolvedValue({
-      id: organizationId,
-      isAISmartToolsEnabled: false,
-      isAIDataAnalysisEnabled: false,
-    });
-    mocks.isInstanceAIConfigured.mockReturnValue(true);
-    mocks.getTranslate.mockResolvedValue((key: string, values?: Record<string, string>) =>
-      values ? `${key}:${JSON.stringify(values)}` : key
-    );
-    mocks.updateOrganization.mockResolvedValue({
-      id: organizationId,
-      isAISmartToolsEnabled: true,
-      isAIDataAnalysisEnabled: false,
-    });
-    mocks.getIsMultiOrgEnabled.mockResolvedValue(true);
-  });
-
-  test("accepts AI toggle updates", () => {
-    expect(
-      ZOrganizationAISettingsInput.parse({
-        isAISmartToolsEnabled: true,
-      })
-    ).toEqual({
-      isAISmartToolsEnabled: true,
-    });
-  });
-
-  test("passes owner and manager roles to the authorization check and updates organization settings", async () => {
-    const ctx = {
-      user: { id: "user_1", locale: "en-US" },
-      auditLoggingCtx: {},
-    };
-    const parsedInput = {
-      organizationId,
-      data: {
-        isAISmartToolsEnabled: true,
-      },
-    };
-
-    const result = await updateOrganizationAISettingsAction({ ctx, parsedInput } as any);
-
-    expect(mocks.checkAuthorizationUpdated).toHaveBeenCalledWith({
-      userId: "user_1",
-      organizationId,
-      access: [
-        {
-          type: "organization",
-          schema: ZOrganizationAISettingsInput,
-          data: parsedInput.data,
-          roles: ["owner", "manager"],
-        },
-      ],
-    });
-    expect(mocks.getOrganization).toHaveBeenCalledWith(organizationId);
-    expect(mocks.updateOrganization).toHaveBeenCalledWith(organizationId, parsedInput.data);
-    expect(ctx.auditLoggingCtx).toMatchObject({
-      organizationId,
-      oldObject: {
-        id: organizationId,
-        isAISmartToolsEnabled: false,
-        isAIDataAnalysisEnabled: false,
-      },
-      newObject: {
-        id: organizationId,
-        isAISmartToolsEnabled: true,
-        isAIDataAnalysisEnabled: false,
-      },
-    });
-    expect(result).toEqual({
-      id: organizationId,
-      isAISmartToolsEnabled: true,
-      isAIDataAnalysisEnabled: false,
-    });
-  });
-
-  test("propagates authorization failures so members cannot update AI settings", async () => {
-    mocks.checkAuthorizationUpdated.mockRejectedValueOnce(new AuthorizationError("Not authorized"));
-
-    await expect(
-      updateOrganizationAISettingsAction({
-        ctx: {
-          user: { id: "user_member", locale: "en-US" },
-          auditLoggingCtx: {},
-        },
-        parsedInput: {
-          organizationId,
-          data: {
-            isAISmartToolsEnabled: true,
-          },
-        },
-      } as any)
-    ).rejects.toThrow(AuthorizationError);
-
-    expect(mocks.updateOrganization).not.toHaveBeenCalled();
-  });
-
-  test("rejects enabling AI when the instance AI provider is not configured", async () => {
-    mocks.isInstanceAIConfigured.mockReturnValueOnce(false);
-
-    await expect(
-      updateOrganizationAISettingsAction({
-        ctx: {
-          user: { id: "user_owner", locale: "en-US" },
-          auditLoggingCtx: {},
-        },
-        parsedInput: {
-          organizationId,
-          data: {
-            isAISmartToolsEnabled: true,
-          },
-        },
-      } as any)
-    ).rejects.toThrow(OperationNotAllowedError);
-
-    expect(mocks.updateOrganization).not.toHaveBeenCalled();
-  });
-
-  test("allows enabling AI when the instance configuration is valid", async () => {
-    await updateOrganizationAISettingsAction({
-      ctx: {
-        user: { id: "user_owner", locale: "en-US" },
-        auditLoggingCtx: {},
-      },
-      parsedInput: {
-        organizationId,
-        data: {
-          isAISmartToolsEnabled: true,
-        },
-      },
-    } as any);
-
-    expect(mocks.updateOrganization).toHaveBeenCalledWith(organizationId, {
-      isAISmartToolsEnabled: true,
-    });
-  });
-
-  test("allows disabling AI when the instance configuration later becomes invalid", async () => {
-    mocks.getOrganization.mockResolvedValueOnce({
-      id: organizationId,
-      isAISmartToolsEnabled: true,
-      isAIDataAnalysisEnabled: false,
-    });
-    mocks.isInstanceAIConfigured.mockReturnValueOnce(false);
-
-    await updateOrganizationAISettingsAction({
-      ctx: {
-        user: { id: "user_owner", locale: "en-US" },
-        auditLoggingCtx: {},
-      },
-      parsedInput: {
-        organizationId,
-        data: {
-          isAISmartToolsEnabled: false,
-        },
-      },
-    } as any);
-
-    expect(mocks.updateOrganization).toHaveBeenCalledWith(organizationId, {
-      isAISmartToolsEnabled: false,
-    });
-  });
-});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/actions.ts

@@ -2,44 +2,13 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
-import type { TOrganizationRole } from "@formbricks/types/memberships";
+import { OperationNotAllowedError } from "@formbricks/types/errors";
 import { ZOrganizationUpdateInput } from "@formbricks/types/organizations";
-import { isInstanceAIConfigured } from "@/lib/ai/service";
 import { deleteOrganization, getOrganization, updateOrganization } from "@/lib/organization/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
-import { getTranslate } from "@/lingodotdev/server";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
-import { ZOrganizationAISettingsInput, ZUpdateOrganizationAISettingsAction } from "./schemas";
-
-async function updateOrganizationAction<T extends z.ZodRawShape>({
-  ctx,
-  organizationId,
-  schema,
-  data,
-  roles,
-}: {
-  ctx: AuthenticatedActionClientCtx;
-  organizationId: string;
-  schema: z.ZodObject<T>;
-  data: z.infer<z.ZodObject<T>>;
-  roles: TOrganizationRole[];
-}) {
-  await checkAuthorizationUpdated({
-    userId: ctx.user.id,
-    organizationId,
-    access: [{ type: "organization", schema, data, roles }],
-  });
-  ctx.auditLoggingCtx.organizationId = organizationId;
-  const oldObject = await getOrganization(organizationId);
-  const result = await updateOrganization(organizationId, data);
-  ctx.auditLoggingCtx.oldObject = oldObject;
-  ctx.auditLoggingCtx.newObject = result;
-  return result;
-}
 
 const ZUpdateOrganizationNameAction = z.object({
   organizationId: ZId,
@@ -49,114 +18,26 @@ const ZUpdateOrganizationNameAction = z.object({
 export const updateOrganizationNameAction = authenticatedActionClient
   .inputSchema(ZUpdateOrganizationNameAction)
   .action(
-    withAuditLogging(
-      "updated",
-      "organization",
-      async ({
-        ctx,
-        parsedInput,
-      }: {
-        ctx: AuthenticatedActionClientCtx;
-        parsedInput: z.infer<typeof ZUpdateOrganizationNameAction>;
-      }) =>
-        updateOrganizationAction({
-          ctx,
-          organizationId: parsedInput.organizationId,
-          schema: ZOrganizationUpdateInput.pick({ name: true }),
-          data: parsedInput.data,
-          roles: ["owner"],
-        })
-    )
-  );
-
-type TOrganizationAISettings = Pick<
-  NonNullable<Awaited<ReturnType<typeof getOrganization>>>,
-  "isAISmartToolsEnabled" | "isAIDataAnalysisEnabled"
->;
-
-type TResolvedOrganizationAISettings = {
-  smartToolsEnabled: boolean;
-  dataAnalysisEnabled: boolean;
-  isEnablingAnyAISetting: boolean;
-};
-
-const resolveOrganizationAISettings = ({
-  data,
-  organization,
-}: {
-  data: z.infer<typeof ZOrganizationAISettingsInput>;
-  organization: TOrganizationAISettings;
-}): TResolvedOrganizationAISettings => {
-  const smartToolsEnabled = Object.hasOwn(data, "isAISmartToolsEnabled")
-    ? (data.isAISmartToolsEnabled ?? organization.isAISmartToolsEnabled)
-    : organization.isAISmartToolsEnabled;
-  const dataAnalysisEnabled = Object.hasOwn(data, "isAIDataAnalysisEnabled")
-    ? (data.isAIDataAnalysisEnabled ?? organization.isAIDataAnalysisEnabled)
-    : organization.isAIDataAnalysisEnabled;
-
-  return {
-    smartToolsEnabled,
-    dataAnalysisEnabled,
-    isEnablingAnyAISetting:
-      (smartToolsEnabled && !organization.isAISmartToolsEnabled) ||
-      (dataAnalysisEnabled && !organization.isAIDataAnalysisEnabled),
-  };
-};
-
-const assertOrganizationAISettingsUpdateAllowed = ({
-  isInstanceAIConfigured,
-  resolvedSettings,
-  t,
-}: {
-  isInstanceAIConfigured: boolean;
-  resolvedSettings: TResolvedOrganizationAISettings;
-  t: Awaited<ReturnType<typeof getTranslate>>;
-}) => {
-  if (resolvedSettings.isEnablingAnyAISetting && !isInstanceAIConfigured) {
-    throw new OperationNotAllowedError(t("environments.settings.general.ai_instance_not_configured"));
-  }
-};
-
-export const updateOrganizationAISettingsAction = authenticatedActionClient
-  .inputSchema(ZUpdateOrganizationAISettingsAction)
-  .action(
-    withAuditLogging(
-      "updated",
-      "organization",
-      async ({
-        ctx,
-        parsedInput,
-      }: {
-        ctx: AuthenticatedActionClientCtx;
-        parsedInput: z.infer<typeof ZUpdateOrganizationAISettingsAction>;
-      }) => {
-        const t = await getTranslate(ctx.user.locale);
-        const organization = await getOrganization(parsedInput.organizationId);
-
-        if (!organization) {
-          throw new ResourceNotFoundError("Organization", parsedInput.organizationId);
-        }
-
-        const resolvedSettings = resolveOrganizationAISettings({
-          data: parsedInput.data,
-          organization,
-        });
-
-        assertOrganizationAISettingsUpdateAllowed({
-          isInstanceAIConfigured: isInstanceAIConfigured(),
-          resolvedSettings,
-          t,
-        });
-
-        return updateOrganizationAction({
-          ctx,
-          organizationId: parsedInput.organizationId,
-          schema: ZOrganizationAISettingsInput,
-          data: parsedInput.data,
-          roles: ["owner", "manager"],
-        });
-      }
-    )
+    withAuditLogging("updated", "organization", async ({ ctx, parsedInput }) => {
+      await checkAuthorizationUpdated({
+        userId: ctx.user.id,
+        organizationId: parsedInput.organizationId,
+        access: [
+          {
+            type: "organization",
+            schema: ZOrganizationUpdateInput.pick({ name: true }),
+            data: parsedInput.data,
+            roles: ["owner"],
+          },
+        ],
+      });
+      ctx.auditLoggingCtx.organizationId = parsedInput.organizationId;
+      const oldObject = await getOrganization(parsedInput.organizationId);
+      const result = await updateOrganization(parsedInput.organizationId, parsedInput.data);
+      ctx.auditLoggingCtx.oldObject = oldObject;
+      ctx.auditLoggingCtx.newObject = result;
+      return result;
+    })
   );
 
 const ZDeleteOrganizationAction = z.object({
@@ -168,10 +49,7 @@ export const deleteOrganizationAction = authenticatedActionClient
   .action(
     withAuditLogging("deleted", "organization", async ({ ctx, parsedInput }) => {
       const isMultiOrgEnabled = await getIsMultiOrgEnabled();
-      if (!isMultiOrgEnabled) {
-        const t = await getTranslate(ctx.user.locale);
-        throw new OperationNotAllowedError(t("environments.settings.general.organization_deletion_disabled"));
-      }
+      if (!isMultiOrgEnabled) throw new OperationNotAllowedError("Organization deletion disabled");
 
       await checkAuthorizationUpdated({
         userId: ctx.user.id,

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

@@ -1,118 +0,0 @@
-"use client";
-
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import toast from "react-hot-toast";
-import { useTranslation } from "react-i18next";
-import { TOrganizationRole } from "@formbricks/types/memberships";
-import { TOrganization } from "@formbricks/types/organizations";
-import { updateOrganizationAISettingsAction } from "@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions";
-import { getDisplayedOrganizationAISettingValue, getOrganizationAIEnablementState } from "@/lib/ai/utils";
-import { getAccessFlags } from "@/lib/membership/utils";
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { AdvancedOptionToggle } from "@/modules/ui/components/advanced-option-toggle";
-import { Alert, AlertDescription } from "@/modules/ui/components/alert";
-
-interface AISettingsToggleProps {
-  organization: TOrganization;
-  membershipRole?: TOrganizationRole;
-  isInstanceAIConfigured: boolean;
-}
-
-export const AISettingsToggle = ({
-  organization,
-  membershipRole,
-  isInstanceAIConfigured,
-}: Readonly<AISettingsToggleProps>) => {
-  const [loadingField, setLoadingField] = useState<string | null>(null);
-  const { t } = useTranslation();
-  const router = useRouter();
-
-  const { isOwner, isManager } = getAccessFlags(membershipRole);
-  const canEdit = isOwner || isManager;
-  const aiEnablementState = getOrganizationAIEnablementState({
-    isInstanceConfigured: isInstanceAIConfigured,
-  });
-  const showInstanceConfigWarning = aiEnablementState.blockReason === "instanceNotConfigured";
-  const isToggleDisabled = loadingField !== null || !canEdit || !aiEnablementState.canEnableFeatures;
-  const aiEnablementBlockedMessage = t("environments.settings.general.ai_instance_not_configured");
-  const displayedSmartToolsValue = getDisplayedOrganizationAISettingValue({
-    currentValue: organization.isAISmartToolsEnabled,
-    isInstanceConfigured: isInstanceAIConfigured,
-  });
-  const displayedDataAnalysisValue = getDisplayedOrganizationAISettingValue({
-    currentValue: organization.isAIDataAnalysisEnabled,
-    isInstanceConfigured: isInstanceAIConfigured,
-  });
-
-  const handleToggle = async (
-    field: "isAISmartToolsEnabled" | "isAIDataAnalysisEnabled",
-    checked: boolean
-  ) => {
-    if (checked && !aiEnablementState.canEnableFeatures) {
-      toast.error(aiEnablementBlockedMessage);
-      return;
-    }
-
-    setLoadingField(field);
-    try {
-      const data =
-        field === "isAISmartToolsEnabled"
-          ? { isAISmartToolsEnabled: checked }
-          : { isAIDataAnalysisEnabled: checked };
-      const response = await updateOrganizationAISettingsAction({
-        organizationId: organization.id,
-        data,
-      });
-
-      if (response?.data) {
-        toast.success(t("environments.settings.general.ai_settings_updated_successfully"));
-        router.refresh();
-      } else {
-        toast.error(getFormattedErrorMessage(response));
-      }
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : t("common.something_went_wrong_please_try_again"));
-    } finally {
-      setLoadingField(null);
-    }
-  };
-
-  return (
-    <div className="space-y-4">
-      {showInstanceConfigWarning && (
-        <Alert variant="warning">
-          <AlertDescription>{aiEnablementBlockedMessage}</AlertDescription>
-        </Alert>
-      )}
-
-      <AdvancedOptionToggle
-        isChecked={displayedSmartToolsValue}
-        onToggle={(checked) => handleToggle("isAISmartToolsEnabled", checked)}
-        htmlId="ai-smart-tools-toggle"
-        title={t("environments.settings.general.ai_smart_tools_enabled")}
-        description={t("environments.settings.general.ai_smart_tools_enabled_description")}
-        disabled={isToggleDisabled}
-        customContainerClass="px-0"
-      />
-
-      <AdvancedOptionToggle
-        isChecked={displayedDataAnalysisValue}
-        onToggle={(checked) => handleToggle("isAIDataAnalysisEnabled", checked)}
-        htmlId="ai-data-analysis-toggle"
-        title={t("environments.settings.general.ai_data_analysis_enabled")}
-        description={t("environments.settings.general.ai_data_analysis_enabled_description")}
-        disabled={isToggleDisabled}
-        customContainerClass="px-0"
-      />
-
-      {!canEdit && (
-        <Alert variant="warning">
-          <AlertDescription>
-            {t("common.only_owners_managers_and_manage_access_members_can_perform_this_action")}
-          </AlertDescription>
-        </Alert>
-      )}
-    </div>
-  );
-};

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

@@ -1,5 +1,4 @@
 import { OrganizationSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar";
-import { isInstanceAIConfigured } from "@/lib/ai/service";
 import { FB_LOGO_URL, IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -12,7 +11,6 @@ import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper
 import { PageHeader } from "@/modules/ui/components/page-header";
 import packageJson from "@/package.json";
 import { SettingsCard } from "../../components/SettingsCard";
-import { AISettingsToggle } from "./components/AISettingsToggle";
 import { DeleteOrganization } from "./components/DeleteOrganization";
 import { EditOrganizationNameForm } from "./components/EditOrganizationNameForm";
 import { SecurityListTip } from "./components/SecurityListTip";
@@ -62,15 +60,6 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           membershipRole={currentUserMembership?.role}
         />
       </SettingsCard>
-      <SettingsCard
-        title={t("environments.settings.general.ai_enabled")}
-        description={t("environments.settings.general.ai_enabled_description")}>
-        <AISettingsToggle
-          organization={organization}
-          membershipRole={currentUserMembership?.role}
-          isInstanceAIConfigured={isInstanceAIConfigured()}
-        />
-      </SettingsCard>
       <EmailCustomizationSettings
         organization={organization}
         hasWhiteLabelPermission={hasWhiteLabelPermission}

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/schemas.ts

@@ -1,13 +0,0 @@
-import { z } from "zod";
-import { ZId } from "@formbricks/types/common";
-import { ZOrganizationUpdateInput } from "@formbricks/types/organizations";
-
-export const ZOrganizationAISettingsInput = ZOrganizationUpdateInput.pick({
-  isAISmartToolsEnabled: true,
-  isAIDataAnalysisEnabled: true,
-});
-
-export const ZUpdateOrganizationAISettingsAction = z.object({
-  organizationId: ZId,
-  data: ZOrganizationAISettingsInput,
-});

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

@@ -1,5 +1,4 @@
 import { getServerSession } from "next-auth";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -18,15 +17,15 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
   ]);
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   return <>{children}</>;

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

@@ -29,7 +29,6 @@ import { ResponseTableCell } from "@/app/(app)/environments/[environmentId]/surv
 import { generateResponseTableColumns } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTableColumns";
 import { getResponsesDownloadUrlAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions";
 import { downloadResponsesFile } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/utils";
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { deleteResponseAction } from "@/modules/analysis/components/SingleResponseCard/actions";
 import { Button } from "@/modules/ui/components/button";
 import {
@@ -202,13 +201,7 @@ export const ResponseTable = ({
   };
 
   const deleteResponse = async (responseId: string, params?: { decrementQuotas?: boolean }) => {
-    const result = await deleteResponseAction({
-      responseId,
-      decrementQuotas: params?.decrementQuotas ?? false,
-    });
-    if (result?.serverError) {
-      throw new Error(getFormattedErrorMessage(result));
-    }
+    await deleteResponseAction({ responseId, decrementQuotas: params?.decrementQuotas ?? false });
   };
 
   // Handle downloading selected responses
@@ -307,6 +300,7 @@ export const ResponseTable = ({
         <DataTableSettingsModal
           open={isTableSettingsModalOpen}
           setOpen={setIsTableSettingsModalOpen}
+          survey={survey}
           table={table}
           columnOrder={columnOrder}
           handleDragEnd={handleDragEnd}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/page.tsx

@@ -1,4 +1,3 @@
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { ResponsePage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
@@ -32,15 +31,15 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
   ]);
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
+    throw new Error(t("common.survey_not_found"));
   }
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const segments = isContactsEnabled ? await getSegments(params.environmentId) : [];
@@ -49,7 +48,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
 
   const organizationBilling = await getOrganizationBilling(organization.id);
   if (!organizationBilling) {
-    throw new ResourceNotFoundError(t("common.organization"), organization.id);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const isQuotasAllowed = await getIsQuotasEnabled(organization.id);

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/personal-links-tab.tsx

@@ -163,7 +163,6 @@ export const PersonalLinksTab = ({
       <UpgradePrompt
         title={t("environments.surveys.share.personal_links.upgrade_prompt_title")}
         description={t("environments.surveys.share.personal_links.upgrade_prompt_description")}
-        feature="personal_links"
         buttons={[
           {
             text: isFormbricksCloud ? t("common.upgrade_plan") : t("common.request_trial_license"),

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

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getSurvey } from "@/lib/survey/service";
@@ -10,11 +9,11 @@ export const getEmailTemplateHtml = async (surveyId: string, locale: string) =>
   const t = await getTranslate();
   const survey = await getSurvey(surveyId);
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), surveyId);
+    throw new Error("Survey not found");
   }
   const project = await getProjectByEnvironmentId(survey.environmentId);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error("Workspace not found");
   }
 
   const styling = getStyling(project, survey);

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary.test.ts

@@ -11,7 +11,8 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
+import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
+import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
 import {
   getElementSummary,
   getResponsesForSummary,
@@ -43,7 +44,7 @@ vi.mock("@/lib/survey/service", () => ({
 }));
 vi.mock("@/lib/surveyLogic/utils", () => ({
   evaluateLogic: vi.fn(),
-  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredElementIds: [], calculations: {} })),
+  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredQuestionIds: [], calculations: {} })),
 }));
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn(),
@@ -228,6 +229,12 @@ describe("getSurveySummaryDropOff", () => {
     vi.mocked(convertFloatTo2Decimal).mockImplementation((num) =>
       num !== undefined && num !== null ? parseFloat(num.toFixed(2)) : 0
     );
+    vi.mocked(evaluateLogic).mockReturnValue(false); // Default: no logic triggers
+    vi.mocked(performActions).mockReturnValue({
+      jumpTarget: undefined,
+      requiredElementIds: [],
+      calculations: {},
+    });
   });
 
   test("calculates dropOff correctly with welcome card disabled", () => {
@@ -239,7 +246,7 @@ describe("getSurveySummaryDropOff", () => {
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10, q2: 5 }, // Saw q2 but didn't answer it
+        ttc: { q1: 10 },
         finished: false,
       }, // Dropped at q2
       {
@@ -262,55 +269,22 @@ describe("getSurveySummaryDropOff", () => {
     );
 
     expect(dropOff.length).toBe(2);
-    // Q1: welcome card disabled so impressions = displayCount
+    // Q1
     expect(dropOff[0].elementId).toBe("q1");
-    expect(dropOff[0].impressions).toBe(displayCount);
+    expect(dropOff[0].impressions).toBe(displayCount); // Welcome card disabled, so first question impressions = displayCount
     expect(dropOff[0].dropOffCount).toBe(displayCount - responses.length); // 5 displays - 2 started = 3 dropped before q1
     expect(dropOff[0].dropOffPercentage).toBe(60); // (3/5)*100
     expect(dropOff[0].ttc).toBe(10);
 
-    // Q2: both responses saw q2 (r1 has ttc for q2, r2 answered q2)
+    // Q2
     expect(dropOff[1].elementId).toBe("q2");
-    expect(dropOff[1].impressions).toBe(2);
-    expect(dropOff[1].dropOffCount).toBe(1); // r1 dropped at q2 (last seen element)
+    expect(dropOff[1].impressions).toBe(responses.length); // 2 responses reached q1, so 2 impressions for q2
+    expect(dropOff[1].dropOffCount).toBe(1); // 1 response dropped at q2
     expect(dropOff[1].dropOffPercentage).toBe(50); // (1/2)*100
-    expect(dropOff[1].ttc).toBe(7.5); // avg of r1(5ms) and r2(10ms)
+    expect(dropOff[1].ttc).toBe(10);
   });
 
-  test("drop-off attributed to last seen element when user doesn't reach next question", () => {
-    // Welcome card enabled so first element drop-off is NOT overridden by displayCount
-    const surveyWithWelcome: TSurvey = {
-      ...surveyWithBlocks,
-      welcomeCard: { enabled: true, headline: { default: "Welcome" } } as unknown as TSurvey["welcomeCard"],
-    };
-    const responses = [
-      {
-        id: "r1",
-        data: { q1: "a" },
-        updatedAt: new Date(),
-        contact: null,
-        contactAttributes: {},
-        language: "en",
-        ttc: { q1: 10 }, // Only saw q1, never reached q2
-        finished: false,
-      },
-    ] as any;
-    const displayCount = 1;
-    const dropOff = getSurveySummaryDropOff(
-      surveyWithWelcome,
-      getElementsFromBlocks(surveyWithWelcome.blocks),
-      responses,
-      displayCount
-    );
-
-    expect(dropOff[0].impressions).toBe(1); // Saw q1
-    expect(dropOff[0].dropOffCount).toBe(1); // Dropped at q1 (last seen element)
-    expect(dropOff[1].impressions).toBe(0); // Never saw q2
-    expect(dropOff[1].dropOffCount).toBe(0);
-  });
-
-  test("handles logic jumps — impressions based on actual ttc/data, not logic replay", () => {
-    // Survey with 4 questions across 4 blocks, logic on block2 jumps q2->q4 (skipping q3)
+  test("handles logic jumps", () => {
     const surveyWithLogic: TSurvey = {
       ...mockBaseSurvey,
       blocks: [
@@ -341,6 +315,36 @@ describe("getSurveySummaryDropOff", () => {
               charLimit: { enabled: false },
             },
           ] as TSurveyElement[],
+          logic: [
+            {
+              id: "logic1",
+              conditions: {
+                id: "condition1",
+                connector: "and" as const,
+                conditions: [
+                  {
+                    id: "c1",
+                    leftOperand: {
+                      type: "element" as const,
+                      value: "q2",
+                    },
+                    operator: "equals" as const,
+                    rightOperand: {
+                      type: "static" as const,
+                      value: "b",
+                    },
+                  },
+                ],
+              },
+              actions: [
+                {
+                  id: "action1",
+                  objective: "jumpToBlock" as const,
+                  target: "q4",
+                },
+              ],
+            },
+          ],
         },
         {
           id: "block3",
@@ -373,21 +377,28 @@ describe("getSurveySummaryDropOff", () => {
       ],
       questions: [],
     };
-
-    // Response where user answered q1, q2, then logic jumped to q4 (skipping q3).
-    // The ttc/data reflects exactly what elements were shown — no logic replay needed.
     const responses = [
       {
         id: "r1",
-        data: { q1: "a", q2: "b", q4: "d" },
+        data: { q1: "a", q2: "b" },
         updatedAt: new Date(),
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10, q2: 10, q4: 10 }, // q3 has no ttc entry — was skipped by logic
+        ttc: { q1: 10, q2: 10 },
         finished: false,
-      },
+      }, // Jumps from q2 to q4, drops at q4
     ];
+    vi.mocked(evaluateLogic).mockImplementation((_s, data, _v, _, _l) => {
+      // Simulate logic on q2 triggering
+      return data.q2 === "b";
+    });
+    vi.mocked(performActions).mockImplementation((_s, actions, _d, _v) => {
+      if (actions[0] && "objective" in actions[0] && actions[0].objective === "jumpToBlock") {
+        return { jumpTarget: actions[0].target, requiredElementIds: [], calculations: {} };
+      }
+      return { jumpTarget: undefined, requiredElementIds: [], calculations: {} };
+    });
 
     const dropOff = getSurveySummaryDropOff(
       surveyWithLogic,
@@ -396,11 +407,11 @@ describe("getSurveySummaryDropOff", () => {
       1
     );
 
-    expect(dropOff[0].impressions).toBe(1); // q1: seen
-    expect(dropOff[1].impressions).toBe(1); // q2: seen
-    expect(dropOff[2].impressions).toBe(0); // q3: skipped by logic (no ttc, no data)
-    expect(dropOff[3].impressions).toBe(1); // q4: jumped to, seen
-    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4 (last seen element, not finished)
+    expect(dropOff[0].impressions).toBe(1); // q1
+    expect(dropOff[1].impressions).toBe(1); // q2
+    expect(dropOff[2].impressions).toBe(0); // q3 (skipped)
+    expect(dropOff[3].impressions).toBe(1); // q4 (jumped to)
+    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4
   });
 });
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary.ts

@@ -11,6 +11,7 @@ import {
   TResponseData,
   TResponseFilterCriteria,
   TResponseTtc,
+  TResponseVariables,
   ZResponseFilterCriteria,
 } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
@@ -36,7 +37,8 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { buildWhereClause } from "@/lib/response/utils";
 import { getSurvey } from "@/lib/survey/service";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
+import { findElementLocation, getElementsFromBlocks } from "@/lib/survey/utils";
+import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
 import { validateInputs } from "@/lib/utils/validate";
 import { convertFloatTo2Decimal } from "./utils";
 
@@ -91,13 +93,63 @@ export const getSurveySummaryMeta = (
   };
 };
 
-// Determine whether a response interacted with a given element.
-// An element was "seen" if the respondent has a ttc entry for it OR provided an answer.
-// This is more reliable than replaying survey logic, which can misattribute impressions
-// when branching logic skips elements or when partial response data is insufficient
-// to evaluate conditions correctly.
-const wasElementSeen = (response: TSurveySummaryResponse, elementId: string): boolean => {
-  return (response.ttc != null && response.ttc[elementId] > 0) || response.data[elementId] !== undefined;
+const evaluateLogicAndGetNextElementId = (
+  localSurvey: TSurvey,
+  elements: TSurveyElement[],
+  data: TResponseData,
+  localVariables: TResponseVariables,
+  currentElementIndex: number,
+  currElementTemp: TSurveyElement,
+  selectedLanguage: string | null
+): {
+  nextElementId: string | undefined;
+  updatedSurvey: TSurvey;
+  updatedVariables: TResponseVariables;
+} => {
+  let updatedSurvey = { ...localSurvey };
+  let updatedVariables = { ...localVariables };
+
+  let firstJumpTarget: string | undefined;
+
+  const { block: currentBlock } = findElementLocation(localSurvey, currElementTemp.id);
+
+  if (currentBlock?.logic && currentBlock.logic.length > 0) {
+    for (const logic of currentBlock.logic) {
+      if (evaluateLogic(localSurvey, data, localVariables, logic.conditions, selectedLanguage ?? "default")) {
+        const { jumpTarget, requiredElementIds, calculations } = performActions(
+          updatedSurvey,
+          logic.actions,
+          data,
+          updatedVariables
+        );
+
+        if (requiredElementIds.length > 0) {
+          // Update blocks to mark elements as required
+          updatedSurvey.blocks = updatedSurvey.blocks.map((block) => ({
+            ...block,
+            elements: block.elements.map((e) =>
+              requiredElementIds.includes(e.id) ? { ...e, required: true } : e
+            ),
+          }));
+        }
+        updatedVariables = { ...updatedVariables, ...calculations };
+
+        if (jumpTarget && !firstJumpTarget) {
+          firstJumpTarget = jumpTarget;
+        }
+      }
+    }
+  }
+
+  // If no jump target was set, check for a fallback logic
+  if (!firstJumpTarget && currentBlock?.logicFallback) {
+    firstJumpTarget = currentBlock.logicFallback;
+  }
+
+  // Return the first jump target if found, otherwise go to the next element
+  const nextElementId = firstJumpTarget || elements[currentElementIndex + 1]?.id || undefined;
+
+  return { nextElementId, updatedSurvey, updatedVariables };
 };
 
 export const getSurveySummaryDropOff = (
@@ -118,8 +170,16 @@ export const getSurveySummaryDropOff = (
   let impressionsArr = new Array(elements.length).fill(0) as number[];
   let dropOffPercentageArr = new Array(elements.length).fill(0) as number[];
 
+  const surveyVariablesData = survey.variables?.reduce(
+    (acc, variable) => {
+      acc[variable.id] = variable.value;
+      return acc;
+    },
+    {} as Record<string, string | number>
+  );
+
   responses.forEach((response) => {
-    // Calculate total time-to-completion per element
+    // Calculate total time-to-completion
     Object.keys(totalTtc).forEach((elementId) => {
       if (response.ttc && response.ttc[elementId]) {
         totalTtc[elementId] += response.ttc[elementId];
@@ -127,21 +187,51 @@ export const getSurveySummaryDropOff = (
       }
     });
 
-    // Count impressions based on actual interaction data (ttc + response data)
-    // instead of replaying survey logic which is unreliable with branching
-    let lastSeenIdx = -1;
+    let localSurvey = structuredClone(survey);
+    let localResponseData: TResponseData = { ...response.data };
+    let localVariables: TResponseVariables = {
+      ...surveyVariablesData,
+    };
 
-    for (let i = 0; i < elements.length; i++) {
-      const element = elements[i];
-      if (wasElementSeen(response, element.id)) {
-        impressionsArr[i]++;
-        lastSeenIdx = i;
+    let currQuesIdx = 0;
+
+    while (currQuesIdx < elements.length) {
+      const currQues = elements[currQuesIdx];
+      if (!currQues) break;
+
+      // element is not answered and required
+      if (response.data[currQues.id] === undefined && currQues.required) {
+        dropOffArr[currQuesIdx]++;
+        impressionsArr[currQuesIdx]++;
+        break;
       }
-    }
 
-    // Attribute drop-off to the last element the respondent interacted with
-    if (!response.finished && lastSeenIdx >= 0) {
-      dropOffArr[lastSeenIdx]++;
+      impressionsArr[currQuesIdx]++;
+
+      const { nextElementId, updatedSurvey, updatedVariables } = evaluateLogicAndGetNextElementId(
+        localSurvey,
+        elements,
+        localResponseData,
+        localVariables,
+        currQuesIdx,
+        currQues,
+        response.language
+      );
+
+      localSurvey = updatedSurvey;
+      localVariables = updatedVariables;
+
+      if (nextElementId) {
+        const nextQuesIdx = elements.findIndex((q) => q.id === nextElementId);
+        if (!response.data[nextElementId] && !response.finished) {
+          dropOffArr[nextQuesIdx]++;
+          impressionsArr[nextQuesIdx]++;
+          break;
+        }
+        currQuesIdx = nextQuesIdx;
+      } else {
+        currQuesIdx++;
+      }
     }
   });
 
@@ -150,8 +240,6 @@ export const getSurveySummaryDropOff = (
     totalTtc[elementId] = responseCounts[elementId] > 0 ? totalTtc[elementId] / responseCounts[elementId] : 0;
   });
 
-  // When the welcome card is disabled, the first element's impressions should equal displayCount
-  // because every survey display is an impression of the first element
   if (!survey.welcomeCard.enabled) {
     dropOffArr[0] = displayCount - impressionsArr[0];
     if (impressionsArr[0] > displayCount) dropOffPercentageArr[0] = 0;
@@ -163,7 +251,7 @@ export const getSurveySummaryDropOff = (
 
     impressionsArr[0] = displayCount;
   } else {
-    dropOffPercentageArr[0] = impressionsArr[0] > 0 ? (dropOffArr[0] / impressionsArr[0]) * 100 : 0;
+    dropOffPercentageArr[0] = (dropOffArr[0] / impressionsArr[0]) * 100;
   }
 
   for (let i = 1; i < elements.length; i++) {

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

@@ -1,5 +1,4 @@
 import { notFound } from "next/navigation";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { SummaryPage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
@@ -33,13 +32,13 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const survey = await getSurvey(params.surveyId);
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
+    throw new Error(t("common.survey_not_found"));
   }
 
   const user = await getUser(session.user.id);
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
@@ -47,11 +46,11 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const segments = isContactsEnabled ? await getSegments(environment.id) : [];
 
   if (!organizationId) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
   const organizationBilling = await getOrganizationBilling(organizationId);
   if (!organizationBilling) {
-    throw new ResourceNotFoundError(t("common.organization"), organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
   const isQuotasAllowed = await getIsQuotasEnabled(organizationId);
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts

@@ -4,7 +4,6 @@ import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZResponseFilterCriteria } from "@formbricks/types/responses";
-import { capturePostHogEvent } from "@/lib/posthog";
 import { getResponseDownloadFile, getResponseFilteringValues } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
@@ -24,11 +23,9 @@ const ZGetResponsesDownloadUrlAction = z.object({
 export const getResponsesDownloadUrlAction = authenticatedActionClient
   .inputSchema(ZGetResponsesDownloadUrlAction)
   .action(async ({ ctx, parsedInput }) => {
-    const organizationId = await getOrganizationIdFromSurveyId(parsedInput.surveyId);
-
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
-      organizationId,
+      organizationId: await getOrganizationIdFromSurveyId(parsedInput.surveyId),
       access: [
         {
           type: "organization",
@@ -42,20 +39,11 @@ export const getResponsesDownloadUrlAction = authenticatedActionClient
       ],
     });
 
-    const result = await getResponseDownloadFile(
+    return await getResponseDownloadFile(
       parsedInput.surveyId,
       parsedInput.format,
       parsedInput.filterCriteria
     );
-
-    capturePostHogEvent(ctx.user.id, "responses_exported", {
-      survey_id: parsedInput.surveyId,
-      format: parsedInput.format,
-      filter_applied: Object.keys(parsedInput.filterCriteria ?? {}).length > 0,
-      organization_id: organizationId,
-    });
-
-    return result;
   });
 
 const ZGetSurveyFilterDataAction = z.object({

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ElementsComboBox.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import clsx from "clsx";
-import { TFunction } from "i18next";
 import {
   AirplayIcon,
   ArrowUpFromDotIcon,
@@ -55,25 +54,6 @@ export enum OptionsType {
   QUOTAS = "Quotas",
 }
 
-const getOptionsTypeTranslationKey = (type: OptionsType, t: TFunction): string => {
-  switch (type) {
-    case OptionsType.ELEMENTS:
-      return t("common.elements");
-    case OptionsType.TAGS:
-      return t("common.tags");
-    case OptionsType.ATTRIBUTES:
-      return t("common.attributes");
-    case OptionsType.OTHERS:
-      return t("common.other_filters");
-    case OptionsType.META:
-      return t("common.meta");
-    case OptionsType.HIDDEN_FIELDS:
-      return t("common.hidden_fields");
-    case OptionsType.QUOTAS:
-      return t("common.quotas");
-  }
-};
-
 export type ElementOption = {
   label: string;
   elementType?: TSurveyElementTypeEnum;
@@ -238,12 +218,7 @@ export const ElementsComboBox = ({ options, selected, onChangeValue }: ElementCo
             {options?.map((data) => (
               <Fragment key={data.header}>
                 {data?.option.length > 0 && (
-                  <CommandGroup
-                    heading={
-                      <p className="text-sm font-medium text-slate-600">
-                        {getOptionsTypeTranslationKey(data.header, t)}
-                      </p>
-                    }>
+                  <CommandGroup heading={<p className="text-sm font-medium text-slate-600">{data.header}</p>}>
                     {data?.option?.map((o) => (
                       <CommandItem
                         key={o.id}

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

@@ -1,6 +1,4 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getSurvey } from "@/lib/survey/service";
-import { getTranslate } from "@/lingodotdev/server";
 import { SurveyContextWrapper } from "./context/survey-context";
 
 interface SurveyLayoutProps {
@@ -12,10 +10,9 @@ const SurveyLayout = async ({ params, children }: SurveyLayoutProps) => {
   const resolvedParams = await params;
 
   const survey = await getSurvey(resolvedParams.surveyId);
-  const t = await getTranslate();
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), resolvedParams.surveyId);
+    throw new Error("Survey not found");
   }
 
   return <SurveyContextWrapper survey={survey}>{children}</SurveyContextWrapper>;

apps/web/app/(app)/environments/[environmentId]/workflows/components/workflows-page.tsx

@@ -0,0 +1,208 @@
+"use client";
+
+import { CheckCircle2, Sparkles } from "lucide-react";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/modules/ui/components/button";
+
+const FORMBRICKS_HOST = "https://app.formbricks.com";
+const SURVEY_ID = "cr9r4b2r73x6hlmn5aa2ha44";
+const ENVIRONMENT_ID = "cmk41i8bi92bdad01svi74dec";
+
+interface WorkflowsPageProps {
+  userEmail: string;
+  organizationName: string;
+  billingPlan: string;
+}
+
+type Step = "prompt" | "followup" | "thankyou";
+
+export const WorkflowsPage = ({ userEmail, organizationName, billingPlan }: WorkflowsPageProps) => {
+  const { t } = useTranslation();
+  const [step, setStep] = useState<Step>("prompt");
+  const [promptValue, setPromptValue] = useState("");
+  const [detailsValue, setDetailsValue] = useState("");
+  const [responseId, setResponseId] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleGenerateWorkflow = async () => {
+    if (promptValue.trim().length < 100 || isSubmitting) return;
+    setIsSubmitting(true);
+
+    try {
+      const res = await fetch(`${FORMBRICKS_HOST}/api/v2/client/${ENVIRONMENT_ID}/responses`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          surveyId: SURVEY_ID,
+          finished: false,
+          data: {
+            workflow: promptValue.trim(),
+            useremail: userEmail,
+            orgname: organizationName,
+            billingplan: billingPlan,
+          },
+        }),
+      });
+
+      if (res.ok) {
+        const json = await res.json();
+        setResponseId(json.data?.id ?? null);
+      }
+
+      setStep("followup");
+    } catch {
+      setStep("followup");
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleSubmitFeedback = async () => {
+    if (isSubmitting) return;
+    setIsSubmitting(true);
+
+    if (responseId) {
+      try {
+        await fetch(`${FORMBRICKS_HOST}/api/v1/client/${ENVIRONMENT_ID}/responses/${responseId}`, {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            finished: true,
+            data: {
+              details: detailsValue.trim(),
+            },
+          }),
+        });
+      } catch {
+        // silently fail
+      }
+    }
+
+    setIsSubmitting(false);
+    setStep("thankyou");
+  };
+
+  const handleSkipFeedback = async () => {
+    if (!responseId) {
+      setStep("thankyou");
+      return;
+    }
+
+    try {
+      await fetch(`${FORMBRICKS_HOST}/api/v1/client/${ENVIRONMENT_ID}/responses/${responseId}`, {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          finished: true,
+          data: {},
+        }),
+      });
+    } catch {
+      // silently fail
+    }
+
+    setStep("thankyou");
+  };
+
+  if (step === "prompt") {
+    return (
+      <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+        <div className="w-full max-w-2xl space-y-8">
+          <div className="space-y-3 text-center">
+            <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-xl bg-gradient-to-br from-brand-light to-brand-dark shadow-md">
+              <Sparkles className="h-6 w-6 text-white" />
+            </div>
+            <h1 className="text-4xl font-bold tracking-tight text-slate-800">{t("workflows.heading")}</h1>
+            <p className="text-lg text-slate-500">{t("workflows.subheading")}</p>
+          </div>
+
+          <div className="relative">
+            <textarea
+              value={promptValue}
+              onChange={(e) => setPromptValue(e.target.value)}
+              placeholder={t("workflows.placeholder")}
+              rows={5}
+              className="w-full resize-none rounded-xl border border-slate-200 bg-white px-5 py-4 text-base text-slate-800 shadow-sm transition-all placeholder:text-slate-400 focus:border-brand-dark focus:outline-none focus:ring-2 focus:ring-brand-light/20"
+              onKeyDown={(e) => {
+                if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+                  handleGenerateWorkflow();
+                }
+              }}
+            />
+            <div className="mt-3 flex items-center justify-between">
+              <span
+                className={`text-xs ${promptValue.trim().length >= 100 ? "text-slate-400" : "text-amber-500"}`}>
+                {promptValue.trim().length} / 100
+              </span>
+              <Button
+                onClick={handleGenerateWorkflow}
+                disabled={promptValue.trim().length < 100 || isSubmitting}
+                loading={isSubmitting}
+                size="lg">
+                <Sparkles className="h-4 w-4" />
+                {t("workflows.generate_button")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (step === "followup") {
+    return (
+      <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+        <div className="w-full max-w-2xl space-y-8">
+          <div className="space-y-3 text-center">
+            <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-xl bg-slate-100">
+              <Sparkles className="h-6 w-6 text-brand-dark" />
+            </div>
+            <h1 className="text-3xl font-bold tracking-tight text-slate-800">
+              {t("workflows.coming_soon_title")}
+            </h1>
+            <p className="mx-auto max-w-md text-base text-slate-500">
+              {t("workflows.coming_soon_description")}
+            </p>
+          </div>
+
+          <div className="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
+            <label className="text-md mb-2 block font-medium text-slate-700">
+              {t("workflows.follow_up_label")}
+            </label>
+            <textarea
+              value={detailsValue}
+              onChange={(e) => setDetailsValue(e.target.value)}
+              placeholder={t("workflows.follow_up_placeholder")}
+              rows={4}
+              className="w-full resize-none rounded-lg border border-slate-200 bg-slate-50 px-4 py-3 text-sm text-slate-800 transition-all placeholder:text-slate-400 focus:border-brand-dark focus:bg-white focus:outline-none focus:ring-2 focus:ring-brand-light/20"
+            />
+            <div className="mt-4 flex items-center justify-end gap-3">
+              <Button variant="ghost" onClick={handleSkipFeedback} className="text-slate-500">
+                {t("common.skip")}
+              </Button>
+              <Button
+                onClick={handleSubmitFeedback}
+                disabled={!detailsValue.trim() || isSubmitting}
+                loading={isSubmitting}>
+                {t("workflows.submit_button")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col items-center px-4 pt-[15vh]">
+      <div className="w-full max-w-md space-y-6 text-center">
+        <div className="mx-auto flex h-16 w-16 items-center justify-center rounded-full bg-green-50">
+          <CheckCircle2 className="h-8 w-8 text-green-500" />
+        </div>
+        <h1 className="text-2xl font-bold text-slate-800">{t("workflows.thank_you_title")}</h1>
+        <p className="text-base text-slate-500">{t("workflows.thank_you_description")}</p>
+      </div>
+    </div>
+  );
+};

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

@@ -0,0 +1,42 @@
+import { Metadata } from "next";
+import { notFound, redirect } from "next/navigation";
+import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
+import { getUser } from "@/lib/user/service";
+import { getCloudBillingDisplayContext } from "@/modules/ee/billing/lib/cloud-billing-display";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { WorkflowsPage } from "./components/workflows-page";
+
+export const metadata: Metadata = {
+  title: "Workflows",
+};
+
+const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
+  const params = await props.params;
+
+  if (!IS_FORMBRICKS_CLOUD) {
+    return notFound();
+  }
+
+  const { session, organization, isBilling } = await getEnvironmentAuth(params.environmentId);
+
+  if (isBilling) {
+    return redirect(`/environments/${params.environmentId}/settings/billing`);
+  }
+
+  const user = await getUser(session.user.id);
+  if (!user) {
+    return redirect("/auth/login");
+  }
+
+  const cloudBillingDisplayContext = await getCloudBillingDisplayContext(organization.id);
+
+  return (
+    <WorkflowsPage
+      userEmail={user.email}
+      organizationName={organization.name}
+      billingPlan={cloudBillingDisplayContext.currentCloudPlan}
+    />
+  );
+};
+
+export default Page;

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/actions.ts

@@ -4,7 +4,6 @@ import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import { ZIntegrationInput } from "@formbricks/types/integration";
 import { createOrUpdateIntegration, deleteIntegration } from "@/lib/integration/service";
-import { capturePostHogEvent } from "@/lib/posthog";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import {
@@ -46,12 +45,6 @@ export const createOrUpdateIntegrationAction = authenticatedActionClient
       const result = await createOrUpdateIntegration(parsedInput.environmentId, parsedInput.integrationData);
       ctx.auditLoggingCtx.integrationId = result.id;
       ctx.auditLoggingCtx.newObject = result;
-
-      capturePostHogEvent(ctx.user.id, "integration_connected", {
-        integration_type: parsedInput.integrationData.type,
-        organization_id: organizationId,
-      });
-
       return result;
     })
   );

apps/web/app/(app)/environments/[environmentId]/workspace/integrations/page.tsx

@@ -13,9 +13,7 @@ import notionLogo from "@/images/notion.png";
 import SlackLogo from "@/images/slacklogo.png";
 import WebhookLogo from "@/images/webhook.png";
 import ZapierLogo from "@/images/zapier-small.png";
-import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getIntegrations } from "@/lib/integration/service";
-import { getBillingFallbackPath } from "@/lib/membership/navigation";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { ProjectConfigNavigation } from "@/modules/projects/settings/components/project-config-navigation";
@@ -55,7 +53,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     integrations.some((integration) => integration.type === type);
 
   if (isBilling) {
-    return redirect(getBillingFallbackPath(params.environmentId, IS_FORMBRICKS_CLOUD));
+    return redirect(`/environments/${params.environmentId}/settings/billing`);
   }
 
   const isGoogleSheetsIntegrationConnected = isIntegrationConnected("googleSheets");

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

@@ -6,10 +6,8 @@ import {
   CHATWOOT_WEBSITE_TOKEN,
   IS_CHATWOOT_CONFIGURED,
   POSTHOG_KEY,
-  SESSION_MAX_AGE,
 } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
-import { NextAuthProvider } from "@/modules/auth/components/next-auth-provider";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ClientLogout } from "@/modules/ui/components/client-logout";
 import { NoMobileOverlay } from "@/modules/ui/components/no-mobile-overlay";
@@ -25,7 +23,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
   }
 
   return (
-    <NextAuthProvider sessionMaxAge={SESSION_MAX_AGE}>
+    <>
       <NoMobileOverlay />
       {POSTHOG_KEY && user && (
         <PostHogIdentify posthogKey={POSTHOG_KEY} userId={user.id} email={user.email} name={user.name} />
@@ -41,7 +39,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
       )}
       <ToasterClient />
       {children}
-    </NextAuthProvider>
+    </>
   );
 };
 

apps/web/app/api/(internal)/pipeline/lib/telemetry.test.ts

@@ -51,20 +51,8 @@ vi.mock("@/lib/env", () => ({
     RECAPTCHA_SECRET_KEY: "secret-key",
     GITHUB_ID: "github-id",
     SAML_DATABASE_URL: "postgresql://saml.example.com/formbricks",
-    ENTERPRISE_LICENSE_KEY: "test-license-key",
   },
 }));
-vi.mock("@/lib/constants", () => ({
-  E2E_TESTING: false,
-  IS_DEVELOPMENT: false,
-  TELEMETRY_DISABLED: false,
-}));
-vi.mock("@/lib/hash-string", () => ({
-  hashString: vi.fn((s: string) => `hashed-${s}`),
-}));
-vi.mock("@/modules/ee/license-check/lib/license", () => ({
-  getEnterpriseLicense: vi.fn(),
-}));
 
 // Mock fetch
 const fetchMock = vi.fn();
@@ -211,14 +199,6 @@ describe("sendTelemetryEvents", () => {
   test("should handle telemetry send failure and apply cooldown", async () => {
     // Reset module to clear nextTelemetryCheck state from previous tests
     vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
     const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
 
     // Ensure we can acquire lock by setting last sent time far in the past
@@ -241,7 +221,6 @@ describe("sendTelemetryEvents", () => {
       expect.objectContaining({
         error: networkError,
         message: "Network error",
-        hashedLicenseKey: "hashed-test-license-key",
       }),
       "Failed to send telemetry - applying 1h cooldown"
     );
@@ -263,14 +242,6 @@ describe("sendTelemetryEvents", () => {
   test("should skip if no organization exists", async () => {
     // Reset module to clear nextTelemetryCheck state from previous tests
     vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
     const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
 
     // Ensure we can acquire lock by setting last sent time far in the past
@@ -305,113 +276,4 @@ describe("sendTelemetryEvents", () => {
     // This might be a bug, but we test the actual behavior
     expect(mockCacheService.set).toHaveBeenCalled();
   });
-
-  test("should skip telemetry when TELEMETRY_DISABLED is true and no active EE license", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: true,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: false }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    // Should return early without touching cache or sending telemetry
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  test("should send telemetry when TELEMETRY_DISABLED is true but EE license is active", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: true,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    // Re-setup mocks after resetModules
-    vi.mocked(getCacheService).mockResolvedValue({
-      ok: true,
-      data: mockCacheService as any,
-    });
-    mockCacheService.tryLock.mockResolvedValue({ ok: true, data: true });
-    mockCacheService.del.mockResolvedValue({ ok: true, data: undefined });
-    mockCacheService.get.mockResolvedValue({ ok: true, data: null });
-    mockCacheService.set.mockResolvedValue({ ok: true, data: undefined });
-
-    vi.mocked(prisma.organization.findFirst).mockResolvedValue({
-      id: "org-123",
-      createdAt: new Date("2023-01-01"),
-    } as any);
-    vi.mocked(prisma.$queryRaw).mockResolvedValue([
-      {
-        organizationCount: BigInt(1),
-        userCount: BigInt(5),
-        teamCount: BigInt(2),
-        projectCount: BigInt(3),
-        surveyCount: BigInt(10),
-        inProgressSurveyCount: BigInt(4),
-        completedSurveyCount: BigInt(6),
-        responseCountAllTime: BigInt(100),
-        responseCountSinceLastUpdate: BigInt(10),
-        displayCount: BigInt(50),
-        contactCount: BigInt(20),
-        segmentCount: BigInt(4),
-        newestResponseAt: new Date("2024-01-01T00:00:00.000Z"),
-      },
-    ] as any);
-    vi.mocked(prisma.integration.findMany).mockResolvedValue([{ type: IntegrationType.notion }] as any);
-    vi.mocked(prisma.account.findMany).mockResolvedValue([{ provider: "github" }] as any);
-    fetchMock.mockResolvedValue({ ok: true });
-
-    await freshSendTelemetryEvents();
-
-    // EE license active — telemetry should bypass TELEMETRY_DISABLED and send
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-
-  test("should unconditionally skip when E2E_TESTING is true even with active EE license", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: true,
-      IS_DEVELOPMENT: false,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    // E2E_TESTING is a hard skip — no EE bypass, no cache, no fetch
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  test("should unconditionally skip when IS_DEVELOPMENT is true", async () => {
-    vi.resetModules();
-    vi.doMock("@/lib/constants", () => ({
-      E2E_TESTING: false,
-      IS_DEVELOPMENT: true,
-      TELEMETRY_DISABLED: false,
-    }));
-    vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({ active: true }),
-    }));
-    const { sendTelemetryEvents: freshSendTelemetryEvents } = await import("./telemetry");
-
-    await freshSendTelemetryEvents();
-
-    expect(getCacheService).not.toHaveBeenCalled();
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
 });

apps/web/app/api/(internal)/pipeline/lib/telemetry.ts

@@ -2,11 +2,8 @@ import { IntegrationType } from "@prisma/client";
 import { createCacheKey, getCacheService } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
-import { E2E_TESTING, IS_DEVELOPMENT, TELEMETRY_DISABLED } from "@/lib/constants";
 import { env } from "@/lib/env";
-import { hashString } from "@/lib/hash-string";
 import { getInstanceInfo } from "@/lib/instance";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/license";
 import packageJson from "@/package.json";
 
 const TELEMETRY_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
@@ -27,31 +24,8 @@ let nextTelemetryCheck = 0;
  * 2. Redis check (shared across instances, persists across restarts)
  * 3. Distributed lock (prevents concurrent execution in multi-instance deployments)
  */
-// Hashed license key for log context — allows correlating log entries to a specific license
-// without exposing the raw key. Computed once at module load.
-const hashedLicenseKey = env.ENTERPRISE_LICENSE_KEY ? hashString(env.ENTERPRISE_LICENSE_KEY) : null;
-
-/**
- * Returns true if telemetry is disabled via env var AND there is no active EE license.
- * EE customers cannot opt out — telemetry is always enforced for license compliance.
- */
-const isTelemetryDisabledForCE = async (): Promise<boolean> => {
-  if (!TELEMETRY_DISABLED) return false;
-  const license = await getEnterpriseLicense();
-  return !license.active;
-};
-
 export const sendTelemetryEvents = async () => {
   try {
-    // ============================================================
-    // CHECK 0: Non-Production Hard Skip
-    // ============================================================
-    // Purpose: Unconditionally skip telemetry in dev and test/CI environments.
-    // No EE bypass — these are internal flags, not customer-facing.
-    if (E2E_TESTING || IS_DEVELOPMENT) {
-      return;
-    }
-
     const now = Date.now();
 
     // ============================================================
@@ -65,18 +39,7 @@ export const sendTelemetryEvents = async () => {
     }
 
     // ============================================================
-    // CHECK 2: Telemetry Disabled Check
-    // ============================================================
-    // Purpose: Allow CE self-hosters to opt out of telemetry via env var.
-    // EE bypass: If an active Enterprise License is detected, telemetry is always sent
-    // regardless of the TELEMETRY_DISABLED setting to enforce license compliance.
-    // Placed after in-memory check to avoid calling getEnterpriseLicense() on every invocation.
-    if (await isTelemetryDisabledForCE()) {
-      return;
-    }
-
-    // ============================================================
-    // CHECK 3: Redis Check (Shared State)
+    // CHECK 2: Redis Check (Shared State)
     // ============================================================
     // Purpose: Check if telemetry was sent recently by ANY instance (shared across cluster).
     // This persists across restarts and works in multi-instance deployments.
@@ -103,7 +66,7 @@ export const sendTelemetryEvents = async () => {
     }
 
     // ============================================================
-    // CHECK 4: Distributed Lock (Prevent Concurrent Execution)
+    // CHECK 3: Distributed Lock (Prevent Concurrent Execution)
     // ============================================================
     // Purpose: Ensure only ONE instance executes telemetry at a time in a cluster.
     // How it works:
@@ -137,7 +100,7 @@ export const sendTelemetryEvents = async () => {
       // Log as warning since telemetry is non-essential
       const errorMessage = e instanceof Error ? e.message : String(e);
       logger.warn(
-        { error: e, message: errorMessage, lastSent, now, hashedLicenseKey },
+        { error: e, message: errorMessage, lastSent, now },
         "Failed to send telemetry - applying 1h cooldown"
       );
 
@@ -155,7 +118,7 @@ export const sendTelemetryEvents = async () => {
     // Log as warning since telemetry is non-essential functionality
     const errorMessage = error instanceof Error ? error.message : String(error);
     logger.warn(
-      { error, message: errorMessage, timestamp: Date.now(), hashedLicenseKey },
+      { error, message: errorMessage, timestamp: Date.now() },
       "Unexpected error in sendTelemetryEvents wrapper - telemetry check skipped"
     );
   }

apps/web/app/api/(internal)/pipeline/route.ts

@@ -1,7 +1,6 @@
 import { PipelineTriggers, Webhook } from "@prisma/client";
 import { headers } from "next/headers";
 import { v7 as uuidv7 } from "uuid";
-import { createCacheKey } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
@@ -9,12 +8,10 @@ import { sendTelemetryEvents } from "@/app/api/(internal)/pipeline/lib/telemetry
 import { ZPipelineInput } from "@/app/api/(internal)/pipeline/types/pipelines";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { cache } from "@/lib/cache";
-import { CRON_SECRET, POSTHOG_KEY } from "@/lib/constants";
+import { CRON_SECRET } from "@/lib/constants";
 import { generateStandardWebhookSignature } from "@/lib/crypto";
 import { getIntegrations } from "@/lib/integration/service";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
-import { capturePostHogEvent } from "@/lib/posthog";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { convertDatesInObject } from "@/lib/time";
@@ -302,27 +299,6 @@ export const POST = async (request: Request) => {
       logger.error({ error, responseId: response.id }, "Failed to record response meter event");
     });
 
-    // Sampled PostHog tracking: first response + every 100th
-    if (POSTHOG_KEY) {
-      const responseCount = await cache.withCache(
-        () => getResponseCountBySurveyId(surveyId),
-        createCacheKey.response.countBySurveyId(surveyId),
-        60 * 1000
-      );
-
-      if (responseCount === 1 || responseCount % 100 === 0) {
-        capturePostHogEvent(organization.id, "survey_response_received", {
-          survey_id: surveyId,
-          survey_type: survey.type,
-          organization_id: organization.id,
-          environment_id: environmentId,
-          response_count: responseCount,
-          is_first_response: responseCount === 1,
-          milestone: responseCount === 1 ? "first" : String(responseCount),
-        });
-      }
-    }
-
     // Send telemetry events
     await sendTelemetryEvents();
   }

apps/web/app/api/auth/[...nextauth]/route.test.ts

@@ -1,139 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { GET } from "./route";
-
-const mocks = vi.hoisted(() => {
-  const nextAuthHandler = vi.fn(async () => new Response(null, { status: 200 }));
-  const nextAuth = vi.fn(() => nextAuthHandler);
-
-  return {
-    nextAuth,
-    nextAuthHandler,
-    baseSignIn: vi.fn(async () => true),
-    baseSession: vi.fn(async ({ session }: { session: unknown }) => session),
-    baseEventSignIn: vi.fn(),
-    queueAuditEventBackground: vi.fn(),
-    captureException: vi.fn(),
-    loggerError: vi.fn(),
-  };
-});
-
-vi.mock("next-auth", () => ({
-  default: mocks.nextAuth,
-}));
-
-vi.mock("@/lib/constants", () => ({
-  IS_PRODUCTION: false,
-  SENTRY_DSN: undefined,
-}));
-
-vi.mock("@sentry/nextjs", () => ({
-  captureException: mocks.captureException,
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: mocks.loggerError,
-    })),
-  },
-}));
-
-vi.mock("@/modules/auth/lib/authOptions", () => ({
-  authOptions: {
-    callbacks: {
-      signIn: mocks.baseSignIn,
-      session: mocks.baseSession,
-    },
-    events: {
-      signIn: mocks.baseEventSignIn,
-    },
-  },
-}));
-
-vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
-  queueAuditEventBackground: mocks.queueAuditEventBackground,
-}));
-
-const getWrappedAuthOptions = async (requestId: string = "req-123") => {
-  const request = new Request("http://localhost/api/auth/signin", {
-    headers: { "x-request-id": requestId },
-  });
-
-  await GET(request, {} as any);
-
-  expect(mocks.nextAuth).toHaveBeenCalledTimes(1);
-
-  return mocks.nextAuth.mock.calls[0][0];
-};
-
-describe("auth route audit logging", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("logs successful sign-in from the NextAuth signIn event after session creation", async () => {
-    const authOptions = await getWrappedAuthOptions();
-    const user = { id: "user_1", email: "user@example.com", name: "User Example" };
-    const account = { provider: "keycloak" };
-
-    await expect(authOptions.callbacks.signIn({ user, account })).resolves.toBe(true);
-    expect(mocks.queueAuditEventBackground).not.toHaveBeenCalled();
-
-    await authOptions.events.signIn({ user, account, isNewUser: false });
-
-    expect(mocks.baseEventSignIn).toHaveBeenCalledWith({ user, account, isNewUser: false });
-    expect(mocks.queueAuditEventBackground).toHaveBeenCalledWith(
-      expect.objectContaining({
-        action: "signedIn",
-        targetType: "user",
-        userId: "user_1",
-        targetId: "user_1",
-        organizationId: "unknown",
-        status: "success",
-        userType: "user",
-        newObject: expect.objectContaining({
-          email: "user@example.com",
-          authMethod: "sso",
-          provider: "keycloak",
-          sessionStrategy: "database",
-          isNewUser: false,
-        }),
-      })
-    );
-  });
-
-  test("logs failed sign-in attempts from the callback stage with the request event id", async () => {
-    const error = new Error("Access denied");
-    mocks.baseSignIn.mockRejectedValueOnce(error);
-
-    const authOptions = await getWrappedAuthOptions("req-failure");
-    const user = { id: "user_2", email: "user2@example.com" };
-    const account = { provider: "credentials" };
-
-    await expect(authOptions.callbacks.signIn({ user, account })).rejects.toThrow("Access denied");
-
-    expect(mocks.baseEventSignIn).not.toHaveBeenCalled();
-    expect(mocks.queueAuditEventBackground).toHaveBeenCalledWith(
-      expect.objectContaining({
-        action: "signedIn",
-        targetType: "user",
-        userId: "user_2",
-        targetId: "user_2",
-        organizationId: "unknown",
-        status: "failure",
-        userType: "user",
-        eventId: "req-failure",
-        newObject: expect.objectContaining({
-          email: "user2@example.com",
-          authMethod: "password",
-          provider: "credentials",
-          errorMessage: "Access denied",
-        }),
-      })
-    );
-  });
-});

apps/web/app/api/auth/[...nextauth]/route.ts

@@ -6,26 +6,10 @@ import { logger } from "@formbricks/logger";
 import { IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { authOptions as baseAuthOptions } from "@/modules/auth/lib/authOptions";
 import { queueAuditEventBackground } from "@/modules/ee/audit-logs/lib/handler";
-import { UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
+import { TAuditStatus, UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
 
 export const fetchCache = "force-no-store";
 
-const getAuthMethod = (account: Account | null) => {
-  if (account?.provider === "credentials") {
-    return "password";
-  }
-
-  if (account?.provider === "token") {
-    return "email_verification";
-  }
-
-  if (account?.provider) {
-    return "sso";
-  }
-
-  return "unknown";
-};
-
 const handler = async (req: Request, ctx: any) => {
   const eventId = req.headers.get("x-request-id") ?? undefined;
 
@@ -33,6 +17,44 @@ const handler = async (req: Request, ctx: any) => {
     ...baseAuthOptions,
     callbacks: {
       ...baseAuthOptions.callbacks,
+      async jwt(params: any) {
+        let result: any = params.token;
+        let error: any = undefined;
+
+        try {
+          if (baseAuthOptions.callbacks?.jwt) {
+            result = await baseAuthOptions.callbacks.jwt(params);
+          }
+        } catch (err) {
+          error = err;
+          logger.withContext({ eventId, err }).error("JWT callback failed");
+
+          if (SENTRY_DSN && IS_PRODUCTION) {
+            Sentry.captureException(err);
+          }
+        }
+
+        // Audit JWT operations (token refresh, updates)
+        if (params.trigger && params.token?.profile?.id) {
+          const status: TAuditStatus = error ? "failure" : "success";
+          const auditLog = {
+            action: "jwtTokenCreated" as const,
+            targetType: "user" as const,
+            userId: params.token.profile.id,
+            targetId: params.token.profile.id,
+            organizationId: UNKNOWN_DATA,
+            status,
+            userType: "user" as const,
+            newObject: { trigger: params.trigger, tokenType: "jwt" },
+            ...(error ? { eventId } : {}),
+          };
+
+          queueAuditEventBackground(auditLog);
+        }
+
+        if (error) throw error;
+        return result;
+      },
       async session(params: any) {
         let result: any = params.session;
         let error: any = undefined;
@@ -68,7 +90,7 @@ const handler = async (req: Request, ctx: any) => {
       }) {
         let result: boolean | string = true;
         let error: any = undefined;
-        const authMethod = getAuthMethod(account);
+        let authMethod = "unknown";
 
         try {
           if (baseAuthOptions.callbacks?.signIn) {
@@ -80,6 +102,15 @@ const handler = async (req: Request, ctx: any) => {
               credentials,
             });
           }
+
+          // Determine authentication method for more detailed logging
+          if (account?.provider === "credentials") {
+            authMethod = "password";
+          } else if (account?.provider === "token") {
+            authMethod = "email_verification";
+          } else if (account?.provider && account.provider !== "credentials") {
+            authMethod = "sso";
+          }
         } catch (err) {
           error = err;
           result = false;
@@ -91,58 +122,28 @@ const handler = async (req: Request, ctx: any) => {
           }
         }
 
-        if (result === false) {
-          queueAuditEventBackground({
-            action: "signedIn",
-            targetType: "user",
-            userId: user?.id ?? UNKNOWN_DATA,
-            targetId: user?.id ?? UNKNOWN_DATA,
-            organizationId: UNKNOWN_DATA,
-            status: "failure",
-            userType: "user",
-            newObject: {
-              ...user,
-              authMethod,
-              provider: account?.provider,
-              ...(error instanceof Error ? { errorMessage: error.message } : {}),
-            },
-            eventId,
-          });
-        }
-
-        if (error) throw error;
-        return result;
-      },
-    },
-    events: {
-      ...baseAuthOptions.events,
-      async signIn({ user, account, isNewUser }: any) {
-        try {
-          await baseAuthOptions.events?.signIn?.({ user, account, isNewUser });
-        } catch (err) {
-          logger.withContext({ eventId, err }).error("Sign-in event callback failed");
-
-          if (SENTRY_DSN && IS_PRODUCTION) {
-            Sentry.captureException(err);
-          }
-        }
-
-        queueAuditEventBackground({
-          action: "signedIn",
-          targetType: "user",
+        const status: TAuditStatus = result === false ? "failure" : "success";
+        const auditLog = {
+          action: "signedIn" as const,
+          targetType: "user" as const,
           userId: user?.id ?? UNKNOWN_DATA,
           targetId: user?.id ?? UNKNOWN_DATA,
           organizationId: UNKNOWN_DATA,
-          status: "success",
-          userType: "user",
+          status,
+          userType: "user" as const,
           newObject: {
             ...user,
-            authMethod: getAuthMethod(account),
+            authMethod,
             provider: account?.provider,
-            sessionStrategy: "database",
-            isNewUser: isNewUser ?? false,
+            ...(error ? { errorMessage: error.message } : {}),
           },
-        });
+          ...(status === "failure" ? { eventId } : {}),
+        };
+
+        queueAuditEventBackground(auditLog);
+
+        if (error) throw error;
+        return result;
       },
     },
   };

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.test.ts

@@ -6,7 +6,6 @@ import { TJsEnvironmentState, TJsEnvironmentStateProject } from "@formbricks/typ
 import { TOrganization } from "@formbricks/types/organizations";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { cache } from "@/lib/cache";
-import { capturePostHogEvent } from "@/lib/posthog";
 import { EnvironmentStateData, getEnvironmentStateData } from "./data";
 import { getEnvironmentState } from "./environmentState";
 
@@ -37,11 +36,6 @@ vi.mock("@/lib/constants", () => ({
   IS_RECAPTCHA_CONFIGURED: true,
   IS_PRODUCTION: true,
   ENTERPRISE_LICENSE_KEY: "mock_enterprise_license_key",
-  POSTHOG_KEY: "phc_test_key",
-}));
-
-vi.mock("@/lib/posthog", () => ({
-  capturePostHogEvent: vi.fn(),
 }));
 
 // Mock @formbricks/cache
@@ -82,8 +76,7 @@ const mockOrganization: TOrganization = {
     },
     usageCycleAnchor: new Date(),
   },
-  isAISmartToolsEnabled: false,
-  isAIDataAnalysisEnabled: false,
+  isAIEnabled: false,
 };
 
 const mockSurveys: TSurvey[] = [
@@ -309,38 +302,4 @@ describe("getEnvironmentState", () => {
 
     expect(result.data.actionClasses).toEqual([]);
   });
-
-  test("should capture app_connected PostHog event when app setup completes", async () => {
-    const noCodeAction = {
-      ...mockActionClasses[0],
-      id: "action-2",
-      type: "noCode" as const,
-      key: null,
-    };
-    const incompleteEnvironmentData = {
-      ...mockEnvironmentStateData,
-      environment: {
-        ...mockEnvironmentStateData.environment,
-        appSetupCompleted: false,
-      },
-      actionClasses: [...mockActionClasses, noCodeAction],
-    };
-    vi.mocked(getEnvironmentStateData).mockResolvedValue(incompleteEnvironmentData);
-
-    await getEnvironmentState(environmentId);
-
-    expect(capturePostHogEvent).toHaveBeenCalledWith(environmentId, "app_connected", {
-      num_surveys: 1,
-      num_code_actions: 1,
-      num_no_code_actions: 1,
-    });
-  });
-
-  test("should not capture app_connected event when app setup already completed", async () => {
-    vi.mocked(getEnvironmentStateData).mockResolvedValue(mockEnvironmentStateData);
-
-    await getEnvironmentState(environmentId);
-
-    expect(capturePostHogEvent).not.toHaveBeenCalled();
-  });
 });

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.ts

@@ -3,8 +3,7 @@ import { createCacheKey } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
 import { TJsEnvironmentState } from "@formbricks/types/js";
 import { cache } from "@/lib/cache";
-import { IS_RECAPTCHA_CONFIGURED, POSTHOG_KEY, RECAPTCHA_SITE_KEY } from "@/lib/constants";
-import { capturePostHogEvent } from "@/lib/posthog";
+import { IS_RECAPTCHA_CONFIGURED, RECAPTCHA_SITE_KEY } from "@/lib/constants";
 import { getEnvironmentStateData } from "./data";
 
 /**
@@ -31,14 +30,6 @@ export const getEnvironmentState = async (
           where: { id: environmentId },
           data: { appSetupCompleted: true },
         });
-
-        if (POSTHOG_KEY) {
-          capturePostHogEvent(environmentId, "app_connected", {
-            num_surveys: surveys.length,
-            num_code_actions: actionClasses.filter((ac) => ac.type === "code").length,
-            num_no_code_actions: actionClasses.filter((ac) => ac.type === "noCode").length,
-          });
-        }
       }
 
       // Build the response data

apps/web/app/api/v1/client/[environmentId]/environment/route.ts

@@ -86,11 +86,9 @@ export const GET = withV1ApiWrapper({
         };
       }
 
-      const error = err instanceof Error ? err : new Error(String(err));
-
       logger.error(
         {
-          error,
+          error: err,
           url: req.url,
           environmentId: params.environmentId,
         },
@@ -98,10 +96,9 @@ export const GET = withV1ApiWrapper({
       );
       return {
         response: responses.internalServerErrorResponse(
-          "An error occurred while processing your request.",
+          err instanceof Error ? err.message : "Unknown error occurred",
           true
         ),
-        error,
       };
     }
   },

apps/web/app/api/v1/client/[environmentId]/responses/[responseId]/lib/put-response-handler.test.ts

@@ -1,488 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { responses } from "@/app/lib/api/response";
-import { putResponseHandler } from "./put-response-handler";
-
-const mocks = vi.hoisted(() => ({
-  formatValidationErrorsForV1Api: vi.fn((errors) => errors),
-  getResponse: vi.fn(),
-  getSurvey: vi.fn(),
-  getValidatedResponseUpdateInput: vi.fn(),
-  loggerError: vi.fn(),
-  sendToPipeline: vi.fn(),
-  updateResponseWithQuotaEvaluation: vi.fn(),
-  validateFileUploads: vi.fn(),
-  validateOtherOptionLengthForMultipleChoice: vi.fn(),
-  validateResponseData: vi.fn(),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    error: mocks.loggerError,
-  },
-}));
-
-vi.mock("@/app/lib/pipelines", () => ({
-  sendToPipeline: mocks.sendToPipeline,
-}));
-
-vi.mock("@/lib/response/service", () => ({
-  getResponse: mocks.getResponse,
-}));
-
-vi.mock("@/lib/survey/service", () => ({
-  getSurvey: mocks.getSurvey,
-}));
-
-vi.mock("@/modules/api/lib/validation", () => ({
-  formatValidationErrorsForV1Api: mocks.formatValidationErrorsForV1Api,
-  validateResponseData: mocks.validateResponseData,
-}));
-
-vi.mock("@/modules/api/v2/lib/element", () => ({
-  validateOtherOptionLengthForMultipleChoice: mocks.validateOtherOptionLengthForMultipleChoice,
-}));
-
-vi.mock("@/modules/storage/utils", () => ({
-  validateFileUploads: mocks.validateFileUploads,
-}));
-
-vi.mock("./response", () => ({
-  updateResponseWithQuotaEvaluation: mocks.updateResponseWithQuotaEvaluation,
-}));
-
-vi.mock("./validated-response-update-input", () => ({
-  getValidatedResponseUpdateInput: mocks.getValidatedResponseUpdateInput,
-}));
-
-const environmentId = "environment_a";
-const responseId = "response_123";
-const surveyId = "survey_123";
-
-const createRequest = () =>
-  new Request(`https://api.test/api/v1/client/${environmentId}/responses/${responseId}`, {
-    method: "PUT",
-  });
-
-const createHandlerParams = (params?: Partial<{ environmentId: string; responseId: string }>) =>
-  ({
-    req: createRequest(),
-    props: {
-      params: Promise.resolve({
-        environmentId,
-        responseId,
-        ...params,
-      }),
-    },
-  }) as never;
-
-const getBaseResponseUpdateInput = () => ({
-  data: {
-    q1: "updated-answer",
-  },
-  language: "en",
-});
-
-const getBaseExistingResponse = () =>
-  ({
-    id: responseId,
-    surveyId,
-    data: {
-      q0: "existing-answer",
-    },
-    finished: false,
-    language: "en",
-  }) as const;
-
-const getBaseSurvey = () =>
-  ({
-    id: surveyId,
-    environmentId,
-    blocks: [],
-    questions: [],
-  }) as const;
-
-const getBaseUpdatedResponse = () =>
-  ({
-    id: responseId,
-    surveyId,
-    data: {
-      q0: "existing-answer",
-      q1: "updated-answer",
-    },
-    finished: false,
-    quotaFull: undefined,
-  }) as const;
-
-describe("putResponseHandler", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    mocks.getValidatedResponseUpdateInput.mockResolvedValue({
-      responseUpdateInput: getBaseResponseUpdateInput(),
-    });
-    mocks.getResponse.mockResolvedValue(getBaseExistingResponse());
-    mocks.getSurvey.mockResolvedValue(getBaseSurvey());
-    mocks.updateResponseWithQuotaEvaluation.mockResolvedValue(getBaseUpdatedResponse());
-    mocks.validateFileUploads.mockReturnValue(true);
-    mocks.validateOtherOptionLengthForMultipleChoice.mockReturnValue(null);
-    mocks.validateResponseData.mockReturnValue(null);
-  });
-
-  test("returns a bad request response when the response id is missing", async () => {
-    const result = await putResponseHandler(createHandlerParams({ responseId: "" }));
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response ID is missing",
-      details: {},
-    });
-    expect(mocks.getValidatedResponseUpdateInput).not.toHaveBeenCalled();
-  });
-
-  test("returns the validation response from the parsed request input", async () => {
-    const validationResponse = responses.badRequestResponse(
-      "Malformed JSON in request body",
-      undefined,
-      true
-    );
-    mocks.getValidatedResponseUpdateInput.mockResolvedValue({
-      response: validationResponse,
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response).toBe(validationResponse);
-    expect(mocks.getResponse).not.toHaveBeenCalled();
-  });
-
-  test("returns not found when the response does not exist", async () => {
-    mocks.getResponse.mockResolvedValue(null);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("maps resource lookup errors to a not found response", async () => {
-    mocks.getResponse.mockRejectedValue(new ResourceNotFoundError("Response", responseId));
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("maps invalid lookup input errors to a bad request response", async () => {
-    mocks.getResponse.mockRejectedValue(new InvalidInputError("Invalid response id"));
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Invalid response id",
-      details: {},
-    });
-  });
-
-  test("maps database lookup errors to a reported internal server error", async () => {
-    const error = new DatabaseError("Lookup failed");
-    mocks.getResponse.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Lookup failed",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("maps unknown lookup failures to a generic internal server error", async () => {
-    const error = new Error("boom");
-    mocks.getResponse.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Unknown error occurred",
-      details: {},
-    });
-  });
-
-  test("rejects updates when the response survey does not belong to the requested environment", async () => {
-    mocks.getSurvey.mockResolvedValue({
-      ...getBaseSurvey(),
-      environmentId: "different_environment",
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-
-  test("rejects updates when the response is already finished", async () => {
-    mocks.getResponse.mockResolvedValue({
-      ...getBaseExistingResponse(),
-      finished: true,
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response is already finished",
-      details: {},
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("rejects invalid file upload updates", async () => {
-    mocks.validateFileUploads.mockReturnValue(false);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Invalid file upload response",
-      details: {},
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("rejects updates when an other-option response exceeds the character limit", async () => {
-    mocks.validateOtherOptionLengthForMultipleChoice.mockReturnValue("question_123");
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response exceeds character limit",
-      details: {
-        questionId: "question_123",
-      },
-    });
-    expect(mocks.updateResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-  });
-
-  test("returns validation details when merged response data is invalid", async () => {
-    mocks.validateResponseData.mockReturnValue([{ field: "q1", message: "Required" }]);
-    mocks.formatValidationErrorsForV1Api.mockReturnValue({
-      q1: "Required",
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Validation failed",
-      details: {
-        q1: "Required",
-      },
-    });
-    expect(mocks.formatValidationErrorsForV1Api).toHaveBeenCalledWith([{ field: "q1", message: "Required" }]);
-  });
-
-  test("returns not found when the response disappears during update", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(
-      new ResourceNotFoundError("Response", responseId)
-    );
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(404);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "not_found",
-      message: "Response not found",
-      details: {
-        resource_id: responseId,
-        resource_type: "Response",
-      },
-    });
-  });
-
-  test("returns a bad request response for invalid update input during persistence", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(
-      new InvalidInputError("Response update payload is invalid")
-    );
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Response update payload is invalid",
-      details: {},
-    });
-  });
-
-  test("returns a reported internal server error for database update failures", async () => {
-    const error = new DatabaseError("Update failed");
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Update failed",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("returns a generic internal server error for unexpected update failures", async () => {
-    const error = new Error("Unexpected persistence failure");
-    mocks.updateResponseWithQuotaEvaluation.mockRejectedValue(error);
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.error).toBe(error);
-    expect(result.response.status).toBe(500);
-    await expect(result.response.json()).resolves.toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong",
-      details: {},
-    });
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        error,
-        url: createRequest().url,
-      },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-  });
-
-  test("returns a success payload and emits a responseUpdated pipeline event", async () => {
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(200);
-    await expect(result.response.json()).resolves.toEqual({
-      data: {
-        id: responseId,
-        quotaFull: false,
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenCalledTimes(1);
-    expect(mocks.sendToPipeline).toHaveBeenCalledWith({
-      event: "responseUpdated",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: false,
-      },
-    });
-  });
-
-  test("emits both pipeline events and includes quota metadata when the response finishes", async () => {
-    mocks.updateResponseWithQuotaEvaluation.mockResolvedValue({
-      ...getBaseUpdatedResponse(),
-      finished: true,
-      quotaFull: {
-        id: "quota_123",
-        action: "endSurvey",
-        endingCardId: "ending_card_123",
-      },
-    });
-
-    const result = await putResponseHandler(createHandlerParams());
-
-    expect(result.response.status).toBe(200);
-    await expect(result.response.json()).resolves.toEqual({
-      data: {
-        id: responseId,
-        quotaFull: true,
-        quota: {
-          id: "quota_123",
-          action: "endSurvey",
-          endingCardId: "ending_card_123",
-        },
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenCalledTimes(2);
-    expect(mocks.sendToPipeline).toHaveBeenNthCalledWith(1, {
-      event: "responseUpdated",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: true,
-      },
-    });
-    expect(mocks.sendToPipeline).toHaveBeenNthCalledWith(2, {
-      event: "responseFinished",
-      environmentId,
-      surveyId,
-      response: {
-        id: responseId,
-        surveyId,
-        data: {
-          q0: "existing-answer",
-          q1: "updated-answer",
-        },
-        finished: true,
-      },
-    });
-  });
-});

apps/web/app/api/v1/client/[environmentId]/responses/[responseId]/lib/put-response-handler.ts

@@ -1,283 +0,0 @@
-import { logger } from "@formbricks/logger";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { TResponse, TResponseUpdateInput } from "@formbricks/types/responses";
-import { TSurveyElement } from "@formbricks/types/surveys/elements";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { responses } from "@/app/lib/api/response";
-import { THandlerParams } from "@/app/lib/api/with-api-logging";
-import { sendToPipeline } from "@/app/lib/pipelines";
-import { getResponse } from "@/lib/response/service";
-import { getSurvey } from "@/lib/survey/service";
-import { formatValidationErrorsForV1Api, validateResponseData } from "@/modules/api/lib/validation";
-import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/element";
-import { createQuotaFullObject } from "@/modules/ee/quotas/lib/helpers";
-import { validateFileUploads } from "@/modules/storage/utils";
-import { updateResponseWithQuotaEvaluation } from "./response";
-import { getValidatedResponseUpdateInput } from "./validated-response-update-input";
-
-type TRouteResult = {
-  response: Response;
-  error?: unknown;
-};
-
-type TExistingResponseResult = { existingResponse: TResponse } | TRouteResult;
-type TSurveyResult = { survey: TSurvey } | TRouteResult;
-type TUpdatedResponseResult =
-  | { updatedResponse: Awaited<ReturnType<typeof updateResponseWithQuotaEvaluation>> }
-  | TRouteResult;
-
-export type TPutRouteParams = {
-  params: Promise<{
-    environmentId: string;
-    responseId: string;
-  }>;
-};
-
-const handleDatabaseError = (
-  error: Error,
-  url: string,
-  endpoint: string,
-  responseId: string
-): TRouteResult => {
-  if (error instanceof ResourceNotFoundError) {
-    return { response: responses.notFoundResponse("Response", responseId, true) };
-  }
-  if (error instanceof InvalidInputError) {
-    return { response: responses.badRequestResponse(error.message, undefined, true) };
-  }
-  if (error instanceof DatabaseError) {
-    logger.error({ error, url }, `Error in ${endpoint}`);
-    return {
-      response: responses.internalServerErrorResponse(error.message, true),
-      error,
-    };
-  }
-
-  return {
-    response: responses.internalServerErrorResponse("Unknown error occurred", true),
-    error,
-  };
-};
-
-const validateResponse = (
-  response: TResponse,
-  survey: TSurvey,
-  responseUpdateInput: TResponseUpdateInput
-) => {
-  const mergedData = {
-    ...response.data,
-    ...responseUpdateInput.data,
-  };
-
-  const validationErrors = validateResponseData(
-    survey.blocks,
-    mergedData,
-    responseUpdateInput.language ?? response.language ?? "en",
-    survey.questions
-  );
-
-  if (validationErrors) {
-    return {
-      response: responses.badRequestResponse(
-        "Validation failed",
-        formatValidationErrorsForV1Api(validationErrors),
-        true
-      ),
-    };
-  }
-};
-
-const getExistingResponse = async (req: Request, responseId: string): Promise<TExistingResponseResult> => {
-  try {
-    const existingResponse = await getResponse(responseId);
-
-    return existingResponse
-      ? { existingResponse }
-      : { response: responses.notFoundResponse("Response", responseId, true) };
-  } catch (error) {
-    return handleDatabaseError(
-      error instanceof Error ? error : new Error(String(error)),
-      req.url,
-      "PUT /api/v1/client/[environmentId]/responses/[responseId]",
-      responseId
-    );
-  }
-};
-
-const getSurveyForResponse = async (
-  req: Request,
-  responseId: string,
-  surveyId: string
-): Promise<TSurveyResult> => {
-  try {
-    const survey = await getSurvey(surveyId);
-
-    return survey ? { survey } : { response: responses.notFoundResponse("Survey", surveyId, true) };
-  } catch (error) {
-    return handleDatabaseError(
-      error instanceof Error ? error : new Error(String(error)),
-      req.url,
-      "PUT /api/v1/client/[environmentId]/responses/[responseId]",
-      responseId
-    );
-  }
-};
-
-const validateUpdateRequest = (
-  existingResponse: TResponse,
-  survey: TSurvey,
-  responseUpdateInput: TResponseUpdateInput
-): TRouteResult | undefined => {
-  if (existingResponse.finished) {
-    return {
-      response: responses.badRequestResponse("Response is already finished", undefined, true),
-    };
-  }
-
-  if (!validateFileUploads(responseUpdateInput.data, survey.questions)) {
-    return {
-      response: responses.badRequestResponse("Invalid file upload response", undefined, true),
-    };
-  }
-
-  const otherResponseInvalidQuestionId = validateOtherOptionLengthForMultipleChoice({
-    responseData: responseUpdateInput.data,
-    surveyQuestions: survey.questions as unknown as TSurveyElement[],
-    responseLanguage: responseUpdateInput.language,
-  });
-
-  if (otherResponseInvalidQuestionId) {
-    return {
-      response: responses.badRequestResponse(
-        `Response exceeds character limit`,
-        {
-          questionId: otherResponseInvalidQuestionId,
-        },
-        true
-      ),
-    };
-  }
-
-  return validateResponse(existingResponse, survey, responseUpdateInput);
-};
-
-const getUpdatedResponse = async (
-  req: Request,
-  responseId: string,
-  responseUpdateInput: TResponseUpdateInput
-): Promise<TUpdatedResponseResult> => {
-  try {
-    const updatedResponse = await updateResponseWithQuotaEvaluation(responseId, responseUpdateInput);
-    return { updatedResponse };
-  } catch (error) {
-    if (error instanceof ResourceNotFoundError) {
-      return {
-        response: responses.notFoundResponse("Response", responseId, true),
-      };
-    }
-    if (error instanceof InvalidInputError) {
-      return {
-        response: responses.badRequestResponse(error.message),
-      };
-    }
-    if (error instanceof DatabaseError) {
-      logger.error(
-        { error, url: req.url },
-        "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-      );
-      return {
-        response: responses.internalServerErrorResponse(error.message),
-        error,
-      };
-    }
-
-    const unexpectedError = error instanceof Error ? error : new Error(String(error));
-
-    logger.error(
-      { error: unexpectedError, url: req.url },
-      "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
-    );
-    return {
-      response: responses.internalServerErrorResponse("Something went wrong"),
-      error: unexpectedError,
-    };
-  }
-};
-
-export const putResponseHandler = async ({
-  req,
-  props,
-}: THandlerParams<TPutRouteParams>): Promise<TRouteResult> => {
-  const params = await props.params;
-  const { environmentId, responseId } = params;
-
-  if (!responseId) {
-    return {
-      response: responses.badRequestResponse("Response ID is missing", undefined, true),
-    };
-  }
-
-  const validatedUpdateInput = await getValidatedResponseUpdateInput(req);
-  if ("response" in validatedUpdateInput) {
-    return validatedUpdateInput;
-  }
-  const { responseUpdateInput } = validatedUpdateInput;
-
-  const existingResponseResult = await getExistingResponse(req, responseId);
-  if ("response" in existingResponseResult) {
-    return existingResponseResult;
-  }
-  const { existingResponse } = existingResponseResult;
-
-  const surveyResult = await getSurveyForResponse(req, responseId, existingResponse.surveyId);
-  if ("response" in surveyResult) {
-    return surveyResult;
-  }
-  const { survey } = surveyResult;
-
-  if (survey.environmentId !== environmentId) {
-    return {
-      response: responses.notFoundResponse("Response", responseId, true),
-    };
-  }
-
-  const validationResult = validateUpdateRequest(existingResponse, survey, responseUpdateInput);
-  if (validationResult) {
-    return validationResult;
-  }
-
-  const updatedResponseResult = await getUpdatedResponse(req, responseId, responseUpdateInput);
-  if ("response" in updatedResponseResult) {
-    return updatedResponseResult;
-  }
-  const { updatedResponse } = updatedResponseResult;
-
-  const { quotaFull, ...responseData } = updatedResponse;
-
-  sendToPipeline({
-    event: "responseUpdated",
-    environmentId: survey.environmentId,
-    surveyId: survey.id,
-    response: responseData,
-  });
-
-  if (updatedResponse.finished) {
-    sendToPipeline({
-      event: "responseFinished",
-      environmentId: survey.environmentId,
-      surveyId: survey.id,
-      response: responseData,
-    });
-  }
-
-  const quotaObj = createQuotaFullObject(quotaFull);
-
-  const responseDataWithQuota = {
-    id: responseData.id,
-    ...quotaObj,
-  };
-
-  return {
-    response: responses.successResponse(responseDataWithQuota, true),
-  };
-};

apps/web/app/api/v1/client/[environmentId]/responses/[responseId]/lib/validated-response-update-input.test.ts

@@ -1,84 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { getValidatedResponseUpdateInput } from "./validated-response-update-input";
-
-describe("getValidatedResponseUpdateInput", () => {
-  test("returns a bad request response for malformed JSON", async () => {
-    const request = new Request("http://localhost/api/v1/client/test/responses/response-id", {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: "{invalid-json",
-    });
-
-    const result = await getValidatedResponseUpdateInput(request);
-
-    expect("response" in result).toBe(true);
-
-    if (!("response" in result)) {
-      throw new Error("Expected a response result");
-    }
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual(
-      expect.objectContaining({
-        code: "bad_request",
-        message: "Malformed JSON in request body",
-        details: {
-          error: expect.any(String),
-        },
-      })
-    );
-  });
-
-  test("returns parsed response update input for valid JSON", async () => {
-    const request = new Request("http://localhost/api/v1/client/test/responses/response-id", {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        finished: true,
-      }),
-    });
-
-    const result = await getValidatedResponseUpdateInput(request);
-
-    expect(result).toEqual({
-      responseUpdateInput: {
-        finished: true,
-      },
-    });
-  });
-
-  test("returns a bad request response for schema-invalid JSON", async () => {
-    const request = new Request("http://localhost/api/v1/client/test/responses/response-id", {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        finished: "not-boolean",
-      }),
-    });
-
-    const result = await getValidatedResponseUpdateInput(request);
-
-    expect("response" in result).toBe(true);
-
-    if (!("response" in result)) {
-      throw new Error("Expected a response result");
-    }
-
-    expect(result.response.status).toBe(400);
-    await expect(result.response.json()).resolves.toEqual(
-      expect.objectContaining({
-        code: "bad_request",
-        message: "Fields are missing or incorrectly formatted",
-        details: expect.objectContaining({
-          finished: expect.any(String),
-        }),
-      })
-    );
-  });
-});

apps/web/app/api/v1/client/[environmentId]/responses/[responseId]/lib/validated-response-update-input.ts

@@ -1,28 +0,0 @@
-import { TResponseUpdateInput, ZResponseUpdateInput } from "@formbricks/types/responses";
-import {
-  TParseAndValidateJsonBodyResult,
-  parseAndValidateJsonBody,
-} from "@/app/lib/api/parse-and-validate-json-body";
-
-export type TValidatedResponseUpdateInputResult =
-  | { response: Response }
-  | { responseUpdateInput: TResponseUpdateInput };
-
-export const getValidatedResponseUpdateInput = async (
-  req: Request
-): Promise<TValidatedResponseUpdateInputResult> => {
-  const validatedInput: TParseAndValidateJsonBodyResult<TResponseUpdateInput> =
-    await parseAndValidateJsonBody({
-      request: req,
-      schema: ZResponseUpdateInput,
-      malformedJsonMessage: "Malformed JSON in request body",
-    });
-
-  if ("response" in validatedInput) {
-    return {
-      response: validatedInput.response,
-    };
-  }
-
-  return { responseUpdateInput: validatedInput.data };
-};

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

@@ -1,11 +1,235 @@
+import { logger } from "@formbricks/logger";
+import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TResponse, TResponseUpdateInput, ZResponseUpdateInput } from "@formbricks/types/responses";
+import { TSurveyElement } from "@formbricks/types/surveys/elements";
+import { TSurvey } from "@formbricks/types/surveys/types";
 import { responses } from "@/app/lib/api/response";
-import { withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
-import { putResponseHandler } from "./lib/put-response-handler";
+import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { THandlerParams, withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
+import { sendToPipeline } from "@/app/lib/pipelines";
+import { getResponse } from "@/lib/response/service";
+import { getSurvey } from "@/lib/survey/service";
+import { formatValidationErrorsForV1Api, validateResponseData } from "@/modules/api/lib/validation";
+import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/element";
+import { createQuotaFullObject } from "@/modules/ee/quotas/lib/helpers";
+import { validateFileUploads } from "@/modules/storage/utils";
+import { updateResponseWithQuotaEvaluation } from "./lib/response";
 
 export const OPTIONS = async (): Promise<Response> => {
   return responses.successResponse({}, true);
 };
 
+const handleDatabaseError = (error: Error, url: string, endpoint: string, responseId: string): Response => {
+  if (error instanceof ResourceNotFoundError) {
+    return responses.notFoundResponse("Response", responseId, true);
+  }
+  if (error instanceof InvalidInputError) {
+    return responses.badRequestResponse(error.message, undefined, true);
+  }
+  if (error instanceof DatabaseError) {
+    logger.error({ error, url }, `Error in ${endpoint}`);
+    return responses.internalServerErrorResponse(error.message, true);
+  }
+  return responses.internalServerErrorResponse("Unknown error occurred", true);
+};
+
+const validateResponse = (
+  response: TResponse,
+  survey: TSurvey,
+  responseUpdateInput: TResponseUpdateInput
+) => {
+  // Validate response data against validation rules
+  const mergedData = {
+    ...response.data,
+    ...responseUpdateInput.data,
+  };
+
+  const validationErrors = validateResponseData(
+    survey.blocks,
+    mergedData,
+    responseUpdateInput.language ?? response.language ?? "en",
+    survey.questions
+  );
+
+  if (validationErrors) {
+    return {
+      response: responses.badRequestResponse(
+        "Validation failed",
+        formatValidationErrorsForV1Api(validationErrors),
+        true
+      ),
+    };
+  }
+};
+
 export const PUT = withV1ApiWrapper({
-  handler: putResponseHandler,
+  handler: async ({ req, props }: THandlerParams<{ params: Promise<{ responseId: string }> }>) => {
+    const params = await props.params;
+    const { responseId } = params;
+
+    if (!responseId) {
+      return {
+        response: responses.badRequestResponse("Response ID is missing", undefined, true),
+      };
+    }
+
+    const responseUpdate = await req.json();
+    const inputValidation = ZResponseUpdateInput.safeParse(responseUpdate);
+
+    if (!inputValidation.success) {
+      return {
+        response: responses.badRequestResponse(
+          "Fields are missing or incorrectly formatted",
+          transformErrorToDetails(inputValidation.error),
+          true
+        ),
+      };
+    }
+
+    let response;
+    try {
+      response = await getResponse(responseId);
+    } catch (error) {
+      const endpoint = "PUT /api/v1/client/[environmentId]/responses/[responseId]";
+      return {
+        response: handleDatabaseError(
+          error instanceof Error ? error : new Error(String(error)),
+          req.url,
+          endpoint,
+          responseId
+        ),
+      };
+    }
+
+    if (!response) {
+      return {
+        response: responses.notFoundResponse("Response", responseId, true),
+      };
+    }
+
+    if (response.finished) {
+      return {
+        response: responses.badRequestResponse("Response is already finished", undefined, true),
+      };
+    }
+
+    // get survey to get environmentId
+    let survey;
+    try {
+      survey = await getSurvey(response.surveyId);
+    } catch (error) {
+      const endpoint = "PUT /api/v1/client/[environmentId]/responses/[responseId]";
+      return {
+        response: handleDatabaseError(
+          error instanceof Error ? error : new Error(String(error)),
+          req.url,
+          endpoint,
+          responseId
+        ),
+      };
+    }
+
+    if (!survey) {
+      return {
+        response: responses.notFoundResponse("Survey", response.surveyId, true),
+      };
+    }
+
+    if (!validateFileUploads(inputValidation.data.data, survey.questions)) {
+      return {
+        response: responses.badRequestResponse("Invalid file upload response", undefined, true),
+      };
+    }
+
+    // Validate response data for "other" options exceeding character limit
+    const otherResponseInvalidQuestionId = validateOtherOptionLengthForMultipleChoice({
+      responseData: inputValidation.data.data,
+      surveyQuestions: survey.questions as unknown as TSurveyElement[],
+      responseLanguage: inputValidation.data.language,
+    });
+
+    if (otherResponseInvalidQuestionId) {
+      return {
+        response: responses.badRequestResponse(
+          `Response exceeds character limit`,
+          {
+            questionId: otherResponseInvalidQuestionId,
+          },
+          true
+        ),
+      };
+    }
+
+    const validationResult = validateResponse(response, survey, inputValidation.data);
+    if (validationResult) {
+      return validationResult;
+    }
+
+    // update response with quota evaluation
+    let updatedResponse;
+    try {
+      updatedResponse = await updateResponseWithQuotaEvaluation(responseId, inputValidation.data);
+    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        return {
+          response: responses.notFoundResponse("Response", responseId, true),
+        };
+      }
+      if (error instanceof InvalidInputError) {
+        return {
+          response: responses.badRequestResponse(error.message),
+        };
+      }
+      if (error instanceof DatabaseError) {
+        logger.error(
+          { error, url: req.url },
+          "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
+        );
+        return {
+          response: responses.internalServerErrorResponse(error.message),
+        };
+      }
+
+      logger.error(
+        { error, url: req.url },
+        "Error in PUT /api/v1/client/[environmentId]/responses/[responseId]"
+      );
+      return {
+        response: responses.internalServerErrorResponse("Something went wrong"),
+      };
+    }
+
+    const { quotaFull, ...responseData } = updatedResponse;
+
+    // send response update to pipeline
+    // don't await to not block the response
+    sendToPipeline({
+      event: "responseUpdated",
+      environmentId: survey.environmentId,
+      surveyId: survey.id,
+      response: responseData,
+    });
+
+    if (updatedResponse.finished) {
+      // send response to pipeline
+      // don't await to not block the response
+      sendToPipeline({
+        event: "responseFinished",
+        environmentId: survey.environmentId,
+        surveyId: survey.id,
+        response: responseData,
+      });
+    }
+
+    const quotaObj = createQuotaFullObject(quotaFull);
+
+    const responseDataWithQuota = {
+      id: responseData.id,
+      ...quotaObj,
+    };
+
+    return {
+      response: responses.successResponse(responseDataWithQuota, true),
+    };
+  },
 });

apps/web/app/api/v1/client/[environmentId]/storage/route.ts

@@ -1,7 +1,7 @@
 import { logger } from "@formbricks/logger";
-import { ZUploadPrivateFileRequest } from "@formbricks/types/storage";
-import { parseAndValidateJsonBody } from "@/app/lib/api/parse-and-validate-json-body";
+import { TUploadPrivateFileRequest, ZUploadPrivateFileRequest } from "@formbricks/types/storage";
 import { responses } from "@/app/lib/api/response";
+import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { THandlerParams, withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
 import { MAX_FILE_UPLOAD_SIZES } from "@/lib/constants";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
@@ -30,27 +30,33 @@ export const POST = withV1ApiWrapper({
   handler: async ({ req, props }: THandlerParams<{ params: Promise<{ environmentId: string }> }>) => {
     const params = await props.params;
     const { environmentId } = params;
-    const parsedInputResult = await parseAndValidateJsonBody({
-      request: req,
-      schema: ZUploadPrivateFileRequest,
-      buildInput: (jsonInput) => ({
-        ...(jsonInput !== null && typeof jsonInput === "object" ? jsonInput : {}),
-        environmentId,
-      }),
+    let jsonInput: TUploadPrivateFileRequest;
+
+    try {
+      jsonInput = await req.json();
+    } catch (error) {
+      logger.error({ error, url: req.url }, "Error parsing JSON input");
+      return {
+        response: responses.badRequestResponse("Malformed JSON input, please check your request body"),
+      };
+    }
+
+    const parsedInputResult = ZUploadPrivateFileRequest.safeParse({
+      ...jsonInput,
+      environmentId,
     });
 
-    if ("response" in parsedInputResult) {
-      if (parsedInputResult.issue === "invalid_json") {
-        logger.error({ error: parsedInputResult.details, url: req.url }, "Error parsing JSON input");
-      } else {
-        logger.error(
-          { error: parsedInputResult.details, url: req.url },
-          "Fields are missing or incorrectly formatted"
-        );
-      }
+    if (!parsedInputResult.success) {
+      const errorDetails = transformErrorToDetails(parsedInputResult.error);
+
+      logger.error({ error: errorDetails }, "Fields are missing or incorrectly formatted");
 
       return {
-        response: parsedInputResult.response,
+        response: responses.badRequestResponse(
+          "Fields are missing or incorrectly formatted",
+          errorDetails,
+          true
+        ),
       };
     }
 
@@ -99,14 +105,9 @@ export const POST = withV1ApiWrapper({
     if (!signedUrlResponse.ok) {
       logger.error({ error: signedUrlResponse.error }, "Error getting signed url for upload");
       const errorResponse = getErrorResponseFromStorageError(signedUrlResponse.error, { fileName });
-      return errorResponse.status >= 500
-        ? {
-            response: errorResponse,
-            error: signedUrlResponse.error,
-          }
-        : {
-            response: errorResponse,
-          };
+      return {
+        response: errorResponse,
+      };
     }
 
     return {

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

@@ -49,8 +49,7 @@ const mockOrganization: TOrganization = {
     },
     usageCycleAnchor: new Date(),
   },
-  isAISmartToolsEnabled: false,
-  isAIDataAnalysisEnabled: false,
+  isAIEnabled: false,
 };
 
 const mockFollowUp: TSurveyCreateInputWithEnvironmentId["followUps"][number] = {

apps/web/app/api/v2/client/[environmentId]/displays/route.test.ts

@@ -1,126 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  createDisplay: vi.fn(),
-  getIsContactsEnabled: vi.fn(),
-  getOrganizationIdFromEnvironmentId: vi.fn(),
-  reportApiError: vi.fn(),
-}));
-
-vi.mock("./lib/display", () => ({
-  createDisplay: mocks.createDisplay,
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsContactsEnabled: mocks.getIsContactsEnabled,
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromEnvironmentId: mocks.getOrganizationIdFromEnvironmentId,
-}));
-
-vi.mock("@/app/lib/api/api-error-reporter", () => ({
-  reportApiError: mocks.reportApiError,
-}));
-
-const environmentId = "cld1234567890abcdef123456";
-const surveyId = "clg123456789012345678901234";
-
-describe("api/v2 client displays route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.getOrganizationIdFromEnvironmentId.mockResolvedValue("org_123");
-    mocks.getIsContactsEnabled.mockResolvedValue(true);
-  });
-
-  test("returns a v2 bad request response for malformed JSON without reporting an internal error", async () => {
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: "{",
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ environmentId }),
-    });
-
-    expect(response.status).toBe(400);
-    expect(await response.json()).toEqual(
-      expect.objectContaining({
-        code: "bad_request",
-        message: "Invalid JSON in request body",
-      })
-    );
-    expect(mocks.createDisplay).not.toHaveBeenCalled();
-    expect(mocks.reportApiError).not.toHaveBeenCalled();
-  });
-
-  test("reports unexpected createDisplay failures while keeping the response payload unchanged", async () => {
-    const underlyingError = new Error("display persistence failed");
-    mocks.createDisplay.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        surveyId,
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-  });
-
-  test("reports unexpected contact-license lookup failures with the same generic public response", async () => {
-    const underlyingError = new Error("license lookup failed");
-    mocks.getOrganizationIdFromEnvironmentId.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/displays`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        surveyId,
-        contactId: "clh123456789012345678901234",
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.createDisplay).not.toHaveBeenCalled();
-  });
-});

apps/web/app/api/v2/client/[environmentId]/displays/route.ts

@@ -1,11 +1,8 @@
+import { logger } from "@formbricks/logger";
 import { ResourceNotFoundError } from "@formbricks/types/errors";
-import {
-  TDisplayCreateInputV2,
-  ZDisplayCreateInputV2,
-} from "@/app/api/v2/client/[environmentId]/displays/types/display";
-import { reportApiError } from "@/app/lib/api/api-error-reporter";
-import { parseAndValidateJsonBody } from "@/app/lib/api/parse-and-validate-json-body";
+import { ZDisplayCreateInputV2 } from "@/app/api/v2/client/[environmentId]/displays/types/display";
 import { responses } from "@/app/lib/api/response";
+import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { getOrganizationIdFromEnvironmentId } from "@/lib/utils/helper";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createDisplay } from "./lib/display";
@@ -16,29 +13,6 @@ interface Context {
   }>;
 }
 
-type TValidatedDisplayInputResult = { displayInputData: TDisplayCreateInputV2 } | { response: Response };
-
-const parseAndValidateDisplayInput = async (
-  request: Request,
-  environmentId: string
-): Promise<TValidatedDisplayInputResult> => {
-  const inputValidation = await parseAndValidateJsonBody({
-    request,
-    schema: ZDisplayCreateInputV2,
-    buildInput: (jsonInput) => ({
-      ...(jsonInput !== null && typeof jsonInput === "object" ? jsonInput : {}),
-      environmentId,
-    }),
-    malformedJsonMessage: "Invalid JSON in request body",
-  });
-
-  if ("response" in inputValidation) {
-    return inputValidation;
-  }
-
-  return { displayInputData: inputValidation.data };
-};
-
 export const OPTIONS = async (): Promise<Response> => {
   return responses.successResponse(
     {},
@@ -51,40 +25,38 @@ export const OPTIONS = async (): Promise<Response> => {
 
 export const POST = async (request: Request, context: Context): Promise<Response> => {
   const params = await context.params;
-  const validatedInput = await parseAndValidateDisplayInput(request, params.environmentId);
+  const jsonInput = await request.json();
+  const inputValidation = ZDisplayCreateInputV2.safeParse({
+    ...jsonInput,
+    environmentId: params.environmentId,
+  });
 
-  if ("response" in validatedInput) {
-    return validatedInput.response;
+  if (!inputValidation.success) {
+    return responses.badRequestResponse(
+      "Fields are missing or incorrectly formatted",
+      transformErrorToDetails(inputValidation.error),
+      true
+    );
   }
 
-  const { displayInputData } = validatedInput;
+  if (inputValidation.data.contactId) {
+    const organizationId = await getOrganizationIdFromEnvironmentId(params.environmentId);
+    const isContactsEnabled = await getIsContactsEnabled(organizationId);
+    if (!isContactsEnabled) {
+      return responses.forbiddenResponse("User identification is only available for enterprise users.", true);
+    }
+  }
 
   try {
-    if (displayInputData.contactId) {
-      const organizationId = await getOrganizationIdFromEnvironmentId(params.environmentId);
-      const isContactsEnabled = await getIsContactsEnabled(organizationId);
-      if (!isContactsEnabled) {
-        return responses.forbiddenResponse(
-          "User identification is only available for enterprise users.",
-          true
-        );
-      }
-    }
-
-    const response = await createDisplay(displayInputData);
+    const response = await createDisplay(inputValidation.data);
 
     return responses.successResponse(response, true);
   } catch (error) {
     if (error instanceof ResourceNotFoundError) {
-      return responses.notFoundResponse("Survey", displayInputData.surveyId, true);
+      return responses.notFoundResponse("Survey", inputValidation.data.surveyId);
+    } else {
+      logger.error({ error, url: request.url }, "Error creating display");
+      return responses.internalServerErrorResponse("Something went wrong. Please try again.");
     }
-
-    const response = responses.internalServerErrorResponse("Something went wrong. Please try again.", true);
-    reportApiError({
-      request,
-      status: response.status,
-      error,
-    });
-    return response;
   }
 };

apps/web/app/api/v2/client/[environmentId]/environment/route.test.ts

@@ -1,135 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-import { type NextRequest } from "next/server";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  applyIPRateLimit: vi.fn(),
-  getEnvironmentState: vi.fn(),
-  contextualLoggerError: vi.fn(),
-}));
-
-vi.mock("@/app/api/v1/client/[environmentId]/environment/lib/environmentState", () => ({
-  getEnvironmentState: mocks.getEnvironmentState,
-}));
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyIPRateLimit: mocks.applyIPRateLimit,
-  applyRateLimit: vi.fn(),
-}));
-
-vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
-  rateLimitConfigs: {
-    api: {
-      client: { windowMs: 60000, max: 100 },
-      v1: { windowMs: 60000, max: 1000 },
-    },
-  },
-}));
-
-vi.mock("@sentry/nextjs", () => ({
-  captureException: vi.fn(),
-  withScope: vi.fn(),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: mocks.contextualLoggerError,
-      warn: vi.fn(),
-      info: vi.fn(),
-    })),
-    error: vi.fn(),
-    warn: vi.fn(),
-    info: vi.fn(),
-  },
-}));
-
-vi.mock("@/lib/constants", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/lib/constants")>();
-  return {
-    ...actual,
-    AUDIT_LOG_ENABLED: false,
-    IS_PRODUCTION: true,
-    SENTRY_DSN: "test-dsn",
-    ENCRYPTION_KEY: "test-key",
-    REDIS_URL: "redis://localhost:6379",
-  };
-});
-
-const createMockRequest = (url: string, headers = new Map<string, string>()): NextRequest => {
-  const parsedUrl = new URL(url);
-
-  return {
-    method: "GET",
-    url,
-    headers: {
-      get: (key: string) => headers.get(key),
-    },
-    nextUrl: {
-      pathname: parsedUrl.pathname,
-    },
-  } as unknown as NextRequest;
-};
-
-describe("api/v2 client environment route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.applyIPRateLimit.mockResolvedValue(undefined);
-  });
-
-  test("reports v1-backed failures as v2 and keeps the response payload unchanged", async () => {
-    const underlyingError = new Error("Environment load failed");
-    mocks.getEnvironmentState.mockRejectedValue(underlyingError);
-
-    const request = createMockRequest(
-      "https://api.test/api/v2/client/ck12345678901234567890123/environment",
-      new Map([["x-request-id", "req-v2-env"]])
-    );
-
-    const { GET } = await import("./route");
-    const response = await GET(request, {
-      params: Promise.resolve({
-        environmentId: "ck12345678901234567890123",
-      }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "An error occurred while processing your request.",
-      details: {},
-    });
-
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      underlyingError,
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v2",
-          correlationId: "req-v2-env",
-          method: "GET",
-          path: "/api/v2/client/ck12345678901234567890123/environment",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            name: "Error",
-            message: "Environment load failed",
-          }),
-          originalError: expect.objectContaining({
-            name: "Error",
-            message: "Environment load failed",
-          }),
-        }),
-        contexts: expect.objectContaining({
-          apiRequest: expect.objectContaining({
-            apiVersion: "v2",
-            correlationId: "req-v2-env",
-            method: "GET",
-            path: "/api/v2/client/ck12345678901234567890123/environment",
-            status: 500,
-          }),
-        }),
-      })
-    );
-  });
-});

apps/web/app/api/v2/client/[environmentId]/responses/route.test.ts

@@ -1,144 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-  checkSurveyValidity: vi.fn(),
-  createResponseWithQuotaEvaluation: vi.fn(),
-  getClientIpFromHeaders: vi.fn(),
-  getIsContactsEnabled: vi.fn(),
-  getOrganizationIdFromEnvironmentId: vi.fn(),
-  getSurvey: vi.fn(),
-  reportApiError: vi.fn(),
-  sendToPipeline: vi.fn(),
-  validateResponseData: vi.fn(),
-}));
-
-vi.mock("@/app/api/v2/client/[environmentId]/responses/lib/utils", () => ({
-  checkSurveyValidity: mocks.checkSurveyValidity,
-}));
-
-vi.mock("./lib/response", () => ({
-  createResponseWithQuotaEvaluation: mocks.createResponseWithQuotaEvaluation,
-}));
-
-vi.mock("@/app/lib/api/api-error-reporter", () => ({
-  reportApiError: mocks.reportApiError,
-}));
-
-vi.mock("@/app/lib/pipelines", () => ({
-  sendToPipeline: mocks.sendToPipeline,
-}));
-
-vi.mock("@/lib/survey/service", () => ({
-  getSurvey: mocks.getSurvey,
-}));
-
-vi.mock("@/lib/utils/client-ip", () => ({
-  getClientIpFromHeaders: mocks.getClientIpFromHeaders,
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromEnvironmentId: mocks.getOrganizationIdFromEnvironmentId,
-}));
-
-vi.mock("@/modules/api/lib/validation", () => ({
-  formatValidationErrorsForV1Api: vi.fn((errors) => errors),
-  validateResponseData: mocks.validateResponseData,
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsContactsEnabled: mocks.getIsContactsEnabled,
-}));
-
-const environmentId = "cld1234567890abcdef123456";
-const surveyId = "clg123456789012345678901234";
-
-describe("api/v2 client responses route", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.checkSurveyValidity.mockResolvedValue(null);
-    mocks.getSurvey.mockResolvedValue({
-      id: surveyId,
-      environmentId,
-      blocks: [],
-      questions: [],
-      isCaptureIpEnabled: false,
-    });
-    mocks.validateResponseData.mockReturnValue(null);
-    mocks.getOrganizationIdFromEnvironmentId.mockResolvedValue("org_123");
-    mocks.getIsContactsEnabled.mockResolvedValue(true);
-    mocks.getClientIpFromHeaders.mockResolvedValue("127.0.0.1");
-  });
-
-  test("reports unexpected response creation failures while keeping the public payload generic", async () => {
-    const underlyingError = new Error("response persistence failed");
-    mocks.createResponseWithQuotaEvaluation.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/responses`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-request-id": "req-v2-response",
-      },
-      body: JSON.stringify({
-        surveyId,
-        finished: false,
-        data: {},
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-
-  test("reports unexpected pre-persistence failures with the same generic public response", async () => {
-    const underlyingError = new Error("survey lookup failed");
-    mocks.getSurvey.mockRejectedValue(underlyingError);
-
-    const request = new Request(`https://api.test/api/v2/client/${environmentId}/responses`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-request-id": "req-v2-response-pre-check",
-      },
-      body: JSON.stringify({
-        surveyId,
-        finished: false,
-        data: {},
-      }),
-    });
-
-    const { POST } = await import("./route");
-    const response = await POST(request, {
-      params: Promise.resolve({ environmentId }),
-    });
-
-    expect(response.status).toBe(500);
-    expect(await response.json()).toEqual({
-      code: "internal_server_error",
-      message: "Something went wrong. Please try again.",
-      details: {},
-    });
-    expect(mocks.reportApiError).toHaveBeenCalledWith({
-      request,
-      status: 500,
-      error: underlyingError,
-    });
-    expect(mocks.createResponseWithQuotaEvaluation).not.toHaveBeenCalled();
-    expect(mocks.sendToPipeline).not.toHaveBeenCalled();
-  });
-});

apps/web/app/api/v2/client/[environmentId]/responses/route.ts

@@ -1,10 +1,10 @@
+import { headers } from "next/headers";
 import { UAParser } from "ua-parser-js";
+import { logger } from "@formbricks/logger";
 import { ZEnvironmentId } from "@formbricks/types/environment";
 import { InvalidInputError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull } from "@formbricks/types/quota";
 import { checkSurveyValidity } from "@/app/api/v2/client/[environmentId]/responses/lib/utils";
-import { reportApiError } from "@/app/lib/api/api-error-reporter";
-import { parseAndValidateJsonBody } from "@/app/lib/api/parse-and-validate-json-body";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
@@ -25,86 +25,78 @@ interface Context {
   }>;
 }
 
-type TResponseSurvey = NonNullable<Awaited<ReturnType<typeof getSurvey>>>;
+export const OPTIONS = async (): Promise<Response> => {
+  return responses.successResponse(
+    {},
+    true,
+    // Cache CORS preflight responses for 1 hour (conservative approach)
+    // Balances performance gains with flexibility for CORS policy changes
+    "public, s-maxage=3600, max-age=3600"
+  );
+};
 
-type TValidatedResponseInputResult =
-  | {
-      environmentId: string;
-      responseInputData: TResponseInputV2;
-    }
-  | { response: Response };
+export const POST = async (request: Request, context: Context): Promise<Response> => {
+  const params = await context.params;
+  const requestHeaders = await headers();
+  let responseInput;
+  try {
+    responseInput = await request.json();
+  } catch (error) {
+    return responses.badRequestResponse(
+      "Invalid JSON in request body",
+      { error: error instanceof Error ? error.message : "Unknown error occurred" },
+      true
+    );
+  }
 
-const getCountry = (requestHeaders: Headers): string | undefined =>
-  requestHeaders.get("CF-IPCountry") ||
-  requestHeaders.get("X-Vercel-IP-Country") ||
-  requestHeaders.get("CloudFront-Viewer-Country") ||
-  undefined;
-
-const getUnexpectedPublicErrorResponse = (): Response =>
-  responses.internalServerErrorResponse("Something went wrong. Please try again.", true);
-
-const parseAndValidateResponseInput = async (
-  request: Request,
-  environmentId: string
-): Promise<TValidatedResponseInputResult> => {
+  const { environmentId } = params;
   const environmentIdValidation = ZEnvironmentId.safeParse(environmentId);
+  const responseInputValidation = ZResponseInputV2.safeParse({ ...responseInput, environmentId });
 
   if (!environmentIdValidation.success) {
-    return {
-      response: responses.badRequestResponse(
-        "Fields are missing or incorrectly formatted",
-        transformErrorToDetails(environmentIdValidation.error),
-        true
-      ),
-    };
+    return responses.badRequestResponse(
+      "Fields are missing or incorrectly formatted",
+      transformErrorToDetails(environmentIdValidation.error),
+      true
+    );
   }
 
-  const responseInputValidation = await parseAndValidateJsonBody({
-    request,
-    schema: ZResponseInputV2,
-    buildInput: (jsonInput) => ({
-      ...(jsonInput !== null && typeof jsonInput === "object" ? jsonInput : {}),
-      environmentId,
-    }),
-    malformedJsonMessage: "Invalid JSON in request body",
-  });
-
-  if ("response" in responseInputValidation) {
-    return responseInputValidation;
+  if (!responseInputValidation.success) {
+    return responses.badRequestResponse(
+      "Fields are missing or incorrectly formatted",
+      transformErrorToDetails(responseInputValidation.error),
+      true
+    );
   }
 
-  return {
-    environmentId,
-    responseInputData: responseInputValidation.data,
-  };
-};
+  const userAgent = request.headers.get("user-agent") || undefined;
+  const agent = new UAParser(userAgent);
 
-const getContactsDisabledResponse = async (
-  environmentId: string,
-  contactId: string | null | undefined
-): Promise<Response | null> => {
-  if (!contactId) {
-    return null;
+  const country =
+    requestHeaders.get("CF-IPCountry") ||
+    requestHeaders.get("X-Vercel-IP-Country") ||
+    requestHeaders.get("CloudFront-Viewer-Country") ||
+    undefined;
+
+  const responseInputData = responseInputValidation.data;
+
+  if (responseInputData.contactId) {
+    const organizationId = await getOrganizationIdFromEnvironmentId(environmentId);
+    const isContactsEnabled = await getIsContactsEnabled(organizationId);
+    if (!isContactsEnabled) {
+      return responses.forbiddenResponse("User identification is only available for enterprise users.", true);
+    }
   }
 
-  const organizationId = await getOrganizationIdFromEnvironmentId(environmentId);
-  const isContactsEnabled = await getIsContactsEnabled(organizationId);
-
-  return isContactsEnabled
-    ? null
-    : responses.forbiddenResponse("User identification is only available for enterprise users.", true);
-};
-
-const validateResponseSubmission = async (
-  environmentId: string,
-  responseInputData: TResponseInputV2,
-  survey: TResponseSurvey
-): Promise<Response | null> => {
-  const surveyCheckResult = await checkSurveyValidity(survey, environmentId, responseInputData);
-  if (surveyCheckResult) {
-    return surveyCheckResult;
+  // get and check survey
+  const survey = await getSurvey(responseInputData.surveyId);
+  if (!survey) {
+    return responses.notFoundResponse("Survey", responseInput.surveyId, true);
   }
+  const surveyCheckResult = await checkSurveyValidity(survey, environmentId, responseInput);
+  if (surveyCheckResult) return surveyCheckResult;
 
+  // Validate response data for "other" options exceeding character limit
   const otherResponseInvalidQuestionId = validateOtherOptionLengthForMultipleChoice({
     responseData: responseInputData.data,
     surveyQuestions: getElementsFromBlocks(survey.blocks),
@@ -121,6 +113,7 @@ const validateResponseSubmission = async (
     );
   }
 
+  // Validate response data against validation rules
   const validationErrors = validateResponseData(
     survey.blocks,
     responseInputData.data,
@@ -128,29 +121,15 @@ const validateResponseSubmission = async (
     survey.questions
   );
 
-  return validationErrors
-    ? responses.badRequestResponse(
-        "Validation failed",
-        formatValidationErrorsForV1Api(validationErrors),
-        true
-      )
-    : null;
-};
-
-const createResponseForRequest = async ({
-  request,
-  survey,
-  responseInputData,
-  country,
-}: {
-  request: Request;
-  survey: TResponseSurvey;
-  responseInputData: TResponseInputV2;
-  country: string | undefined;
-}): Promise<TResponseWithQuotaFull | Response> => {
-  const userAgent = request.headers.get("user-agent") || undefined;
-  const agent = new UAParser(userAgent);
+  if (validationErrors) {
+    return responses.badRequestResponse(
+      "Validation failed",
+      formatValidationErrorsForV1Api(validationErrors),
+      true
+    );
+  }
 
+  let response: TResponseWithQuotaFull;
   try {
     const meta: TResponseInputV2["meta"] = {
       source: responseInputData?.meta?.source,
@@ -160,115 +139,54 @@ const createResponseForRequest = async ({
         device: agent.getDevice().type || "desktop",
         os: agent.getOS().name,
       },
-      country,
+      country: country,
       action: responseInputData?.meta?.action,
     };
 
+    // Capture IP address if the survey has IP capture enabled
+    // Server-derived IP always overwrites any client-provided value
     if (survey.isCaptureIpEnabled) {
-      meta.ipAddress = await getClientIpFromHeaders();
+      const ipAddress = await getClientIpFromHeaders();
+      meta.ipAddress = ipAddress;
     }
 
-    return await createResponseWithQuotaEvaluation({
+    response = await createResponseWithQuotaEvaluation({
       ...responseInputData,
       meta,
     });
   } catch (error) {
     if (error instanceof InvalidInputError) {
-      return responses.badRequestResponse(error.message, undefined, true);
+      return responses.badRequestResponse(error.message);
     }
-
-    const response = getUnexpectedPublicErrorResponse();
-    reportApiError({
-      request,
-      status: response.status,
-      error,
-    });
-    return response;
-  }
-};
-
-export const OPTIONS = async (): Promise<Response> => {
-  return responses.successResponse(
-    {},
-    true,
-    // Cache CORS preflight responses for 1 hour (conservative approach)
-    // Balances performance gains with flexibility for CORS policy changes
-    "public, s-maxage=3600, max-age=3600"
-  );
-};
-
-export const POST = async (request: Request, context: Context): Promise<Response> => {
-  const params = await context.params;
-  const validatedInput = await parseAndValidateResponseInput(request, params.environmentId);
-
-  if ("response" in validatedInput) {
-    return validatedInput.response;
-  }
-
-  const { environmentId, responseInputData } = validatedInput;
-  const country = getCountry(request.headers);
-
-  try {
-    const contactsDisabledResponse = await getContactsDisabledResponse(
-      environmentId,
-      responseInputData.contactId
+    logger.error({ error, url: request.url }, "Error creating response");
+    return responses.internalServerErrorResponse(
+      error instanceof Error ? error.message : "Unknown error occurred"
     );
-    if (contactsDisabledResponse) {
-      return contactsDisabledResponse;
-    }
+  }
+  const { quotaFull, ...responseData } = response;
 
-    const survey = await getSurvey(responseInputData.surveyId);
-    if (!survey) {
-      return responses.notFoundResponse("Survey", responseInputData.surveyId, true);
-    }
-
-    const validationResponse = await validateResponseSubmission(environmentId, responseInputData, survey);
-    if (validationResponse) {
-      return validationResponse;
-    }
-
-    const createdResponse = await createResponseForRequest({
-      request,
-      survey,
-      responseInputData,
-      country,
-    });
-    if (createdResponse instanceof Response) {
-      return createdResponse;
-    }
-    const { quotaFull, ...responseData } = createdResponse;
+  sendToPipeline({
+    event: "responseCreated",
+    environmentId,
+    surveyId: responseData.surveyId,
+    response: responseData,
+  });
 
+  if (responseData.finished) {
     sendToPipeline({
-      event: "responseCreated",
+      event: "responseFinished",
       environmentId,
       surveyId: responseData.surveyId,
       response: responseData,
     });
-
-    if (responseData.finished) {
-      sendToPipeline({
-        event: "responseFinished",
-        environmentId,
-        surveyId: responseData.surveyId,
-        response: responseData,
-      });
-    }
-
-    const quotaObj = createQuotaFullObject(quotaFull);
-
-    const responseDataWithQuota = {
-      id: responseData.id,
-      ...quotaObj,
-    };
-
-    return responses.successResponse(responseDataWithQuota, true);
-  } catch (error) {
-    const response = getUnexpectedPublicErrorResponse();
-    reportApiError({
-      request,
-      status: response.status,
-      error,
-    });
-    return response;
   }
+
+  const quotaObj = createQuotaFullObject(quotaFull);
+
+  const responseDataWithQuota = {
+    id: responseData.id,
+    ...quotaObj,
+  };
+
+  return responses.successResponse(responseDataWithQuota, true);
 };

apps/web/app/components/NoScriptWarning.tsx

@@ -1,21 +0,0 @@
-import type { TUserLocale } from "@formbricks/types/user";
-import { getTranslate } from "@/lingodotdev/server";
-
-interface NoScriptWarningProps {
-  locale: TUserLocale;
-}
-
-export const NoScriptWarning = async ({ locale }: NoScriptWarningProps) => {
-  const t = await getTranslate(locale);
-
-  return (
-    <noscript>
-      <div className="fixed inset-0 z-[9999] flex h-dvh w-full items-center justify-center bg-slate-50">
-        <div className="rounded-xl border border-slate-200 bg-white p-8 text-center shadow-lg">
-          <h1 className="mb-4 text-2xl font-bold text-slate-800">{t("common.javascript_required")}</h1>
-          <p className="text-slate-600">{t("common.javascript_required_description")}</p>
-        </div>
-      </div>
-    </noscript>
-  );
-};

apps/web/app/layout.tsx

@@ -1,6 +1,5 @@
 import { Metadata } from "next";
 import React from "react";
-import { NoScriptWarning } from "@/app/components/NoScriptWarning";
 import { SentryProvider } from "@/app/sentry/SentryProvider";
 import {
   DEFAULT_LOCALE,
@@ -27,7 +26,6 @@ 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">
-        <NoScriptWarning locale={locale} />
         <SentryProvider
           sentryDsn={SENTRY_DSN}
           sentryRelease={SENTRY_RELEASE}

apps/web/app/lib/api/api-error-reporter.test.ts

@@ -1,221 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { reportApiError } from "./api-error-reporter";
-
-const loggerMocks = vi.hoisted(() => {
-  const contextualError = vi.fn();
-  const rootError = vi.fn();
-  const withContext = vi.fn(() => ({
-    error: contextualError,
-  }));
-
-  return {
-    contextualError,
-    rootError,
-    withContext,
-  };
-});
-
-vi.mock("@sentry/nextjs", () => ({
-  captureException: vi.fn(),
-  withScope: vi.fn(),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: loggerMocks.withContext,
-    error: loggerMocks.rootError,
-    warn: vi.fn(),
-    info: vi.fn(),
-  },
-}));
-
-vi.mock("@/lib/constants", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/lib/constants")>();
-
-  return {
-    ...actual,
-    IS_PRODUCTION: true,
-    SENTRY_DSN: "dsn",
-  };
-});
-
-describe("reportApiError", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("captures real errors directly with structured context", () => {
-    const request = new Request("https://app.test/api/v2/client/environment", {
-      method: "POST",
-      headers: {
-        "x-request-id": "req-1",
-      },
-    });
-    const error = new Error("boom");
-
-    reportApiError({
-      request,
-      status: 500,
-      error,
-    });
-
-    expect(loggerMocks.withContext).toHaveBeenCalledWith(
-      expect.objectContaining({
-        apiVersion: "v2",
-        correlationId: "req-1",
-        method: "POST",
-        path: "/api/v2/client/environment",
-        status: 500,
-        error: expect.objectContaining({
-          name: "Error",
-          message: "boom",
-        }),
-      })
-    );
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      error,
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v2",
-          correlationId: "req-1",
-          method: "POST",
-          path: "/api/v2/client/environment",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            name: "Error",
-            message: "boom",
-          }),
-          originalError: expect.objectContaining({
-            name: "Error",
-            message: "boom",
-          }),
-        }),
-        contexts: expect.objectContaining({
-          apiRequest: expect.objectContaining({
-            apiVersion: "v2",
-            correlationId: "req-1",
-            method: "POST",
-            path: "/api/v2/client/environment",
-            status: 500,
-          }),
-        }),
-      })
-    );
-  });
-
-  test("captures non-error payloads with a synthetic error while preserving additional data", () => {
-    const request = new Request("https://app.test/api/v1/management/surveys", {
-      headers: {
-        "x-request-id": "req-2",
-      },
-    });
-    const payload = {
-      type: "internal_server_error",
-      details: [{ field: "server", issue: "error occurred" }],
-    };
-
-    reportApiError({
-      request,
-      status: 500,
-      error: payload,
-      originalError: payload,
-    });
-
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: "API V1 error, id: req-2",
-      }),
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v1",
-          correlationId: "req-2",
-          method: "GET",
-          path: "/api/v1/management/surveys",
-        }),
-        extra: expect.objectContaining({
-          error: payload,
-          originalError: payload,
-        }),
-      })
-    );
-  });
-
-  test("swallows Sentry failures after logging a fallback reporter error", () => {
-    vi.mocked(Sentry.captureException).mockImplementation(() => {
-      throw new Error("sentry down");
-    });
-
-    const request = new Request("https://app.test/api/v2/client/displays", {
-      headers: {
-        "x-request-id": "req-3",
-      },
-    });
-
-    expect(() =>
-      reportApiError({
-        request,
-        status: 500,
-        error: new Error("boom"),
-      })
-    ).not.toThrow();
-
-    expect(loggerMocks.rootError).toHaveBeenCalledWith(
-      expect.objectContaining({
-        apiVersion: "v2",
-        correlationId: "req-3",
-        method: "GET",
-        path: "/api/v2/client/displays",
-        status: 500,
-        reportingError: expect.objectContaining({
-          name: "Error",
-          message: "sentry down",
-        }),
-      }),
-      "Failed to report API error"
-    );
-  });
-
-  test("serializes cyclic payloads without throwing", () => {
-    const request = new Request("https://app.test/api/v2/client/responses", {
-      headers: {
-        "x-request-id": "req-4",
-      },
-    });
-    const payload: Record<string, unknown> = {
-      type: "internal_server_error",
-    };
-
-    payload.self = payload;
-
-    expect(() =>
-      reportApiError({
-        request,
-        status: 500,
-        error: payload,
-        originalError: payload,
-      })
-    ).not.toThrow();
-
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: "API V2 error, id: req-4",
-      }),
-      expect.objectContaining({
-        extra: expect.objectContaining({
-          error: {
-            type: "internal_server_error",
-            self: "[Circular]",
-          },
-          originalError: {
-            type: "internal_server_error",
-            self: "[Circular]",
-          },
-        }),
-      })
-    );
-  });
-});

apps/web/app/lib/api/api-error-reporter.ts

@@ -1,282 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-import { logger } from "@formbricks/logger";
-import { IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
-
-type TRequestLike = Pick<Request, "method" | "url" | "headers">;
-
-type TApiErrorContext = {
-  apiVersion: TApiVersion;
-  correlationId: string;
-  method: string;
-  path: string;
-  status: number;
-};
-
-type TSentryCaptureContext = NonNullable<Parameters<typeof Sentry.captureException>[1]>;
-
-export type TApiVersion = "v1" | "v2" | "v3" | "unknown";
-
-const getPathname = (url: string): string => {
-  if (url.startsWith("/")) {
-    return url;
-  }
-
-  try {
-    return new URL(url).pathname;
-  } catch {
-    return url;
-  }
-};
-
-export const getApiVersionFromPath = (pathname: string): TApiVersion => {
-  const match = /^\/api\/(v\d+)(?:\/|$)/.exec(pathname);
-
-  if (!match) {
-    return "unknown";
-  }
-
-  switch (match[1]) {
-    case "v1":
-    case "v2":
-    case "v3":
-      return match[1];
-    default:
-      return "unknown";
-  }
-};
-
-const serializeError = (value: unknown, seen = new WeakSet<object>()): unknown => {
-  if (value === null || value === undefined) {
-    return value;
-  }
-
-  if (typeof value !== "object") {
-    return value;
-  }
-
-  if (seen.has(value)) {
-    return "[Circular]";
-  }
-
-  seen.add(value);
-
-  if (value instanceof Error) {
-    const serializedError: Record<string, unknown> = {
-      name: value.name,
-      message: value.message,
-    };
-
-    if (value.stack) {
-      serializedError.stack = value.stack;
-    }
-
-    if ("cause" in value && value.cause !== undefined) {
-      serializedError.cause = serializeError(value.cause, seen);
-    }
-
-    for (const [key, entryValue] of Object.entries(value as unknown as Record<string, unknown>)) {
-      serializedError[key] = serializeError(entryValue, seen);
-    }
-
-    return serializedError;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map((item) => serializeError(item, seen));
-  }
-
-  return Object.fromEntries(
-    Object.entries(value as Record<string, unknown>).map(([key, entryValue]) => [
-      key,
-      serializeError(entryValue, seen),
-    ])
-  );
-};
-
-const getSerializedValueType = (value: unknown): string => {
-  if (value === null) {
-    return "null";
-  }
-
-  if (Array.isArray(value)) {
-    return "array";
-  }
-
-  if (value instanceof Error) {
-    return value.name;
-  }
-
-  return typeof value;
-};
-
-export const serializeErrorSafely = (value: unknown): unknown => {
-  try {
-    return serializeError(value);
-  } catch (serializationError) {
-    return {
-      name: "ErrorSerializationFailed",
-      message: "Failed to serialize API error payload",
-      originalType: getSerializedValueType(value),
-      serializationError:
-        serializationError instanceof Error ? serializationError.message : String(serializationError),
-    };
-  }
-};
-
-const getSyntheticError = (apiVersion: TApiVersion, correlationId: string): Error => {
-  if (apiVersion === "unknown") {
-    return new Error(`API error, id: ${correlationId}`);
-  }
-
-  return new Error(`API ${apiVersion.toUpperCase()} error, id: ${correlationId}`);
-};
-
-const getLogMessage = (apiVersion: TApiVersion): string => {
-  switch (apiVersion) {
-    case "v1":
-      return "API V1 Error Details";
-    case "v2":
-      return "API V2 Error Details";
-    case "v3":
-      return "API V3 Error Details";
-    default:
-      return "API Error Details";
-  }
-};
-
-const buildApiErrorContext = ({
-  request,
-  status,
-  apiVersion,
-}: {
-  request: TRequestLike;
-  status: number;
-  apiVersion?: TApiVersion;
-}): TApiErrorContext => {
-  const path = getPathname(request.url);
-
-  return {
-    apiVersion: apiVersion ?? getApiVersionFromPath(path),
-    correlationId: request.headers.get("x-request-id") ?? "",
-    method: request.method,
-    path,
-    status,
-  };
-};
-
-export const buildSentryCaptureContext = ({
-  context,
-  errorPayload,
-  originalErrorPayload,
-}: {
-  context: TApiErrorContext;
-  errorPayload: unknown;
-  originalErrorPayload: unknown;
-}): TSentryCaptureContext => ({
-  level: "error",
-  tags: {
-    apiVersion: context.apiVersion,
-    correlationId: context.correlationId,
-    method: context.method,
-    path: context.path,
-  },
-  extra: {
-    error: errorPayload,
-    originalError: originalErrorPayload,
-  },
-  contexts: {
-    apiRequest: {
-      apiVersion: context.apiVersion,
-      correlationId: context.correlationId,
-      method: context.method,
-      path: context.path,
-      status: context.status,
-    },
-  },
-});
-
-export const emitApiErrorLog = (context: TApiErrorContext, errorPayload?: unknown): void => {
-  const logContext =
-    errorPayload === undefined
-      ? context
-      : {
-          ...context,
-          error: errorPayload,
-        };
-
-  logger.withContext(logContext).error(getLogMessage(context.apiVersion));
-};
-
-export const emitApiErrorToSentry = ({
-  error,
-  captureContext,
-}: {
-  error: Error;
-  captureContext: TSentryCaptureContext;
-}): void => {
-  Sentry.captureException(error, captureContext);
-};
-
-const logReporterFailure = (context: TApiErrorContext, reportingError: unknown): void => {
-  try {
-    logger.error(
-      {
-        apiVersion: context.apiVersion,
-        correlationId: context.correlationId,
-        method: context.method,
-        path: context.path,
-        status: context.status,
-        reportingError: serializeErrorSafely(reportingError),
-      },
-      "Failed to report API error"
-    );
-  } catch {
-    // Swallow reporter failures so API responses are never affected by observability issues.
-  }
-};
-
-export const reportApiError = ({
-  request,
-  status,
-  error,
-  apiVersion,
-  originalError,
-}: {
-  request: TRequestLike;
-  status: number;
-  error?: unknown;
-  apiVersion?: TApiVersion;
-  originalError?: unknown;
-}): void => {
-  const context = buildApiErrorContext({
-    request,
-    status,
-    apiVersion,
-  });
-  const capturedError =
-    error instanceof Error ? error : getSyntheticError(context.apiVersion, context.correlationId);
-  const logErrorPayload = error === undefined ? undefined : serializeErrorSafely(error);
-  const errorPayload = serializeErrorSafely(error ?? capturedError);
-  const originalErrorPayload = serializeErrorSafely(originalError ?? error);
-
-  try {
-    emitApiErrorLog(context, logErrorPayload);
-  } catch (reportingError) {
-    logReporterFailure(context, reportingError);
-  }
-
-  if (SENTRY_DSN && IS_PRODUCTION && status >= 500) {
-    try {
-      emitApiErrorToSentry({
-        error: capturedError,
-        captureContext: buildSentryCaptureContext({
-          context,
-          errorPayload,
-          originalErrorPayload,
-        }),
-      });
-    } catch (reportingError) {
-      logReporterFailure(context, reportingError);
-    }
-  }
-};

apps/web/app/lib/api/parse-and-validate-json-body.test.ts

@@ -1,111 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { z } from "zod";
-import { parseAndValidateJsonBody } from "./parse-and-validate-json-body";
-
-describe("parseAndValidateJsonBody", () => {
-  test("returns a malformed JSON response when request parsing fails", async () => {
-    const request = new Request("http://localhost/api/test", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: "{invalid-json",
-    });
-
-    const result = await parseAndValidateJsonBody({
-      request,
-      schema: z.object({
-        finished: z.boolean(),
-      }),
-      malformedJsonMessage: "Malformed JSON in request body",
-    });
-
-    expect("response" in result).toBe(true);
-
-    if (!("response" in result)) {
-      throw new Error("Expected a response result");
-    }
-
-    expect(result.issue).toBe("invalid_json");
-    expect(result.details).toEqual({
-      error: expect.any(String),
-    });
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Malformed JSON in request body",
-      details: {
-        error: expect.any(String),
-      },
-    });
-  });
-
-  test("returns a validation response when the parsed JSON does not match the schema", async () => {
-    const request = new Request("http://localhost/api/test", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        finished: "not-boolean",
-      }),
-    });
-
-    const result = await parseAndValidateJsonBody({
-      request,
-      schema: z.object({
-        finished: z.boolean(),
-      }),
-    });
-
-    expect("response" in result).toBe(true);
-
-    if (!("response" in result)) {
-      throw new Error("Expected a response result");
-    }
-
-    expect(result.issue).toBe("invalid_body");
-    expect(result.details).toEqual(
-      expect.objectContaining({
-        finished: expect.any(String),
-      })
-    );
-    await expect(result.response.json()).resolves.toEqual({
-      code: "bad_request",
-      message: "Fields are missing or incorrectly formatted",
-      details: expect.objectContaining({
-        finished: expect.any(String),
-      }),
-    });
-  });
-
-  test("returns parsed data when JSON parsing and schema validation succeed", async () => {
-    const request = new Request("http://localhost/api/test", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        finished: true,
-      }),
-    });
-
-    const result = await parseAndValidateJsonBody({
-      request,
-      schema: z.object({
-        finished: z.boolean(),
-        environmentId: z.string(),
-      }),
-      buildInput: (jsonInput) => ({
-        ...(jsonInput as Record<string, unknown>),
-        environmentId: "env_123",
-      }),
-    });
-
-    expect(result).toEqual({
-      data: {
-        environmentId: "env_123",
-        finished: true,
-      },
-    });
-  });
-});

apps/web/app/lib/api/parse-and-validate-json-body.ts

@@ -1,71 +0,0 @@
-import { z } from "zod";
-import { responses } from "@/app/lib/api/response";
-import { transformErrorToDetails } from "@/app/lib/api/validator";
-
-type TJsonBodyValidationIssue = "invalid_json" | "invalid_body";
-
-type TJsonBodyValidationError = {
-  details: Record<string, string> | { error: string };
-  issue: TJsonBodyValidationIssue;
-  response: Response;
-};
-
-type TJsonBodyValidationSuccess<TData> = {
-  data: TData;
-};
-
-export type TParseAndValidateJsonBodyResult<TData> =
-  | TJsonBodyValidationError
-  | TJsonBodyValidationSuccess<TData>;
-
-type TParseAndValidateJsonBodyOptions<TSchema extends z.ZodTypeAny> = {
-  request: Request;
-  schema: TSchema;
-  buildInput?: (jsonInput: unknown) => unknown;
-  malformedJsonMessage?: string;
-  validationMessage?: string;
-};
-
-const DEFAULT_MALFORMED_JSON_MESSAGE = "Malformed JSON input, please check your request body";
-const DEFAULT_VALIDATION_MESSAGE = "Fields are missing or incorrectly formatted";
-
-const getErrorMessage = (error: unknown): string =>
-  error instanceof Error ? error.message : "Unknown error occurred";
-
-export const parseAndValidateJsonBody = async <TSchema extends z.ZodTypeAny>({
-  request,
-  schema,
-  buildInput,
-  malformedJsonMessage = DEFAULT_MALFORMED_JSON_MESSAGE,
-  validationMessage = DEFAULT_VALIDATION_MESSAGE,
-}: TParseAndValidateJsonBodyOptions<TSchema>): Promise<
-  TParseAndValidateJsonBodyResult<z.output<TSchema>>
-> => {
-  let jsonInput: unknown;
-
-  try {
-    jsonInput = await request.json();
-  } catch (error) {
-    const details = { error: getErrorMessage(error) };
-
-    return {
-      details,
-      issue: "invalid_json",
-      response: responses.badRequestResponse(malformedJsonMessage, details, true),
-    };
-  }
-
-  const inputValidation = schema.safeParse(buildInput ? buildInput(jsonInput) : jsonInput);
-
-  if (!inputValidation.success) {
-    const details = transformErrorToDetails(inputValidation.error);
-
-    return {
-      details,
-      issue: "invalid_body",
-      response: responses.badRequestResponse(validationMessage, details, true),
-    };
-  }
-
-  return { data: inputValidation.data };
-};

apps/web/app/lib/api/with-api-logging.test.ts

@@ -6,6 +6,7 @@ import { TAuthenticationApiKey } from "@formbricks/types/auth";
 import { AuthenticationMethod } from "@/app/middleware/endpoint-validator";
 import { responses } from "./response";
 
+// Mocks
 vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
   __esModule: true,
   queueAuditEvent: vi.fn(),
@@ -13,13 +14,24 @@ vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
 
 vi.mock("@sentry/nextjs", () => ({
   captureException: vi.fn(),
-  withScope: vi.fn(),
+  withScope: vi.fn((callback) => {
+    callback(mockSentryScope);
+    return mockSentryScope;
+  }),
 }));
 
+// Define these outside the mock factory so they can be referenced in tests and reset by clearAllMocks.
 const mockContextualLoggerError = vi.fn();
 const mockContextualLoggerWarn = vi.fn();
 const mockContextualLoggerInfo = vi.fn();
-const V1_MANAGEMENT_SURVEYS_URL = "https://api.test/api/v1/management/surveys";
+
+// Mock Sentry scope that can be referenced in tests
+const mockSentryScope = {
+  setTag: vi.fn(),
+  setExtra: vi.fn(),
+  setContext: vi.fn(),
+  setLevel: vi.fn(),
+};
 
 vi.mock("@formbricks/logger", () => {
   const mockWithContextInstance = vi.fn(() => ({
@@ -74,6 +86,7 @@ vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
 }));
 
 function createMockRequest({ method = "GET", url = "https://api.test/endpoint", headers = new Map() } = {}) {
+  // Parse the URL to get the pathname
   const parsedUrl = url.startsWith("/") ? new URL(url, "http://localhost:3000") : new URL(url);
 
   return {
@@ -109,6 +122,12 @@ describe("withV1ApiWrapper", () => {
     }));
 
     vi.clearAllMocks();
+
+    // Reset mock Sentry scope calls
+    mockSentryScope.setTag.mockClear();
+    mockSentryScope.setExtra.mockClear();
+    mockSentryScope.setContext.mockClear();
+    mockSentryScope.setLevel.mockClear();
   });
 
   test("logs and audits on error response with API key authentication", async () => {
@@ -136,7 +155,7 @@ describe("withV1ApiWrapper", () => {
     });
 
     const req = createMockRequest({
-      url: V1_MANAGEMENT_SURVEYS_URL,
+      url: "https://api.test/v1/management/surveys",
       headers: new Map([["x-request-id", "abc-123"]]),
     });
     const { withV1ApiWrapper } = await import("./with-api-logging");
@@ -158,33 +177,9 @@ describe("withV1ApiWrapper", () => {
         organizationId: "org-1",
       })
     );
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      expect.any(Error),
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v1",
-          correlationId: "abc-123",
-          method: "GET",
-          path: "/api/v1/management/surveys",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            message: "API V1 error, id: abc-123",
-          }),
-          originalError: undefined,
-        }),
-        contexts: expect.objectContaining({
-          apiRequest: expect.objectContaining({
-            apiVersion: "v1",
-            correlationId: "abc-123",
-            method: "GET",
-            path: "/api/v1/management/surveys",
-            status: 500,
-          }),
-        }),
-      })
-    );
+    expect(Sentry.withScope).toHaveBeenCalled();
+    expect(mockSentryScope.setExtra).toHaveBeenCalledWith("originalError", undefined);
+    expect(Sentry.captureException).toHaveBeenCalledWith(expect.any(Error));
   });
 
   test("does not log Sentry if not 500", async () => {
@@ -211,7 +206,7 @@ describe("withV1ApiWrapper", () => {
       };
     });
 
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const { withV1ApiWrapper } = await import("./with-api-logging");
     const wrapped = withV1ApiWrapper({ handler, action: "created", targetType: "survey" });
     await wrapped(req, undefined);
@@ -256,7 +251,7 @@ describe("withV1ApiWrapper", () => {
     });
 
     const req = createMockRequest({
-      url: V1_MANAGEMENT_SURVEYS_URL,
+      url: "https://api.test/v1/management/surveys",
       headers: new Map([["x-request-id", "err-1"]]),
     });
     const { withV1ApiWrapper } = await import("./with-api-logging");
@@ -285,78 +280,8 @@ describe("withV1ApiWrapper", () => {
         organizationId: "org-1",
       })
     );
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: "fail!",
-      }),
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v1",
-          correlationId: "err-1",
-          method: "GET",
-          path: "/api/v1/management/surveys",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            message: "fail!",
-          }),
-          originalError: expect.objectContaining({
-            message: "fail!",
-          }),
-        }),
-      })
-    );
-  });
-
-  test("uses handler result error for handled 500 responses", async () => {
-    const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
-      await import("@/app/middleware/endpoint-validator");
-
-    vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
-    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
-    vi.mocked(isManagementApiRoute).mockReturnValue({
-      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.ApiKey,
-    });
-    vi.mocked(isIntegrationRoute).mockReturnValue(false);
-
-    const handledError = new Error("handled failure");
-    const handler = vi.fn().mockResolvedValue({
-      response: responses.internalServerErrorResponse("fail"),
-      error: handledError,
-    });
-
-    const req = createMockRequest({
-      url: "https://api.test/api/v2/client/environment",
-      headers: new Map([["x-request-id", "handled-1"]]),
-    });
-    const { withV1ApiWrapper } = await import("./with-api-logging");
-    const wrapped = withV1ApiWrapper({ handler });
-    const res = await wrapped(req, undefined);
-
-    expect(res.status).toBe(500);
-    expect(Sentry.withScope).not.toHaveBeenCalled();
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      handledError,
-      expect.objectContaining({
-        tags: expect.objectContaining({
-          apiVersion: "v2",
-          correlationId: "handled-1",
-          method: "GET",
-          path: "/api/v2/client/environment",
-        }),
-        extra: expect.objectContaining({
-          error: expect.objectContaining({
-            message: "handled failure",
-          }),
-          originalError: expect.objectContaining({
-            message: "handled failure",
-          }),
-        }),
-      })
-    );
+    expect(Sentry.withScope).toHaveBeenCalled();
+    expect(Sentry.captureException).toHaveBeenCalledWith(expect.any(Error));
   });
 
   test("does not log on success response but still audits", async () => {
@@ -383,7 +308,7 @@ describe("withV1ApiWrapper", () => {
       };
     });
 
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const { withV1ApiWrapper } = await import("./with-api-logging");
     const wrapped = withV1ApiWrapper({ handler, action: "created", targetType: "survey" });
     await wrapped(req, undefined);
@@ -433,7 +358,7 @@ describe("withV1ApiWrapper", () => {
       response: responses.internalServerErrorResponse("fail"),
     });
 
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const wrapped = withV1ApiWrapper({ handler, action: "created", targetType: "survey" });
     await wrapped(req, undefined);
 
@@ -453,7 +378,7 @@ describe("withV1ApiWrapper", () => {
     });
     vi.mocked(isIntegrationRoute).mockReturnValue(false);
     vi.mocked(authenticateRequest).mockResolvedValue(null);
-    vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
+    vi.mocked(applyIPRateLimit).mockResolvedValue(undefined);
 
     const handler = vi.fn().mockResolvedValue({
       response: responses.successResponse({ data: "test" }),
@@ -487,7 +412,7 @@ describe("withV1ApiWrapper", () => {
     vi.mocked(authenticateRequest).mockResolvedValue(null);
 
     const handler = vi.fn();
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const { withV1ApiWrapper } = await import("./with-api-logging");
     const wrapped = withV1ApiWrapper({ handler });
     const res = await wrapped(req, undefined);
@@ -546,7 +471,7 @@ describe("withV1ApiWrapper", () => {
     vi.mocked(applyRateLimit).mockRejectedValue(rateLimitError);
 
     const handler = vi.fn();
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const { withV1ApiWrapper } = await import("./with-api-logging");
     const wrapped = withV1ApiWrapper({ handler });
     const res = await wrapped(req, undefined);
@@ -574,7 +499,7 @@ describe("withV1ApiWrapper", () => {
       response: responses.successResponse({ data: "test" }),
     });
 
-    const req = createMockRequest({ url: V1_MANAGEMENT_SURVEYS_URL });
+    const req = createMockRequest({ url: "https://api.test/v1/management/surveys" });
     const { withV1ApiWrapper } = await import("./with-api-logging");
     const wrapped = withV1ApiWrapper({ handler });
     await wrapped(req, undefined);
@@ -593,7 +518,7 @@ describe("buildAuditLogBaseObject", () => {
   test("creates audit log base object with correct structure", async () => {
     const { buildAuditLogBaseObject } = await import("./with-api-logging");
 
-    const result = buildAuditLogBaseObject("created", "survey", V1_MANAGEMENT_SURVEYS_URL);
+    const result = buildAuditLogBaseObject("created", "survey", "https://api.test/v1/management/surveys");
 
     expect(result).toEqual({
       action: "created",
@@ -605,7 +530,7 @@ describe("buildAuditLogBaseObject", () => {
       oldObject: undefined,
       newObject: undefined,
       userType: "api",
-      apiUrl: V1_MANAGEMENT_SURVEYS_URL,
+      apiUrl: "https://api.test/v1/management/surveys",
     });
   });
 });

apps/web/app/lib/api/with-api-logging.ts

@@ -1,9 +1,9 @@
+import * as Sentry from "@sentry/nextjs";
 import { Session, getServerSession } from "next-auth";
 import { NextRequest } from "next/server";
 import { logger } from "@formbricks/logger";
 import { TAuthenticationApiKey } from "@formbricks/types/auth";
 import { authenticateRequest } from "@/app/api/v1/auth";
-import { reportApiError } from "@/app/lib/api/api-error-reporter";
 import { responses } from "@/app/lib/api/response";
 import {
   AuthenticationMethod,
@@ -11,7 +11,7 @@ import {
   isIntegrationRoute,
   isManagementApiRoute,
 } from "@/app/middleware/endpoint-validator";
-import { AUDIT_LOG_ENABLED } from "@/lib/constants";
+import { AUDIT_LOG_ENABLED, IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { applyIPRateLimit, applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
@@ -33,10 +33,7 @@ export interface THandlerParams<TProps = unknown> {
 }
 
 // Interface for wrapper function parameters
-export interface TWithV1ApiWrapperParams<
-  TResult extends { response: Response; error?: unknown },
-  TProps = unknown,
-> {
+export interface TWithV1ApiWrapperParams<TResult extends { response: Response }, TProps = unknown> {
   handler: (params: THandlerParams<TProps>) => Promise<TResult>;
   action?: TAuditAction;
   targetType?: TAuditTarget;
@@ -96,7 +93,7 @@ const handleRateLimiting = async (
 /**
  * Execute handler with error handling
  */
-const executeHandler = async <TResult extends { response: Response; error?: unknown }, TProps>(
+const executeHandler = async <TResult extends { response: Response }, TProps>(
   handler: (params: THandlerParams<TProps>) => Promise<TResult>,
   req: NextRequest,
   props: TProps,
@@ -161,12 +158,34 @@ const handleAuthentication = async (
 /**
  * Log error details to system logger and Sentry
  */
-const logErrorDetails = (res: Response, req: NextRequest, error?: unknown): void => {
-  reportApiError({
-    request: req,
+const logErrorDetails = (res: Response, req: NextRequest, correlationId: string, error?: any): void => {
+  const logContext = {
+    correlationId,
+    method: req.method,
+    path: req.url,
     status: res.status,
-    error,
-  });
+    ...(error && { error }),
+  };
+
+  logger.withContext(logContext).error("V1 API Error Details");
+
+  if (SENTRY_DSN && IS_PRODUCTION && res.status >= 500) {
+    // Set correlation ID as a tag for easy filtering
+    Sentry.withScope((scope) => {
+      scope.setTag("correlationId", correlationId);
+      scope.setLevel("error");
+
+      // If we have an actual error, capture it with full stacktrace
+      // Otherwise, create a generic error with context
+      if (error instanceof Error) {
+        Sentry.captureException(error);
+      } else {
+        scope.setExtra("originalError", error);
+        const genericError = new Error(`API V1 error, id: ${correlationId}`);
+        Sentry.captureException(genericError);
+      }
+    });
+  }
 };
 
 /**
@@ -176,7 +195,7 @@ const processResponse = async (
   res: Response,
   req: NextRequest,
   auditLog?: TApiAuditLog,
-  error?: unknown
+  error?: any
 ): Promise<void> => {
   const correlationId = req.headers.get("x-request-id") ?? "";
 
@@ -191,7 +210,7 @@ const processResponse = async (
 
   // Handle error logging
   if (!res.ok) {
-    logErrorDetails(res, req, error);
+    logErrorDetails(res, req, correlationId, error);
   }
 
   // Queue audit event if enabled and audit log exists
@@ -248,7 +267,7 @@ const getRouteType = (
  * @returns Wrapped handler function that returns the final HTTP response
  *
  */
-export const withV1ApiWrapper = <TResult extends { response: Response; error?: unknown }, TProps = unknown>(
+export const withV1ApiWrapper = <TResult extends { response: Response }, TProps = unknown>(
   params: TWithV1ApiWrapperParams<TResult, TProps>
 ): ((req: NextRequest, props: TProps) => Promise<Response>) => {
   const { handler, action, targetType, customRateLimitConfig, unauthenticatedResponse } = params;
@@ -293,10 +312,9 @@ export const withV1ApiWrapper = <TResult extends { response: Response; error?: u
     // === Handler Execution ===
     const { result, error } = await executeHandler(handler, req, props, auditLog, authentication);
     const res = result.response;
-    const reportedError = result.error ?? error;
 
     // === Response Processing & Logging ===
-    await processResponse(res, req, auditLog, reportedError);
+    await processResponse(res, req, auditLog, error);
 
     return res;
   };

apps/web/app/setup/organization/create/actions.ts

@@ -7,7 +7,6 @@ import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { gethasNoOrganizations } from "@/lib/instance/service";
 import { createMembership } from "@/lib/membership/service";
 import { createOrganization } from "@/lib/organization/service";
-import { capturePostHogEvent } from "@/lib/posthog";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { ensureCloudStripeSetupForOrganization } from "@/modules/ee/billing/lib/organization-billing";
@@ -50,11 +49,6 @@ export const createOrganizationAction = authenticatedActionClient
       ctx.auditLoggingCtx.organizationId = newOrganization.id;
       ctx.auditLoggingCtx.newObject = newOrganization;
 
-      capturePostHogEvent(ctx.user.id, "organization_created", {
-        organization_id: newOrganization.id,
-        is_first_org: hasNoOrganizations,
-      });
-
       return newOrganization;
     })
   );

apps/web/i18n.lock

@@ -121,8 +121,6 @@ checksums:
     common/bottom_right: aaef9a70ef795affc806c6d1853d8373
     common/cancel: 2e2a849c2223911717de8caa2c71bade
     common/centered_modal: 982ff411cb7e91e30300c2ed56b7e507
-    common/change_organization: 3b2c873962509445ff2cb8cde5ad913b
-    common/change_workspace: 489cbcf7eef9b9b960e426fbf4da318f
     common/choices: 8a7a77a71ec6eebc363c5dc0f8490a4d
     common/choose_environment: 5762cd499529815fc3e6a7feea39f90b
     common/choose_organization: a8f5db68012323bfbb1a0ad0fb194603
@@ -142,7 +140,6 @@ checksums:
     common/connect: 8778ee245078a8be4a2ce855c8c56edc
     common/connect_formbricks: a9dd747575e7e035da69251366df6f95
     common/connected: aa0ceca574641de34c74b9e590664230
-    common/contact: 9afa39bc47019ee6dec6c74b6273967c
     common/contacts: d5b6c3f890b3904eaf5754081945c03d
     common/continue: 3cfba90b4600131e82fc4260c568d044
     common/copied: 29208e06d704c4fc4b8b534dc7acc4ef
@@ -190,12 +187,12 @@ checksums:
     common/duplicate_copy_number: 083cfffd294672043dcbcc4c3dfeac6a
     common/e_commerce: b9584e7d0449a6d1b0c182d7ff14061e
     common/edit: eee7f39ff90b18852afc1671f21fbaa9
-    common/elements: 8cb054d952b341e5965284860d532bc7
     common/email: e7f34943a0c2fb849db1839ff6ef5cb5
     common/ending_card: 16d30d3a36472159da8c2dbd374dfe22
     common/enter_url: 468c2276d0f2cb971ff5a47a20fa4b97
     common/enterprise_license: e81bf506f47968870c7bd07245648a0d
     common/environment: 0844e8dc1485339c8de066dc0a9bb6a1
+    common/environment_not_found: 4d7610bdb55a8b5e6131bb5b08ce04c5
     common/environment_notice: 228a8668be1812e031f438d166861729
     common/error: 3c95bcb32c2104b99a46f5b3dd015248
     common/error_component_description: fa9eee04f864c3fe6e6681f716caa015
@@ -237,8 +234,6 @@ checksums:
     common/invalid_file_type: f0c83e7d61dbad8250abb59869af4b9e
     common/invite: 181884cea804cbde665f160811ee7ad0
     common/invite_them: d4b7aadbd3c924b04ad4fce419709f10
-    common/javascript_required: d7988e5934af4d0df54fda369c0e4fb6
-    common/javascript_required_description: 4b65f456db79af4898888a3dd034fe2f
     common/key: 3d1065ab98a1c2f1210507fd5c7bf515
     common/label: a5c71bf158481233f8215dbd38cc196b
     common/language: 277fd1a41cc237a437cd1d5e4a80463b
@@ -259,9 +254,7 @@ checksums:
     common/marketing: fcf0f06f8b64b458c7ca6d95541a3cc8
     common/members: 0932e80cba1e3e0a7f52bb67ff31da32
     common/members_and_teams: bf5c3fadcb9fc23533ec1532b805ac08
-    common/membership: 83c856bbc2af99d8c3d860959d1d2a85
     common/membership_not_found: 7ac63584af23396aace9992ad919ffd4
-    common/meta: 842eac888f134f3525f8ea613d933687
     common/metadata: 695d4f7da261ba76e3be4de495491028
     common/mobile_overlay_app_works_best_on_desktop: 4509f7bfbb4edbd42e534042d6cb7e72
     common/mobile_overlay_surveys_look_good: d85169e86077738b9837647bf6d1c7d2
@@ -292,9 +285,6 @@ checksums:
     common/notifications: c52df856139b50dbb1cae7bfb1cf73bb
     common/number: 2789f8391f63e7200a5521078aab017d
     common/off: 7e33a70258401abe652c9f1b595fabda
-    common/offline_all_responses_synced: 9760250890a3a1901163c3f9e91602cc
-    common/offline_syncing_responses: 6a518ff0248a29216b60a206e6966d4d
-    common/offline_you_are_offline: c8fa81ac3e9cad1c64b963ec3f372085
     common/on: 1929bcf2fba8003c043b446a851bcb4f
     common/only_one_file_allowed: 171be177f2e96c4bb4c4a47b3bf6c8c9
     common/only_owners_managers_and_manage_access_members_can_perform_this_action: 3c16fc506e871935f6183793e73b6709
@@ -304,9 +294,10 @@ checksums:
     common/or: 7b133c38bec0d5ee23cc6bcf9a8de50b
     common/organization: 3dc8489af7e74121f65ce6d9677bc94d
     common/organization_id: ef09b71c84a25b5da02a23c77e68a335
+    common/organization_not_found: 4cb8c07ec2c599b6f48750e06ffa182b
     common/organization_settings: 11528aa89ae9935e55dcb54478058775
+    common/organization_teams_not_found: ce29fcb7a4e8b4582f92b65dea9b7d4e
     common/other: 79acaa6cd481262bea4e743a422529d2
-    common/other_filters: 20b09213c131db47eb8b23e72d0c4bea
     common/others: 39160224ce0e35eb4eb252c997edf4d8
     common/overlay_color: 4b72073285d13fff93d094aabffe05ac
     common/overview: 30c54e4dc4ce599b87d94be34a8617f5
@@ -378,6 +369,7 @@ checksums:
     common/show_response_count: 609e5dc7c074d57e711a728fa2f8eb79
     common/shown: 63e4ffb245c05e04b636446c3dbdd8df
     common/size: 227fadeeff951e041ff42031a11a4626
+    common/skip: b7f28dfa2f58b80b149bb82b392d0291
     common/skipped: d496f0f667e1b4364b954db71335d4ef
     common/skips: 99de7579122a3fa6ec5e2a47f3fd8b34
     common/some_files_failed_to_upload: a0e26efeb29ae905257ecf93b112dff0
@@ -397,6 +389,7 @@ checksums:
     common/survey_id: 08303e98b3d4134947256e494b0c829e
     common/survey_languages: 93e4a10ab190e6b1e1f7fe5f702df249
     common/survey_live: d1f370505c67509e7b2759952daba20d
+    common/survey_not_found: 0485ea98d13a414eeefc8f1118b9c293
     common/survey_paused: c770d174d6b57e8425a54906a09c8b39
     common/survey_type: 417fcfecf8eaedefc4f11172426811f9
     common/surveys: 33f68ad4111b32a6361beb9d5c184533
@@ -411,6 +404,7 @@ checksums:
     common/team_name: 549d949de4b9adad4afd6427a60a329e
     common/team_role: 66db395781aef64ef3791417b3b67c0b
     common/teams: b63448c05270497973ac4407047dae02
+    common/teams_not_found: 02f333a64a83c1c014d8900ec9666345
     common/text: 4ddccc1974775ed7357f9beaf9361cec
     common/time: b504a03d52e8001bfdc5cb6205364f42
     common/time_to_finish: c8f6abdb886bee3619bb50b08fada5fa
@@ -434,6 +428,7 @@ checksums:
     common/url: ca97457614226960d41dd18c3c29c86b
     common/user: 61073457a5c3901084b557d065f876be
     common/user_id: 37f5ba37f71cb50607af32a6a203b1d4
+    common/user_not_found: 5903581136ac6c1c1351a482a6d8fdf7
     common/variable: c13db5775ba9791b1522cc55c9c7acce
     common/variable_ids: 44bf93b70703b7699fa9f21bc6c8eed4
     common/variables: ffd3eec5497af36d7b4e4185bad1313a
@@ -448,13 +443,15 @@ checksums:
     common/website_survey: 17513d25a07b6361768a15ec622b021b
     common/weeks: 545de30df4f44d3f6d1d344af6a10815
     common/welcome_card: 76081ebd5b2e35da9b0f080323704ae7
-    common/workspace: b63ef0e99ee6f7fef6cbe4971ca6cf0f
+    common/workflows: b0c9c8615a9ba7d9cb73e767290a7f72
     common/workspace_configuration: d0a5812d6a97d7724d565b1017c34387
     common/workspace_created_successfully: bf401ae83da954f1db48724e2a8e40f1
     common/workspace_creation_description: aea2f480ba0c54c5cabac72c9c900ddf
     common/workspace_id: bafef925e1b57b52a69844fdf47aac3c
     common/workspace_name: 14c04a902a874ab5ddbe9cf369ef0414
     common/workspace_name_placeholder: 8a9e30ab01666af13c44a73b82c37ec1
+    common/workspace_not_found: 038fb0aaf3570610f4377b9eaed13752
+    common/workspace_permission_not_found: e94bdff8af51175c5767714f82bb4833
     common/workspaces: 8ba082a84aa35cf851af1cf874b853e2
     common/years: eb4f5fdd2b320bf13e200fd6a6c1abff
     common/you: db2a4a796b70cc1430d1b21f6ffb6dcb
@@ -481,7 +478,7 @@ checksums:
     emails/forgot_password_email_change_password: fe6d4ba303b82f4833b3293f0c4e88c0
     emails/forgot_password_email_did_not_request: 79d35c3800e23e9d4c95bf33f250104f
     emails/forgot_password_email_heading: fe6d4ba303b82f4833b3293f0c4e88c0
-    emails/forgot_password_email_link_valid_for_24_hours: 962358a7f9674f13f49278afa15d14d3
+    emails/forgot_password_email_link_valid_for_24_hours: 1616714e6bf36e4379b9868e98e82957
     emails/forgot_password_email_subject: bd7a2b22e7b480c29f512532fd2b7e2b
     emails/forgot_password_email_text: 5100fa2fe2180ded9cb2d89b4f77d2e0
     emails/hidden_field: 3ed5c58d0ed359e558cdf7bd33606d2d
@@ -630,6 +627,7 @@ checksums:
     environments/contacts/attributes_msg_new_attribute_created: 5cba6158c4305c05104814ec1479267c
     environments/contacts/attributes_msg_userid_already_exists: 9c695538befc152806c460f52a73821a
     environments/contacts/contact_deleted_successfully: c5b64a42a50e055f9e27ec49e20e03fa
+    environments/contacts/contact_not_found: 045396f0b13fafd43612a286263737c0
     environments/contacts/contacts_table_refresh: 6a959475991dd4ab28ad881bae569a09
     environments/contacts/contacts_table_refresh_success: 40951396e88e5c8fdafa0b3bb4fadca8
     environments/contacts/create_attribute: 87320615901f95b4f35ee83c290a3a6c
@@ -809,14 +807,8 @@ checksums:
     environments/integrations/webhooks/created_by_third_party: b40197eabbbce500b80b44268b8b1ee9
     environments/integrations/webhooks/discord_webhook_not_supported: 23432534f908b2ba63a517fb1f9bbe0e
     environments/integrations/webhooks/empty_webhook_message: 4c4d8709576a38cb8eb59866331d2405
-    environments/integrations/webhooks/endpoint_bad_gateway_error: 48ab17e9a77030b289ec22f497f50b63
-    environments/integrations/webhooks/endpoint_gateway_timeout_error: 5da45e2f6933927d1f8b0aaa9566e6a6
-    environments/integrations/webhooks/endpoint_internal_server_error: 6773fc34349febf95475cde88d8ee072
-    environments/integrations/webhooks/endpoint_method_not_allowed_error: 9963b503311393f4d7bffae9df46d422
-    environments/integrations/webhooks/endpoint_not_found_error: 607b75b7b7aa92ca81fe44e466f7c318
     environments/integrations/webhooks/endpoint_pinged: 3b1fce00e61d4b9d2bdca390649c58b6
     environments/integrations/webhooks/endpoint_pinged_error: 96c312fe8214757c4a934cdfbe177027
-    environments/integrations/webhooks/endpoint_service_unavailable_error: f9d4874c322f2963f5afaede354c9416
     environments/integrations/webhooks/learn_to_verify: 25b2a035e2109170b28f4e16db76ad39
     environments/integrations/webhooks/no_triggers: 6b68cddfc45b3f7e20644a24a1bbea69
     environments/integrations/webhooks/please_check_console: 7b1787e82a0d762df02c011ebb1650ea
@@ -1073,17 +1065,6 @@ checksums:
     environments/settings/enterprise/sso: 95e98e279bb89233d63549b202bd9112
     environments/settings/enterprise/teams: 21ab78abcba0f16c3029741563f789ea
     environments/settings/enterprise/unlock_the_full_power_of_formbricks_free_for_30_days: 104d07b63a42911c9673ceb08a4dbd43
-    environments/settings/general/ai_data_analysis_disabled_for_organization: 2066fe71ecf8994ba738c79b63a1934b
-    environments/settings/general/ai_data_analysis_enabled: 45fabb594da6851f73fef50ca40fe525
-    environments/settings/general/ai_data_analysis_enabled_description: 46d4f0bdf4ebf89e78f79cc961a2de83
-    environments/settings/general/ai_enabled: 3cb1fce89c525e754448d5bd143eb6b5
-    environments/settings/general/ai_enabled_description: e8c3e9f362588898a6cea85e18c013a1
-    environments/settings/general/ai_features_not_enabled_for_organization: e344473bd813fc43f69c51138f74bc8e
-    environments/settings/general/ai_instance_not_configured: 37a80753eb22b5bfc985d0e1f2145e3f
-    environments/settings/general/ai_settings_updated_successfully: 2a6f534dc3a246ced46becd8a4a9543d
-    environments/settings/general/ai_smart_tools_disabled_for_organization: 13df84ae47d35dfa6e86ffa62f29c75d
-    environments/settings/general/ai_smart_tools_enabled: 1dda984f5262c5f9120ee9a409236758
-    environments/settings/general/ai_smart_tools_enabled_description: 1ceca6707746d3ab4a530712a06d91da
     environments/settings/general/bulk_invite_warning_description: e8737a2fbd5ff353db5580d17b4b5a37
     environments/settings/general/cannot_delete_only_organization: 833cc6848b28f2694a4552b4de91a6ba
     environments/settings/general/cannot_leave_only_organization: dd8463262e4299fef7ad73512225c55b
@@ -1122,7 +1103,6 @@ checksums:
     environments/settings/general/only_org_owner_can_perform_action: 0244ff3c6de787935e592eac4c5e4f0b
     environments/settings/general/organization_created_successfully: 1ce874980bdd7d5de8402c276fb97a57
     environments/settings/general/organization_deleted_successfully: e51fd7ee9efda04a373450ea21b242db
-    environments/settings/general/organization_deletion_disabled: 6fb0e71c218ed4ab3be175f1094feada
     environments/settings/general/organization_invite_link_ready: e54b37c4ec2e5a9ea9f6bc6e5b512b0b
     environments/settings/general/organization_name: 73c9b31c9032a22bd84a07881942bb04
     environments/settings/general/organization_name_description: ff517b4749a332b94a26110d7c7e771f
@@ -1626,8 +1606,6 @@ checksums:
     environments/surveys/edit/response_limit_needs_to_exceed_number_of_received_responses: 9a9c223c0918ded716ddfaa84fbaa8d9
     environments/surveys/edit/response_limits_redirections_and_more: e4f1cf94e56ad0e1b08701158d688802
     environments/surveys/edit/response_options: 2988136d5248d7726583108992dcbaee
-    environments/surveys/edit/reverse_order_occasionally: 170fd50de940f382fa2e605228e4e088
-    environments/surveys/edit/reverse_order_occasionally_except_last: 1c833001b940f1419dd7534b199a0b4a
     environments/surveys/edit/roundness: 5a161c8f5f258defb57ed1d551737cc4
     environments/surveys/edit/roundness_description: 03940a6871ae43efa4810cba7cadb74b
     environments/surveys/edit/row_used_in_logic_error: f89453ff1b6db77ad84af840fedd9813
@@ -1706,11 +1684,6 @@ checksums:
     environments/surveys/edit/upper_label: 1fa48bce3fade6ffc1a52d9fdddf9e17
     environments/surveys/edit/url_filters: e524879d2eb74463d7fd06a7e0f53421
     environments/surveys/edit/url_not_supported: af8a753467c617b596aadef1aaaed664
-    environments/surveys/edit/validate_id_duplicate: f88ec35a9bd4921fb096817b9263b59a
-    environments/surveys/edit/validate_id_empty: 3ee25d429ed5ca9e047f9aee95496323
-    environments/surveys/edit/validate_id_invalid_chars: 50239938a408c04b02d77b8cd096d767
-    environments/surveys/edit/validate_id_no_spaces: 11c4408574c11c51f30fe98be18baadb
-    environments/surveys/edit/validate_id_reserved: 2696af4715ee91539e247b1b9a931721
     environments/surveys/edit/validation/add_validation_rule: e0c3208977140e5475df3e9b08927dbf
     environments/surveys/edit/validation/answer_all_rows: 5ca73b038ac41922a09802fef4b5afc0
     environments/surveys/edit/validation/characters: e26d6bb531181ec1ed551e264bc86259
@@ -3202,3 +3175,14 @@ checksums:
     templates/usability_question_9_headline: 5850229e97ae97698ce90b330ea49682
     templates/usability_rating_description: 8c4f3818fe830ae544611f816265f1a1
     templates/usability_score_name: 5cbf1172d24dfcb17d979dff6dfdf7e2
+    workflows/coming_soon_description: 1e0621d287924d84fb539afab7372b23
+    workflows/coming_soon_title: d79be80559c70c828cf20811d2ed5039
+    workflows/follow_up_label: ead918852c5840636a14baabfe94821e
+    workflows/follow_up_placeholder: f680918bec28192282e229c3d4b5e80a
+    workflows/generate_button: b194b6172a49af8374a19dd2cf39cfdc
+    workflows/heading: a98a6b14d3e955f38cc16386df9a4111
+    workflows/placeholder: f5d943582bf25e8734930844e598457b
+    workflows/subheading: ebf5e3b3aeb85e13e843358cc5476f42
+    workflows/submit_button: 7a062f2de02ce60b1d73e510ff1ca094
+    workflows/thank_you_description: 7623c1ba4f059c8d9e68aae3360b20b1
+    workflows/thank_you_title: 07edd8c50685a52c0969d711df26d768

apps/web/lib/account/service.test.ts

@@ -1,97 +0,0 @@
-import { Prisma } from "@prisma/client";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { upsertAccount } from "./service";
-
-const { mockUpsert } = vi.hoisted(() => ({
-  mockUpsert: vi.fn(),
-}));
-
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    account: {
-      upsert: mockUpsert,
-    },
-  },
-}));
-
-describe("account service", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("upsertAccount keeps user ownership immutable on update", async () => {
-    const accountData = {
-      userId: "user-1",
-      type: "oauth",
-      provider: "google",
-      providerAccountId: "provider-1",
-      access_token: "access-token",
-      refresh_token: "refresh-token",
-      expires_at: 123,
-      scope: "openid email",
-      token_type: "Bearer",
-      id_token: "id-token",
-    };
-
-    mockUpsert.mockResolvedValue({
-      id: "account-1",
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      ...accountData,
-    });
-
-    await upsertAccount(accountData);
-
-    expect(mockUpsert).toHaveBeenCalledWith({
-      where: {
-        provider_providerAccountId: {
-          provider: "google",
-          providerAccountId: "provider-1",
-        },
-      },
-      create: accountData,
-      update: {
-        access_token: "access-token",
-        refresh_token: "refresh-token",
-        expires_at: 123,
-        scope: "openid email",
-        token_type: "Bearer",
-        id_token: "id-token",
-      },
-    });
-  });
-
-  test("upsertAccount wraps Prisma known request errors", async () => {
-    const prismaError = Object.assign(Object.create(Prisma.PrismaClientKnownRequestError.prototype), {
-      message: "duplicate account",
-    });
-
-    mockUpsert.mockRejectedValue(prismaError);
-
-    await expect(
-      upsertAccount({
-        userId: "user-1",
-        type: "oauth",
-        provider: "google",
-        providerAccountId: "provider-1",
-      })
-    ).rejects.toMatchObject({
-      name: "DatabaseError",
-      message: "duplicate account",
-    });
-  });
-
-  test("upsertAccount rethrows non-Prisma errors", async () => {
-    const error = new Error("unexpected failure");
-    mockUpsert.mockRejectedValue(error);
-
-    await expect(
-      upsertAccount({
-        userId: "user-1",
-        type: "oauth",
-        provider: "google",
-        providerAccountId: "provider-1",
-      })
-    ).rejects.toThrow("unexpected failure");
-  });
-});

apps/web/lib/account/service.ts

@@ -20,36 +20,3 @@ export const createAccount = async (accountData: TAccountInput): Promise<TAccoun
     throw error;
   }
 };
-
-export const upsertAccount = async (accountData: TAccountInput): Promise<TAccount> => {
-  const [validatedAccountData] = validateInputs([accountData, ZAccountInput]);
-  const updateAccountData: Omit<TAccountInput, "userId" | "type" | "provider" | "providerAccountId"> = {
-    access_token: validatedAccountData.access_token,
-    refresh_token: validatedAccountData.refresh_token,
-    expires_at: validatedAccountData.expires_at,
-    scope: validatedAccountData.scope,
-    token_type: validatedAccountData.token_type,
-    id_token: validatedAccountData.id_token,
-  };
-
-  try {
-    const account = await prisma.account.upsert({
-      where: {
-        provider_providerAccountId: {
-          provider: validatedAccountData.provider,
-          providerAccountId: validatedAccountData.providerAccountId,
-        },
-      },
-      create: validatedAccountData,
-      update: updateAccountData,
-    });
-
-    return account;
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new DatabaseError(error.message);
-    }
-
-    throw error;
-  }
-};

apps/web/lib/ai/service.test.ts

@@ -1,184 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
-import {
-  assertOrganizationAIConfigured,
-  generateOrganizationAIText,
-  getOrganizationAIConfig,
-  isInstanceAIConfigured,
-} from "./service";
-
-const mocks = vi.hoisted(() => ({
-  generateText: vi.fn(),
-  isAiConfigured: vi.fn(),
-  getOrganization: vi.fn(),
-  getIsAIDataAnalysisEnabled: vi.fn(),
-  getIsAISmartToolsEnabled: vi.fn(),
-  getTranslate: vi.fn(),
-  loggerError: vi.fn(),
-}));
-
-vi.mock("server-only", () => ({}));
-
-vi.mock("@formbricks/ai", () => ({
-  AIConfigurationError: class AIConfigurationError extends Error {
-    code: string;
-
-    constructor(code: string, message: string) {
-      super(message);
-      this.code = code;
-    }
-  },
-  generateText: mocks.generateText,
-  isAiConfigured: mocks.isAiConfigured,
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    error: mocks.loggerError,
-  },
-}));
-
-vi.mock("@/lib/env", () => ({
-  env: {
-    AI_PROVIDER: "gcp",
-    AI_MODEL: "gemini-2.5-flash",
-    AI_GCP_PROJECT: "vertex-project",
-    AI_GCP_LOCATION: "us-central1",
-    AI_GCP_CREDENTIALS_JSON: undefined,
-    AI_GCP_APPLICATION_CREDENTIALS: "/tmp/vertex.json",
-    AI_AWS_REGION: "us-east-1",
-    AI_AWS_ACCESS_KEY_ID: "aws-access-key-id",
-    AI_AWS_SECRET_ACCESS_KEY: "aws-secret-access-key",
-    AI_AWS_SESSION_TOKEN: undefined,
-    AI_AZURE_BASE_URL: "https://example-resource.openai.azure.com/openai",
-    AI_AZURE_RESOURCE_NAME: undefined,
-    AI_AZURE_API_KEY: "azure-api-key",
-    AI_AZURE_API_VERSION: "v1",
-  },
-}));
-
-vi.mock("@/lib/organization/service", () => ({
-  getOrganization: mocks.getOrganization,
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getIsAIDataAnalysisEnabled: mocks.getIsAIDataAnalysisEnabled,
-  getIsAISmartToolsEnabled: mocks.getIsAISmartToolsEnabled,
-}));
-
-vi.mock("@/lingodotdev/server", () => ({
-  getTranslate: mocks.getTranslate,
-}));
-
-describe("AI organization service", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    mocks.isAiConfigured.mockReturnValue(true);
-    mocks.getOrganization.mockResolvedValue({
-      id: "org_1",
-      isAISmartToolsEnabled: true,
-      isAIDataAnalysisEnabled: false,
-    });
-    mocks.getIsAISmartToolsEnabled.mockResolvedValue(true);
-    mocks.getIsAIDataAnalysisEnabled.mockResolvedValue(true);
-    mocks.getTranslate.mockResolvedValue((key: string, values?: Record<string, string>) =>
-      values ? `${key}:${JSON.stringify(values)}` : key
-    );
-  });
-
-  test("returns the instance AI status and organization settings", async () => {
-    const configured = isInstanceAIConfigured();
-    const result = await getOrganizationAIConfig("org_1");
-
-    expect(configured).toBe(true);
-    expect(result).toMatchObject({
-      organizationId: "org_1",
-      isAISmartToolsEnabled: true,
-      isAIDataAnalysisEnabled: false,
-      isAISmartToolsEntitled: true,
-      isAIDataAnalysisEntitled: true,
-      isInstanceConfigured: true,
-    });
-  });
-
-  test("throws when the organization cannot be found", async () => {
-    mocks.getOrganization.mockResolvedValueOnce(null);
-
-    await expect(getOrganizationAIConfig("org_missing")).rejects.toThrow(ResourceNotFoundError);
-  });
-
-  test("fails closed when the organization is not entitled to AI", async () => {
-    mocks.getIsAISmartToolsEnabled.mockResolvedValueOnce(false);
-
-    await expect(assertOrganizationAIConfigured("org_1", "smartTools")).rejects.toThrow(
-      OperationNotAllowedError
-    );
-  });
-
-  test("fails closed when the requested AI capability is disabled", async () => {
-    mocks.getOrganization.mockResolvedValueOnce({
-      id: "org_1",
-      isAISmartToolsEnabled: false,
-      isAIDataAnalysisEnabled: true,
-    });
-
-    await expect(assertOrganizationAIConfigured("org_1", "smartTools")).rejects.toThrow(
-      OperationNotAllowedError
-    );
-  });
-
-  test("fails closed when the instance AI configuration is incomplete", async () => {
-    mocks.isAiConfigured.mockReturnValueOnce(false);
-
-    await expect(assertOrganizationAIConfigured("org_1", "smartTools")).rejects.toThrow(
-      OperationNotAllowedError
-    );
-  });
-
-  test("generates organization AI text with the configured package abstraction", async () => {
-    const generatedText = { text: "Translated text" };
-    mocks.generateText.mockResolvedValueOnce(generatedText);
-
-    const result = await generateOrganizationAIText({
-      organizationId: "org_1",
-      capability: "smartTools",
-      prompt: "Translate this survey",
-    });
-
-    expect(result).toBe(generatedText);
-    expect(mocks.generateText).toHaveBeenCalledWith(
-      {
-        prompt: "Translate this survey",
-      },
-      expect.objectContaining({
-        AI_PROVIDER: "gcp",
-        AI_MODEL: "gemini-2.5-flash",
-        AI_GCP_PROJECT: "vertex-project",
-      })
-    );
-  });
-
-  test("logs and rethrows generation errors", async () => {
-    const modelError = new Error("provider boom");
-    mocks.generateText.mockRejectedValueOnce(modelError);
-
-    await expect(
-      generateOrganizationAIText({
-        organizationId: "org_1",
-        capability: "smartTools",
-        prompt: "Translate this survey",
-      })
-    ).rejects.toThrow(modelError);
-    expect(mocks.loggerError).toHaveBeenCalledWith(
-      {
-        organizationId: "org_1",
-        capability: "smartTools",
-        isInstanceConfigured: true,
-        errorCode: undefined,
-        err: modelError,
-      },
-      "Failed to generate organization AI text"
-    );
-  });
-});

apps/web/lib/ai/service.ts

@@ -1,104 +0,0 @@
-import "server-only";
-import { AIConfigurationError, generateText, isAiConfigured } from "@formbricks/ai";
-import { logger } from "@formbricks/logger";
-import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { env } from "@/lib/env";
-import { getOrganization } from "@/lib/organization/service";
-import { getTranslate } from "@/lingodotdev/server";
-import { getIsAIDataAnalysisEnabled, getIsAISmartToolsEnabled } from "@/modules/ee/license-check/lib/utils";
-
-export interface TOrganizationAIConfig {
-  organizationId: string;
-  isAISmartToolsEnabled: boolean;
-  isAIDataAnalysisEnabled: boolean;
-  isAISmartToolsEntitled: boolean;
-  isAIDataAnalysisEntitled: boolean;
-  isInstanceConfigured: boolean;
-}
-
-export const isInstanceAIConfigured = (): boolean => isAiConfigured(env);
-
-export const getOrganizationAIConfig = async (organizationId: string): Promise<TOrganizationAIConfig> => {
-  const organization = await getOrganization(organizationId);
-
-  if (!organization) {
-    throw new ResourceNotFoundError("Organization", organizationId);
-  }
-
-  const [isAISmartToolsEntitled, isAIDataAnalysisEntitled] = await Promise.all([
-    getIsAISmartToolsEnabled(organizationId),
-    getIsAIDataAnalysisEnabled(organizationId),
-  ]);
-
-  return {
-    organizationId,
-    isAISmartToolsEnabled: organization.isAISmartToolsEnabled,
-    isAIDataAnalysisEnabled: organization.isAIDataAnalysisEnabled,
-    isAISmartToolsEntitled,
-    isAIDataAnalysisEntitled,
-    isInstanceConfigured: isInstanceAIConfigured(),
-  };
-};
-
-export const assertOrganizationAIConfigured = async (
-  organizationId: string,
-  capability: "smartTools" | "dataAnalysis"
-): Promise<TOrganizationAIConfig> => {
-  const t = await getTranslate();
-  const aiConfig = await getOrganizationAIConfig(organizationId);
-  const isCapabilityEntitled =
-    capability === "smartTools" ? aiConfig.isAISmartToolsEntitled : aiConfig.isAIDataAnalysisEntitled;
-
-  if (!isCapabilityEntitled) {
-    throw new OperationNotAllowedError(
-      t("environments.settings.general.ai_features_not_enabled_for_organization")
-    );
-  }
-
-  if (capability === "smartTools" && !aiConfig.isAISmartToolsEnabled) {
-    throw new OperationNotAllowedError(
-      t("environments.settings.general.ai_smart_tools_disabled_for_organization")
-    );
-  }
-
-  if (capability === "dataAnalysis" && !aiConfig.isAIDataAnalysisEnabled) {
-    throw new OperationNotAllowedError(
-      t("environments.settings.general.ai_data_analysis_disabled_for_organization")
-    );
-  }
-
-  if (!aiConfig.isInstanceConfigured) {
-    throw new OperationNotAllowedError(t("environments.settings.general.ai_instance_not_configured"));
-  }
-
-  return aiConfig;
-};
-
-type TGenerateOrganizationAITextInput = {
-  organizationId: string;
-  capability: "smartTools" | "dataAnalysis";
-} & Parameters<typeof generateText>[0];
-
-export const generateOrganizationAIText = async ({
-  organizationId,
-  capability,
-  ...options
-}: TGenerateOrganizationAITextInput): Promise<Awaited<ReturnType<typeof generateText>>> => {
-  const aiConfig = await assertOrganizationAIConfigured(organizationId, capability);
-
-  try {
-    return await generateText(options, env);
-  } catch (error) {
-    logger.error(
-      {
-        organizationId,
-        capability,
-        isInstanceConfigured: aiConfig.isInstanceConfigured,
-        errorCode: error instanceof AIConfigurationError ? error.code : undefined,
-        err: error,
-      },
-      "Failed to generate organization AI text"
-    );
-    throw error;
-  }
-};

apps/web/lib/ai/utils.test.ts

@@ -1,54 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { getDisplayedOrganizationAISettingValue, getOrganizationAIEnablementState } from "./utils";
-
-describe("getOrganizationAIEnablementState", () => {
-  test("blocks enabling when instance AI is not configured", () => {
-    expect(
-      getOrganizationAIEnablementState({
-        isInstanceConfigured: false,
-      })
-    ).toMatchObject({
-      canEnableFeatures: false,
-      blockReason: "instanceNotConfigured",
-    });
-  });
-
-  test("allows enabling when instance AI is configured", () => {
-    expect(
-      getOrganizationAIEnablementState({
-        isInstanceConfigured: true,
-      })
-    ).toMatchObject({
-      canEnableFeatures: true,
-    });
-  });
-});
-
-describe("getDisplayedOrganizationAISettingValue", () => {
-  test("renders enabled settings as off when instance AI is not configured", () => {
-    expect(
-      getDisplayedOrganizationAISettingValue({
-        currentValue: true,
-        isInstanceConfigured: false,
-      })
-    ).toBe(false);
-  });
-
-  test("renders the stored setting value when instance AI is configured", () => {
-    expect(
-      getDisplayedOrganizationAISettingValue({
-        currentValue: true,
-        isInstanceConfigured: true,
-      })
-    ).toBe(true);
-  });
-
-  test("renders false when the stored setting is false and instance AI is configured", () => {
-    expect(
-      getDisplayedOrganizationAISettingValue({
-        currentValue: false,
-        isInstanceConfigured: true,
-      })
-    ).toBe(false);
-  });
-});

apps/web/lib/ai/utils.ts

@@ -1,31 +0,0 @@
-export type TAIEnablementBlockReason = "instanceNotConfigured";
-
-interface TOrganizationAIEnablementState {
-  canEnableFeatures: boolean;
-  blockReason?: TAIEnablementBlockReason;
-}
-
-export const getDisplayedOrganizationAISettingValue = ({
-  currentValue,
-  isInstanceConfigured,
-}: {
-  currentValue: boolean;
-  isInstanceConfigured: boolean;
-}): boolean => isInstanceConfigured && currentValue;
-
-export const getOrganizationAIEnablementState = ({
-  isInstanceConfigured,
-}: {
-  isInstanceConfigured: boolean;
-}): TOrganizationAIEnablementState => {
-  if (!isInstanceConfigured) {
-    return {
-      canEnableFeatures: false,
-      blockReason: "instanceNotConfigured",
-    };
-  }
-
-  return {
-    canEnableFeatures: true,
-  };
-};

apps/web/lib/constants.ts

@@ -26,10 +26,7 @@ export const TERMS_URL = env.TERMS_URL;
 export const IMPRINT_URL = env.IMPRINT_URL;
 export const IMPRINT_ADDRESS = env.IMPRINT_ADDRESS;
 
-export const DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS = env.DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS === "1";
-export const DEBUG_SHOW_RESET_LINK = !IS_PRODUCTION && env.DEBUG_SHOW_RESET_LINK === "1";
 export const PASSWORD_RESET_DISABLED = env.PASSWORD_RESET_DISABLED === "1";
-export const PASSWORD_RESET_TOKEN_LIFETIME_MINUTES = env.PASSWORD_RESET_TOKEN_LIFETIME_MINUTES;
 export const EMAIL_VERIFICATION_DISABLED = env.EMAIL_VERIFICATION_DISABLED === "1";
 
 export const GOOGLE_OAUTH_ENABLED = !!(env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET);
@@ -155,7 +152,6 @@ export const ENTERPRISE_LICENSE_KEY = env.ENTERPRISE_LICENSE_KEY;
 
 export const REDIS_URL = env.REDIS_URL;
 export const RATE_LIMITING_DISABLED = env.RATE_LIMITING_DISABLED === "1";
-export const TELEMETRY_DISABLED = env.TELEMETRY_DISABLED === "1";
 
 export const BREVO_API_KEY = env.BREVO_API_KEY;
 export const BREVO_LIST_ID = env.BREVO_LIST_ID;

apps/web/lib/env.test.ts

@@ -1,77 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-
-const ORIGINAL_ENV = process.env;
-
-const setTestEnv = (overrides: Record<string, string | undefined> = {}) => {
-  process.env = {
-    ...ORIGINAL_ENV,
-    NODE_ENV: "test",
-    DATABASE_URL: "https://example.com/db",
-    ENCRYPTION_KEY: "12345678901234567890123456789012",
-    ...overrides,
-  };
-};
-
-describe("env", () => {
-  beforeEach(() => {
-    vi.resetModules();
-  });
-
-  afterEach(() => {
-    process.env = ORIGINAL_ENV;
-  });
-
-  test("uses the default password reset token lifetime when env var is not set", async () => {
-    setTestEnv({
-      PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: undefined,
-    });
-
-    const { env } = await import("./env");
-
-    expect(env.PASSWORD_RESET_TOKEN_LIFETIME_MINUTES).toBe(30);
-  });
-
-  test("uses the configured password reset token lifetime", async () => {
-    setTestEnv({
-      PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: "45",
-    });
-
-    const { env } = await import("./env");
-
-    expect(env.PASSWORD_RESET_TOKEN_LIFETIME_MINUTES).toBe(45);
-  });
-
-  test("fails to load when the password reset token lifetime is not an integer", async () => {
-    setTestEnv({
-      PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: "30minutes",
-    });
-
-    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
-  });
-
-  test("fails to load when the password reset token lifetime is out of range", async () => {
-    setTestEnv({
-      PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: "121",
-    });
-
-    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
-  });
-
-  test("allows enabling DEBUG_SHOW_RESET_LINK", async () => {
-    setTestEnv({
-      DEBUG_SHOW_RESET_LINK: "1",
-    });
-
-    const { env } = await import("./env");
-
-    expect(env.DEBUG_SHOW_RESET_LINK).toBe("1");
-  });
-
-  test("fails to load when DEBUG_SHOW_RESET_LINK is invalid", async () => {
-    setTestEnv({
-      DEBUG_SHOW_RESET_LINK: "true",
-    });
-
-    await expect(import("./env")).rejects.toThrow("Invalid environment variables");
-  });
-});

apps/web/lib/env.ts

@@ -1,120 +1,12 @@
 import { createEnv } from "@t3-oss/env-nextjs";
 import { z } from "zod";
-import { AI_PROVIDERS } from "@formbricks/types/ai";
 
-const ZActiveAIProvider = z.enum(AI_PROVIDERS);
-const ZAIConfigurationEnv = z.object({
-  AI_PROVIDER: ZActiveAIProvider.optional(),
-  AI_MODEL: z.string().optional(),
-  AI_GCP_PROJECT: z.string().optional(),
-  AI_GCP_LOCATION: z.string().optional(),
-  AI_GCP_CREDENTIALS_JSON: z.string().optional(),
-  AI_GCP_APPLICATION_CREDENTIALS: z.string().optional(),
-  AI_AWS_REGION: z.string().optional(),
-  AI_AWS_ACCESS_KEY_ID: z.string().optional(),
-  AI_AWS_SECRET_ACCESS_KEY: z.string().optional(),
-  AI_AZURE_API_KEY: z.string().optional(),
-  AI_AZURE_BASE_URL: z.url().optional(),
-  AI_AZURE_RESOURCE_NAME: z.string().optional(),
-});
-
-type TAIConfigurationEnv = z.infer<typeof ZAIConfigurationEnv>;
-
-const addEnvIssue = (ctx: z.RefinementCtx, path: keyof TAIConfigurationEnv, message: string): void => {
-  ctx.addIssue({
-    code: "custom",
-    path: [path],
-    message,
-  });
-};
-
-const validateActiveAIModel = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  if (values.AI_PROVIDER && !values.AI_MODEL) {
-    addEnvIssue(ctx, "AI_MODEL", "AI_MODEL is required when AI_PROVIDER is set");
-  }
-};
-
-const validateAwsAIConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  if (!values.AI_AWS_REGION) {
-    addEnvIssue(ctx, "AI_AWS_REGION", "AI_AWS_REGION is required when AI_PROVIDER=aws");
-  }
-
-  if (!values.AI_AWS_ACCESS_KEY_ID) {
-    addEnvIssue(ctx, "AI_AWS_ACCESS_KEY_ID", "AI_AWS_ACCESS_KEY_ID is required when AI_PROVIDER=aws");
-  }
-
-  if (!values.AI_AWS_SECRET_ACCESS_KEY) {
-    addEnvIssue(ctx, "AI_AWS_SECRET_ACCESS_KEY", "AI_AWS_SECRET_ACCESS_KEY is required when AI_PROVIDER=aws");
-  }
-};
-
-const validateGcpAIConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  if (!values.AI_GCP_PROJECT) {
-    addEnvIssue(ctx, "AI_GCP_PROJECT", "AI_GCP_PROJECT is required when AI_PROVIDER=gcp");
-  }
-
-  if (!values.AI_GCP_LOCATION) {
-    addEnvIssue(ctx, "AI_GCP_LOCATION", "AI_GCP_LOCATION is required when AI_PROVIDER=gcp");
-  }
-
-  if (!values.AI_GCP_CREDENTIALS_JSON && !values.AI_GCP_APPLICATION_CREDENTIALS) {
-    addEnvIssue(
-      ctx,
-      "AI_GCP_CREDENTIALS_JSON",
-      "AI_GCP_CREDENTIALS_JSON or AI_GCP_APPLICATION_CREDENTIALS is required when AI_PROVIDER=gcp"
-    );
-  }
-
-  if (values.AI_GCP_CREDENTIALS_JSON) {
-    try {
-      JSON.parse(values.AI_GCP_CREDENTIALS_JSON);
-    } catch {
-      addEnvIssue(ctx, "AI_GCP_CREDENTIALS_JSON", "AI_GCP_CREDENTIALS_JSON must be valid JSON");
-    }
-  }
-};
-
-const validateAzureAIConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  if (!values.AI_AZURE_API_KEY) {
-    addEnvIssue(ctx, "AI_AZURE_API_KEY", "AI_AZURE_API_KEY is required when AI_PROVIDER=azure");
-  }
-
-  if (!values.AI_AZURE_BASE_URL && !values.AI_AZURE_RESOURCE_NAME) {
-    addEnvIssue(
-      ctx,
-      "AI_AZURE_BASE_URL",
-      "AI_AZURE_BASE_URL or AI_AZURE_RESOURCE_NAME is required when AI_PROVIDER=azure"
-    );
-  }
-};
-
-const validateActiveAIProviderConfiguration = (values: TAIConfigurationEnv, ctx: z.RefinementCtx): void => {
-  validateActiveAIModel(values, ctx);
-
-  if (!values.AI_PROVIDER) {
-    return;
-  }
-
-  const providerValidators: Record<
-    z.infer<typeof ZActiveAIProvider>,
-    (values: TAIConfigurationEnv, ctx: z.RefinementCtx) => void
-  > = {
-    aws: validateAwsAIConfiguration,
-    gcp: validateGcpAIConfiguration,
-    azure: validateAzureAIConfiguration,
-  };
-
-  providerValidators[values.AI_PROVIDER](values, ctx);
-};
-
-const parsedEnv = createEnv({
+export const env = createEnv({
   /*
    * Serverside Environment variables, not available on the client.
    * Will throw if you access these variables on the client.
    */
   server: {
-    AI_PROVIDER: ZActiveAIProvider.optional(),
-    AI_MODEL: z.string().optional(),
     AIRTABLE_CLIENT_ID: z.string().optional(),
     AZUREAD_CLIENT_ID: z.string().optional(),
     AZUREAD_CLIENT_SECRET: z.string().optional(),
@@ -123,9 +15,7 @@ const parsedEnv = createEnv({
     BREVO_API_KEY: z.string().optional(),
     BREVO_LIST_ID: z.string().optional(),
     DATABASE_URL: z.url(),
-    DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: z.enum(["1", "0"]).optional(),
     DEBUG: z.enum(["1", "0"]).optional(),
-    DEBUG_SHOW_RESET_LINK: z.enum(["1", "0"]).optional(),
     AUTH_DEFAULT_TEAM_ID: z.string().optional(),
     AUTH_SKIP_INVITE_FOR_SSO: z.enum(["1", "0"]).optional(),
     E2E_TESTING: z.enum(["1", "0"]).optional(),
@@ -138,21 +28,9 @@ const parsedEnv = createEnv({
     GITHUB_SECRET: z.string().optional(),
     GOOGLE_CLIENT_ID: z.string().optional(),
     GOOGLE_CLIENT_SECRET: z.string().optional(),
-    AI_GCP_PROJECT: z.string().optional(),
-    AI_GCP_LOCATION: z.string().optional(),
-    AI_GCP_CREDENTIALS_JSON: z.string().optional(),
-    AI_GCP_APPLICATION_CREDENTIALS: z.string().optional(),
     GOOGLE_SHEETS_CLIENT_ID: z.string().optional(),
     GOOGLE_SHEETS_CLIENT_SECRET: z.string().optional(),
     GOOGLE_SHEETS_REDIRECT_URL: z.string().optional(),
-    AI_AWS_REGION: z.string().optional(),
-    AI_AWS_ACCESS_KEY_ID: z.string().optional(),
-    AI_AWS_SECRET_ACCESS_KEY: z.string().optional(),
-    AI_AWS_SESSION_TOKEN: z.string().optional(),
-    AI_AZURE_BASE_URL: z.url().optional(),
-    AI_AZURE_API_KEY: z.string().optional(),
-    AI_AZURE_API_VERSION: z.string().optional(),
-    AI_AZURE_RESOURCE_NAME: z.string().optional(),
     HTTP_PROXY: z.url().optional(),
     HTTPS_PROXY: z.url().optional(),
     IMPRINT_URL: z
@@ -182,13 +60,11 @@ const parsedEnv = createEnv({
         ? z.string().optional()
         : z.url("REDIS_URL is required for caching, rate limiting, and audit logging"),
     PASSWORD_RESET_DISABLED: z.enum(["1", "0"]).optional(),
-    PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: z.coerce.number().int().min(5).max(120).optional().default(30),
     PRIVACY_URL: z
       .url()
       .optional()
       .or(z.string().refine((str) => str === "")),
     RATE_LIMITING_DISABLED: z.enum(["1", "0"]).optional(),
-    TELEMETRY_DISABLED: z.enum(["1", "0"]).optional(),
     S3_ACCESS_KEY: z.string().optional(),
     S3_BUCKET_NAME: z.string().optional(),
     S3_REGION: z.string().optional(),
@@ -245,7 +121,7 @@ const parsedEnv = createEnv({
     AUDIT_LOG_GET_USER_IP: z.enum(["1", "0"]).optional(),
     SESSION_MAX_AGE: z
       .string()
-      .transform((val) => Number.parseInt(val, 10))
+      .transform((val) => parseInt(val))
       .optional(),
     SENTRY_ENVIRONMENT: z.string().optional(),
   },
@@ -257,8 +133,6 @@ const parsedEnv = createEnv({
    * 💡 You'll get type errors if not all variables from `server` & `client` are included here.
    */
   runtimeEnv: {
-    AI_PROVIDER: process.env.AI_PROVIDER,
-    AI_MODEL: process.env.AI_MODEL,
     AIRTABLE_CLIENT_ID: process.env.AIRTABLE_CLIENT_ID,
     AZUREAD_CLIENT_ID: process.env.AZUREAD_CLIENT_ID,
     AZUREAD_CLIENT_SECRET: process.env.AZUREAD_CLIENT_SECRET,
@@ -267,9 +141,7 @@ const parsedEnv = createEnv({
     BREVO_LIST_ID: process.env.BREVO_LIST_ID,
     CRON_SECRET: process.env.CRON_SECRET,
     DATABASE_URL: process.env.DATABASE_URL,
-    DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: process.env.DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS,
     DEBUG: process.env.DEBUG,
-    DEBUG_SHOW_RESET_LINK: process.env.DEBUG_SHOW_RESET_LINK,
     AUTH_DEFAULT_TEAM_ID: process.env.AUTH_SSO_DEFAULT_TEAM_ID,
     AUTH_SKIP_INVITE_FOR_SSO: process.env.AUTH_SKIP_INVITE_FOR_SSO,
     E2E_TESTING: process.env.E2E_TESTING,
@@ -282,21 +154,9 @@ const parsedEnv = createEnv({
     GITHUB_SECRET: process.env.GITHUB_SECRET,
     GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
     GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
-    AI_GCP_PROJECT: process.env.AI_GCP_PROJECT,
-    AI_GCP_LOCATION: process.env.AI_GCP_LOCATION,
-    AI_GCP_CREDENTIALS_JSON: process.env.AI_GCP_CREDENTIALS_JSON,
-    AI_GCP_APPLICATION_CREDENTIALS: process.env.AI_GCP_APPLICATION_CREDENTIALS,
     GOOGLE_SHEETS_CLIENT_ID: process.env.GOOGLE_SHEETS_CLIENT_ID,
     GOOGLE_SHEETS_CLIENT_SECRET: process.env.GOOGLE_SHEETS_CLIENT_SECRET,
     GOOGLE_SHEETS_REDIRECT_URL: process.env.GOOGLE_SHEETS_REDIRECT_URL,
-    AI_AWS_REGION: process.env.AI_AWS_REGION,
-    AI_AWS_ACCESS_KEY_ID: process.env.AI_AWS_ACCESS_KEY_ID,
-    AI_AWS_SECRET_ACCESS_KEY: process.env.AI_AWS_SECRET_ACCESS_KEY,
-    AI_AWS_SESSION_TOKEN: process.env.AI_AWS_SESSION_TOKEN,
-    AI_AZURE_BASE_URL: process.env.AI_AZURE_BASE_URL,
-    AI_AZURE_API_KEY: process.env.AI_AZURE_API_KEY,
-    AI_AZURE_API_VERSION: process.env.AI_AZURE_API_VERSION,
-    AI_AZURE_RESOURCE_NAME: process.env.AI_AZURE_RESOURCE_NAME,
     HTTP_PROXY: process.env.HTTP_PROXY,
     HTTPS_PROXY: process.env.HTTPS_PROXY,
     IMPRINT_URL: process.env.IMPRINT_URL,
@@ -321,10 +181,8 @@ const parsedEnv = createEnv({
     OIDC_SIGNING_ALGORITHM: process.env.OIDC_SIGNING_ALGORITHM,
     REDIS_URL: process.env.REDIS_URL,
     PASSWORD_RESET_DISABLED: process.env.PASSWORD_RESET_DISABLED,
-    PASSWORD_RESET_TOKEN_LIFETIME_MINUTES: process.env.PASSWORD_RESET_TOKEN_LIFETIME_MINUTES,
     PRIVACY_URL: process.env.PRIVACY_URL,
     RATE_LIMITING_DISABLED: process.env.RATE_LIMITING_DISABLED,
-    TELEMETRY_DISABLED: process.env.TELEMETRY_DISABLED,
     S3_ACCESS_KEY: process.env.S3_ACCESS_KEY,
     S3_BUCKET_NAME: process.env.S3_BUCKET_NAME,
     S3_REGION: process.env.S3_REGION,
@@ -363,7 +221,3 @@ const parsedEnv = createEnv({
     SENTRY_ENVIRONMENT: process.env.SENTRY_ENVIRONMENT,
   },
 });
-
-export const env = ZAIConfigurationEnv.superRefine(validateActiveAIProviderConfiguration)
-  .transform(() => parsedEnv)
-  .parse(parsedEnv);

apps/web/lib/i18n/utils.ts

@@ -84,9 +84,7 @@ export const extractLanguageIds = (languages: TLanguage[]): string[] => {
 
 export const getLanguageCode = (surveyLanguages: TSurveyLanguage[], languageCode: string | null) => {
   if (!surveyLanguages?.length || !languageCode) return "default";
-  const language = surveyLanguages.find(
-    (surveyLanguage) => surveyLanguage.language.code.toLowerCase() === languageCode.toLowerCase()
-  );
+  const language = surveyLanguages.find((surveyLanguage) => surveyLanguage.language.code === languageCode);
   return language?.default ? "default" : language?.language.code || "default";
 };
 

apps/web/lib/membership/hooks/actions.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import "server-only";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "../../organization/service";
 import { getMembershipByUserIdOrganizationId } from "../service";
 
@@ -9,7 +9,7 @@ export const getMembershipByUserIdOrganizationIdAction = async (environmentId: s
   const organization = await getOrganizationByEnvironmentId(environmentId);
 
   if (!organization) {
-    throw new ResourceNotFoundError("Organization", null);
+    throw new Error("Organization not found");
   }
 
   const currentUserMembership = await getMembershipRole(userId, organization.id);

apps/web/lib/membership/navigation.test.ts

@@ -1,14 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { getBillingFallbackPath } from "./navigation";
-
-describe("getBillingFallbackPath", () => {
-  test("returns billing settings path for cloud", () => {
-    const path = getBillingFallbackPath("env_123", true);
-    expect(path).toBe("/environments/env_123/settings/billing");
-  });
-
-  test("returns enterprise settings path for self-hosted", () => {
-    const path = getBillingFallbackPath("env_123", false);
-    expect(path).toBe("/environments/env_123/settings/enterprise");
-  });
-});

apps/web/lib/membership/navigation.ts

@@ -1,4 +0,0 @@
-export const getBillingFallbackPath = (environmentId: string, isFormbricksCloud: boolean): string => {
-  const settingsPath = isFormbricksCloud ? "billing" : "enterprise";
-  return `/environments/${environmentId}/settings/${settingsPath}`;
-};

apps/web/lib/organization/auth.test.ts

@@ -37,8 +37,7 @@ describe("auth", () => {
             },
             usageCycleAnchor: new Date(),
           },
-          isAISmartToolsEnabled: false,
-          isAIDataAnalysisEnabled: false,
+          isAIEnabled: false,
         },
       ];
       vi.mocked(getOrganizationsByUserId).mockResolvedValue(mockOrganizations);

apps/web/lib/organization/service.test.ts

@@ -72,8 +72,7 @@ describe("Organization Service", () => {
           stripeCustomerId: null,
           usageCycleAnchor: new Date(),
         },
-        isAISmartToolsEnabled: false,
-        isAIDataAnalysisEnabled: false,
+        isAIEnabled: false,
         whitelabel: false,
       };
 
@@ -125,8 +124,7 @@ describe("Organization Service", () => {
             stripeCustomerId: null,
             usageCycleAnchor: new Date(),
           },
-          isAISmartToolsEnabled: false,
-          isAIDataAnalysisEnabled: false,
+          isAIEnabled: false,
           whitelabel: false,
         },
       ];
@@ -178,8 +176,7 @@ describe("Organization Service", () => {
         createdAt: new Date(),
         updatedAt: new Date(),
         billing: expectedBilling,
-        isAISmartToolsEnabled: false,
-        isAIDataAnalysisEnabled: false,
+        isAIEnabled: false,
         whitelabel: false,
       };
 
@@ -238,8 +235,7 @@ describe("Organization Service", () => {
           stripeCustomerId: null,
           usageCycleAnchor: new Date(),
         },
-        isAISmartToolsEnabled: false,
-        isAIDataAnalysisEnabled: false,
+        isAIEnabled: false,
         whitelabel: false,
         memberships: [{ userId: "user1" }, { userId: "user2" }],
         projects: [
@@ -280,8 +276,7 @@ describe("Organization Service", () => {
           stripeCustomerId: null,
           usageCycleAnchor: expect.any(Date),
         },
-        isAISmartToolsEnabled: false,
-        isAIDataAnalysisEnabled: false,
+        isAIEnabled: false,
         whitelabel: false,
       });
       expect(prisma.organization.update).toHaveBeenCalledWith({

apps/web/lib/organization/service.ts

@@ -34,8 +34,7 @@ export const select = {
       stripe: true,
     },
   },
-  isAISmartToolsEnabled: true,
-  isAIDataAnalysisEnabled: true,
+  isAIEnabled: true,
   whitelabel: true,
 } satisfies Prisma.OrganizationSelect;
 
@@ -73,8 +72,7 @@ const mapOrganization = (organization: TOrganizationWithBilling): TOrganization
   updatedAt: organization.updatedAt,
   name: organization.name,
   billing: mapOrganizationBilling(organization.billing),
-  isAISmartToolsEnabled: organization.isAISmartToolsEnabled,
-  isAIDataAnalysisEnabled: organization.isAIDataAnalysisEnabled,
+  isAIEnabled: organization.isAIEnabled,
   whitelabel: organization.whitelabel as TOrganization["whitelabel"],
 });
 
@@ -367,34 +365,35 @@ export const subscribeOrganizationMembersToSurveyResponses = async (
   createdBy: string,
   organizationId: string
 ): Promise<void> => {
-  const surveyCreator = await prisma.user.findUnique({
-    where: {
-      id: createdBy,
-    },
-  });
+  try {
+    const surveyCreator = await prisma.user.findUnique({
+      where: {
+        id: createdBy,
+      },
+    });
 
-  if (!surveyCreator) {
-    throw new ResourceNotFoundError("User", createdBy);
+    if (!surveyCreator) {
+      throw new ResourceNotFoundError("User", createdBy);
+    }
+
+    if (surveyCreator.notificationSettings?.unsubscribedOrganizationIds?.includes(organizationId)) {
+      return;
+    }
+
+    const defaultSettings = { alert: {} };
+    const updatedNotificationSettings: TUserNotificationSettings = {
+      ...defaultSettings,
+      ...surveyCreator.notificationSettings,
+    };
+
+    updatedNotificationSettings.alert[surveyId] = true;
+
+    await updateUser(surveyCreator.id, {
+      notificationSettings: updatedNotificationSettings,
+    });
+  } catch (error) {
+    throw error;
   }
-
-  if (surveyCreator.notificationSettings?.unsubscribedOrganizationIds?.includes(organizationId)) {
-    return;
-  }
-
-  const defaultSettings = { alert: {} as NonNullable<TUserNotificationSettings["alert"]> };
-  const updatedNotificationSettings: TUserNotificationSettings = {
-    ...defaultSettings,
-    ...surveyCreator.notificationSettings,
-    alert: surveyCreator.notificationSettings?.alert
-      ? { ...surveyCreator.notificationSettings.alert }
-      : defaultSettings.alert,
-  };
-
-  updatedNotificationSettings.alert[surveyId] = true;
-
-  await updateUser(surveyCreator.id, {
-    notificationSettings: updatedNotificationSettings,
-  });
 };
 
 export const getOrganizationsWhereUserIsSingleOwner = reactCache(

apps/web/lib/posthog/capture.test.ts

@@ -1,84 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { capturePostHogEvent } from "./capture";
-
-const mocks = vi.hoisted(() => ({
-  capture: vi.fn(),
-  loggerWarn: vi.fn(),
-}));
-
-vi.mock("server-only", () => ({}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: { warn: mocks.loggerWarn },
-}));
-
-vi.mock("./server", () => ({
-  posthogServerClient: { capture: mocks.capture },
-}));
-
-describe("capturePostHogEvent", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("calls posthog capture with correct params", () => {
-    capturePostHogEvent("user123", "test_event", { key: "value" });
-
-    expect(mocks.capture).toHaveBeenCalledWith({
-      distinctId: "user123",
-      event: "test_event",
-      properties: {
-        key: "value",
-        $lib: "posthog-node",
-        source: "server",
-      },
-    });
-  });
-
-  test("adds default properties when no properties provided", () => {
-    capturePostHogEvent("user123", "test_event");
-
-    expect(mocks.capture).toHaveBeenCalledWith({
-      distinctId: "user123",
-      event: "test_event",
-      properties: {
-        $lib: "posthog-node",
-        source: "server",
-      },
-    });
-  });
-
-  test("does not throw when capture throws", () => {
-    mocks.capture.mockImplementation(() => {
-      throw new Error("Network error");
-    });
-
-    expect(() => capturePostHogEvent("user123", "test_event")).not.toThrow();
-    expect(mocks.loggerWarn).toHaveBeenCalledWith(
-      { error: expect.any(Error), eventName: "test_event" },
-      "Failed to capture PostHog event"
-    );
-  });
-});
-
-describe("capturePostHogEvent with null client", () => {
-  test("no-ops when posthogServerClient is null", async () => {
-    vi.clearAllMocks();
-    vi.resetModules();
-
-    vi.doMock("server-only", () => ({}));
-    vi.doMock("@formbricks/logger", () => ({
-      logger: { warn: mocks.loggerWarn },
-    }));
-    vi.doMock("./server", () => ({
-      posthogServerClient: null,
-    }));
-
-    const { capturePostHogEvent: captureWithNullClient } = await import("./capture");
-
-    captureWithNullClient("user123", "test_event", { key: "value" });
-
-    expect(mocks.capture).not.toHaveBeenCalled();
-    expect(mocks.loggerWarn).not.toHaveBeenCalled();
-  });
-});

apps/web/lib/posthog/capture.ts

@@ -1,27 +0,0 @@
-import "server-only";
-import { logger } from "@formbricks/logger";
-import { posthogServerClient } from "./server";
-
-type PostHogEventProperties = Record<string, string | number | boolean | null | undefined>;
-
-export function capturePostHogEvent(
-  distinctId: string,
-  eventName: string,
-  properties?: PostHogEventProperties
-): void {
-  if (!posthogServerClient) return;
-
-  try {
-    posthogServerClient.capture({
-      distinctId,
-      event: eventName,
-      properties: {
-        ...properties,
-        $lib: "posthog-node",
-        source: "server",
-      },
-    });
-  } catch (error) {
-    logger.warn({ error, eventName }, "Failed to capture PostHog event");
-  }
-}

apps/web/lib/posthog/index.ts

@@ -1 +0,0 @@
-export { capturePostHogEvent } from "./capture";

apps/web/lib/posthog/server.test.ts

@@ -1,171 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-describe("server - posthogServerClient", () => {
-  const g = globalThis as Record<string, unknown>;
-
-  const setupMocks = (opts: {
-    posthogKey?: string;
-    shutdown?: ReturnType<typeof vi.fn>;
-    loggerError?: ReturnType<typeof vi.fn>;
-  }) => {
-    const shutdown = opts.shutdown ?? vi.fn().mockResolvedValue(undefined);
-    const loggerError = opts.loggerError ?? vi.fn();
-
-    vi.doMock("server-only", () => ({}));
-    vi.doMock("@formbricks/logger", () => ({ logger: { error: loggerError } }));
-    vi.doMock("posthog-node", () => ({
-      PostHog: vi.fn().mockImplementation(function (this: Record<string, unknown>) {
-        this.capture = vi.fn();
-        this.shutdown = shutdown;
-      }),
-    }));
-    vi.doMock("@/lib/constants", () => ({ POSTHOG_KEY: opts.posthogKey }));
-
-    return { shutdown, loggerError };
-  };
-
-  beforeEach(() => {
-    vi.resetModules();
-    delete g.posthogServerClient;
-    delete g.posthogHandlersRegistered;
-  });
-
-  test("returns null when POSTHOG_KEY is not set", async () => {
-    setupMocks({ posthogKey: undefined });
-
-    const { posthogServerClient } = await import("./server");
-    expect(posthogServerClient).toBeNull();
-  });
-
-  test("creates PostHog client when POSTHOG_KEY is set", async () => {
-    setupMocks({ posthogKey: "phc_test_key" });
-
-    const { posthogServerClient } = await import("./server");
-    expect(posthogServerClient).not.toBeNull();
-
-    const { PostHog } = await import("posthog-node");
-    expect(PostHog).toHaveBeenCalledWith("phc_test_key", {
-      host: "https://eu.i.posthog.com",
-      flushAt: 1,
-      flushInterval: 0,
-    });
-  });
-
-  test("reuses client from globalThis in development", async () => {
-    const fakeClient = { capture: vi.fn(), shutdown: vi.fn().mockResolvedValue(undefined) };
-    g.posthogServerClient = fakeClient;
-
-    setupMocks({ posthogKey: "phc_test_key" });
-
-    const { posthogServerClient } = await import("./server");
-    expect(posthogServerClient).toBe(fakeClient);
-
-    const { PostHog } = await import("posthog-node");
-    expect(PostHog).not.toHaveBeenCalled();
-  });
-
-  test("caches client on globalThis in non-production", async () => {
-    vi.stubEnv("NODE_ENV", "development");
-
-    setupMocks({ posthogKey: "phc_test_key" });
-
-    const { posthogServerClient } = await import("./server");
-    expect(g.posthogServerClient).toBe(posthogServerClient);
-
-    vi.unstubAllEnvs();
-  });
-
-  test("registers signal handlers once when NEXT_RUNTIME is nodejs", async () => {
-    vi.stubEnv("NEXT_RUNTIME", "nodejs");
-
-    setupMocks({ posthogKey: "phc_test_key" });
-    const processOnSpy = vi.spyOn(process, "on");
-
-    await import("./server");
-
-    expect(processOnSpy).toHaveBeenCalledWith("SIGTERM", expect.any(Function));
-    expect(processOnSpy).toHaveBeenCalledWith("SIGINT", expect.any(Function));
-    expect(g.posthogHandlersRegistered).toBe(true);
-
-    processOnSpy.mockRestore();
-    vi.unstubAllEnvs();
-  });
-
-  test("does not register signal handlers when already registered", async () => {
-    vi.stubEnv("NEXT_RUNTIME", "nodejs");
-    g.posthogHandlersRegistered = true;
-
-    setupMocks({ posthogKey: "phc_test_key" });
-    const processOnSpy = vi.spyOn(process, "on");
-
-    await import("./server");
-
-    const sigCalls = processOnSpy.mock.calls.filter(([event]) => event === "SIGTERM" || event === "SIGINT");
-    expect(sigCalls).toHaveLength(0);
-
-    processOnSpy.mockRestore();
-    vi.unstubAllEnvs();
-  });
-
-  test("does not register signal handlers when NEXT_RUNTIME is not nodejs", async () => {
-    vi.stubEnv("NEXT_RUNTIME", "");
-
-    setupMocks({ posthogKey: "phc_test_key" });
-    const processOnSpy = vi.spyOn(process, "on");
-
-    await import("./server");
-
-    const sigCalls = processOnSpy.mock.calls.filter(([event]) => event === "SIGTERM" || event === "SIGINT");
-    expect(sigCalls).toHaveLength(0);
-
-    processOnSpy.mockRestore();
-    vi.unstubAllEnvs();
-  });
-
-  test("shutdown handler calls shutdown()", async () => {
-    vi.stubEnv("NEXT_RUNTIME", "nodejs");
-
-    const { shutdown } = setupMocks({ posthogKey: "phc_test_key" });
-
-    let sigTermHandler: (() => void) | undefined;
-    const processOnSpy = vi.spyOn(process, "on").mockImplementation((event, handler) => {
-      if (event === "SIGTERM") sigTermHandler = handler as () => void;
-      return process;
-    });
-
-    await import("./server");
-
-    expect(sigTermHandler).toBeDefined();
-    sigTermHandler!();
-    expect(shutdown).toHaveBeenCalled();
-
-    processOnSpy.mockRestore();
-    vi.unstubAllEnvs();
-  });
-
-  test("shutdown handler logs error if shutdown rejects", async () => {
-    vi.stubEnv("NEXT_RUNTIME", "nodejs");
-
-    const shutdownError = new Error("shutdown failed");
-    const { loggerError } = setupMocks({
-      posthogKey: "phc_test_key",
-      shutdown: vi.fn().mockRejectedValue(shutdownError),
-    });
-
-    let sigTermHandler: (() => void) | undefined;
-    const processOnSpy = vi.spyOn(process, "on").mockImplementation((event, handler) => {
-      if (event === "SIGTERM") sigTermHandler = handler as () => void;
-      return process;
-    });
-
-    await import("./server");
-
-    sigTermHandler!();
-    await new Promise((resolve) => setTimeout(resolve, 10));
-
-    expect(loggerError).toHaveBeenCalledWith(shutdownError, "Error shutting down PostHog server client");
-
-    processOnSpy.mockRestore();
-    vi.unstubAllEnvs();
-  });
-});

apps/web/lib/posthog/server.ts

@@ -1,43 +0,0 @@
-import "server-only";
-import { PostHog } from "posthog-node";
-import { logger } from "@formbricks/logger";
-import { POSTHOG_KEY } from "@/lib/constants";
-
-const POSTHOG_HOST = "https://eu.i.posthog.com";
-
-const globalForPostHog = globalThis as unknown as {
-  posthogServerClient: PostHog | undefined;
-  posthogHandlersRegistered: boolean | undefined;
-};
-
-function createPostHogClient(): PostHog | null {
-  if (!POSTHOG_KEY) return null;
-
-  return new PostHog(POSTHOG_KEY, {
-    host: POSTHOG_HOST,
-    flushAt: 1,
-    flushInterval: 0,
-  });
-}
-
-export const posthogServerClient: PostHog | null =
-  globalForPostHog.posthogServerClient ?? createPostHogClient();
-
-if (process.env.NODE_ENV !== "production" && posthogServerClient) {
-  globalForPostHog.posthogServerClient = posthogServerClient;
-}
-
-if (
-  process.env.NEXT_RUNTIME === "nodejs" &&
-  posthogServerClient &&
-  !globalForPostHog.posthogHandlersRegistered
-) {
-  const shutdownPostHog = () => {
-    posthogServerClient?.shutdown().catch((err) => {
-      logger.error(err, "Error shutting down PostHog server client");
-    });
-  };
-  process.on("SIGTERM", shutdownPostHog);
-  process.on("SIGINT", shutdownPostHog);
-  globalForPostHog.posthogHandlersRegistered = true;
-}