feat(web): implement NoScriptWarning component and localize messages for JavaScript requirement

.env.example

@@ -150,6 +150,7 @@ NOTION_OAUTH_CLIENT_ID=
 NOTION_OAUTH_CLIENT_SECRET=
 
 # Stripe Billing Variables
+STRIPE_PRICING_TABLE_ID=
 STRIPE_PUBLISHABLE_KEY=
 STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
@@ -185,11 +186,6 @@ ENTERPRISE_LICENSE_KEY=
 # Ignore Rate Limiting across the Formbricks app
 # RATE_LIMITING_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
@@ -236,4 +232,4 @@ REDIS_URL=redis://localhost:6379
 
 
 # Lingo.dev API key for translation generation
-LINGO_API_KEY=your_api_key_here
+LINGODOTDEV_API_KEY=your_api_key_here

.github/actions/build-and-push-docker/action.yml

@@ -285,14 +285,12 @@ runs:
           encryption_key=${{ env.DUMMY_ENCRYPTION_KEY }}
           redis_url=${{ env.DUMMY_REDIS_URL }}
           sentry_auth_token=${{ env.SENTRY_AUTH_TOKEN }}
-          posthog_key=${{ env.POSTHOG_KEY }}
       env:
         DEPOT_PROJECT_TOKEN: ${{ env.DEPOT_PROJECT_TOKEN }}
         DUMMY_DATABASE_URL: ${{ env.DUMMY_DATABASE_URL }}
         DUMMY_ENCRYPTION_KEY: ${{ env.DUMMY_ENCRYPTION_KEY }}
         DUMMY_REDIS_URL: ${{ env.DUMMY_REDIS_URL }}
         SENTRY_AUTH_TOKEN: ${{ env.SENTRY_AUTH_TOKEN }}
-        POSTHOG_KEY: ${{ env.POSTHOG_KEY }}
 
     - name: Sign GHCR image (GHCR only)
       if: ${{ inputs.registry_type == 'ghcr' && (github.event_name == 'workflow_call' || github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}

.github/workflows/build-and-push-ecr.yml

@@ -92,4 +92,3 @@ jobs:
           DUMMY_ENCRYPTION_KEY: ${{ secrets.DUMMY_ENCRYPTION_KEY }}
           DUMMY_REDIS_URL: ${{ secrets.DUMMY_REDIS_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}

AGENTS.md

@@ -52,14 +52,6 @@ We are using SonarQube to identify code smells and security hotspots.
 - Translations are in `apps/web/locales/`. Default is `en-US.json`.
 - Lingo.dev is automatically translating strings from en-US into other languages on commit. Run `pnpm i18n` to generate missing translations and validate keys.
 
-## Date and Time Rendering
-
-- All user-facing dates and times must use shared formatting helpers instead of ad hoc `date-fns`, `Intl`, or `toLocale*` calls in components.
-- Locale for display must come from the app language source of truth (`user.locale`, `getLocale()`, or `i18n.resolvedLanguage`), not browser defaults or implicit `undefined` locale behavior.
-- Locale and time zone are different concerns: locale controls formatting, time zone controls the represented clock/calendar moment.
-- Never infer a time zone from locale. If a product-level time zone source of truth exists, use it explicitly; otherwise preserve the existing semantic meaning of the stored value and avoid introducing browser-dependent conversions.
-- Machine-facing values for storage, APIs, exports, integrations, and logs must remain stable and non-localized (`ISO 8601` / UTC where applicable).
-
 ## Database & Prisma Performance
 
 - Multi-tenancy: All data must be scoped by Organization or Environment.

apps/storybook/package.json

@@ -12,18 +12,18 @@
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^5.0.1",
-    "@storybook/addon-a11y": "10.2.17",
-    "@storybook/addon-links": "10.2.17",
-    "@storybook/addon-onboarding": "10.2.17",
-    "@storybook/react-vite": "10.2.17",
-    "@typescript-eslint/eslint-plugin": "8.57.0",
+    "@storybook/addon-a11y": "10.2.15",
+    "@storybook/addon-links": "10.2.15",
+    "@storybook/addon-onboarding": "10.2.15",
+    "@storybook/react-vite": "10.2.15",
+    "@typescript-eslint/eslint-plugin": "8.56.1",
     "@tailwindcss/vite": "4.2.1",
-    "@typescript-eslint/parser": "8.57.0",
+    "@typescript-eslint/parser": "8.56.1",
     "@vitejs/plugin-react": "5.1.4",
     "eslint-plugin-react-refresh": "0.4.26",
-    "eslint-plugin-storybook": "10.2.17",
-    "storybook": "10.2.17",
+    "eslint-plugin-storybook": "10.2.14",
+    "storybook": "10.2.15",
     "vite": "7.3.1",
-    "@storybook/addon-docs": "10.2.17"
+    "@storybook/addon-docs": "10.2.15"
   }
 }

apps/web/Dockerfile

@@ -67,7 +67,6 @@ RUN --mount=type=secret,id=database_url \
     --mount=type=secret,id=encryption_key \
     --mount=type=secret,id=redis_url \
     --mount=type=secret,id=sentry_auth_token \
-    --mount=type=secret,id=posthog_key \
     /tmp/read-secrets.sh pnpm build --filter=@formbricks/web...
 
 #
@@ -122,11 +121,8 @@ RUN chown -R nextjs:nextjs ./node_modules/.prisma && chmod -R 755 ./node_modules
 COPY --from=installer /app/node_modules/@paralleldrive/cuid2 ./node_modules/@paralleldrive/cuid2
 RUN chmod -R 755 ./node_modules/@paralleldrive/cuid2
 
-# Runtime migrations import uuid v7 from the database package, so copy the
-# database package's resolved install instead of the repo-root hoisted version.
-COPY --from=installer /app/packages/database/node_modules/uuid ./node_modules/uuid
-RUN chmod -R 755 ./node_modules/uuid \
-    && node --input-type=module -e "import('uuid').then((module) => { if (typeof module.v7 !== 'function') throw new Error('uuid v7 missing in runtime image'); })"
+COPY --from=installer /app/node_modules/uuid ./node_modules/uuid
+RUN chmod -R 755 ./node_modules/uuid
 
 COPY --from=installer /app/node_modules/@noble/hashes ./node_modules/@noble/hashes
 RUN chmod -R 755 ./node_modules/@noble/hashes
@@ -169,4 +165,4 @@ RUN mkdir -p /home/nextjs/apps/web/uploads/ && \
 VOLUME /home/nextjs/apps/web/uploads/
 VOLUME /home/nextjs/apps/web/saml-connection
 
-CMD ["/home/nextjs/start.sh"]
+CMD ["/home/nextjs/start.sh"]

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)/lib/onboarding.ts

@@ -22,10 +22,12 @@ export const getTeamsByOrganizationId = reactCache(
         },
       });
 
-      return teams.map((team: TOrganizationTeam) => ({
+      const projectTeams = teams.map((team) => ({
         id: team.id,
         name: team.name,
       }));
+
+      return projectTeams;
     } catch (error) {
       if (error instanceof Prisma.PrismaClientKnownRequestError) {
         throw new DatabaseError(error.message);

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/plan/page.tsx

@@ -1,12 +1,8 @@
 import { redirect } from "next/navigation";
-import { TCloudBillingPlan } from "@formbricks/types/organizations";
 import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
-import { getOrganizationBillingWithReadThroughSync } from "@/modules/ee/billing/lib/organization-billing";
 import { getOrganizationAuth } from "@/modules/organization/lib/utils";
 import { SelectPlanOnboarding } from "./components/select-plan-onboarding";
 
-const PAID_PLANS = new Set<TCloudBillingPlan>(["pro", "scale", "custom"]);
-
 interface PlanPageProps {
   params: Promise<{
     organizationId: string;
@@ -26,16 +22,6 @@ const Page = async (props: PlanPageProps) => {
     return redirect(`/auth/login`);
   }
 
-  // Users with an existing paid/trial subscription should not be shown the trial page.
-  // Redirect them directly to the next onboarding step.
-  const billing = await getOrganizationBillingWithReadThroughSync(params.organizationId);
-  const currentPlan = billing?.stripe?.plan;
-  const hasExistingSubscription = currentPlan !== undefined && PAID_PLANS.has(currentPlan);
-
-  if (hasExistingSubscription) {
-    return redirect(`/organizations/${params.organizationId}/workspaces/new/mode`);
-  }
-
   return <SelectPlanOnboarding organizationId={params.organizationId} />;
 };
 

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)/billing-confirmation/components/ConfirmationPage.tsx

@@ -6,12 +6,16 @@ import { useTranslation } from "react-i18next";
 import { Button } from "@/modules/ui/components/button";
 import { Confetti } from "@/modules/ui/components/confetti";
 
+interface ConfirmationPageProps {
+  environmentId?: string;
+}
+
 const BILLING_CONFIRMATION_ENVIRONMENT_ID_KEY = "billingConfirmationEnvironmentId";
 
-export const ConfirmationPage = () => {
+export const ConfirmationPage = ({ environmentId }: ConfirmationPageProps) => {
   const { t } = useTranslation();
   const [showConfetti, setShowConfetti] = useState(false);
-  const [resolvedEnvironmentId, setResolvedEnvironmentId] = useState<string | null>(null);
+  const [resolvedEnvironmentId, setResolvedEnvironmentId] = useState(environmentId ?? null);
 
   useEffect(() => {
     setShowConfetti(true);
@@ -20,13 +24,19 @@ export const ConfirmationPage = () => {
       return;
     }
 
+    if (environmentId) {
+      globalThis.window.sessionStorage.setItem(BILLING_CONFIRMATION_ENVIRONMENT_ID_KEY, environmentId);
+      setResolvedEnvironmentId(environmentId);
+      return;
+    }
+
     const storedEnvironmentId = globalThis.window.sessionStorage.getItem(
       BILLING_CONFIRMATION_ENVIRONMENT_ID_KEY
     );
     if (storedEnvironmentId) {
       setResolvedEnvironmentId(storedEnvironmentId);
     }
-  }, []);
+  }, [environmentId]);
 
   return (
     <div className="h-full w-full">

apps/web/app/(app)/billing-confirmation/page.tsx

@@ -3,10 +3,17 @@ import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper
 
 export const dynamic = "force-dynamic";
 
-const Page = async () => {
+const Page = async (props: { searchParams: Promise<{ environmentId: string }> }) => {
+  const searchParams = await props.searchParams;
+  const { environmentId } = searchParams;
+
+  if (!environmentId) {
+    return null;
+  }
+
   return (
     <PageContentWrapper>
-      <ConfirmationPage />
+      <ConfirmationPage environmentId={environmentId} />
     </PageContentWrapper>
   );
 };

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 (

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

@@ -28,7 +28,6 @@ import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
-import { TrialAlert } from "@/modules/ee/billing/components/trial-alert";
 import { getLatestStableFbReleaseAction } from "@/modules/projects/settings/(setup)/app-connection/actions";
 import { ProfileAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
@@ -168,20 +167,6 @@ export const MainNavigation = ({
     if (isOwnerOrManager) loadReleases();
   }, [isOwnerOrManager]);
 
-  const trialDaysRemaining = useMemo(() => {
-    if (!isFormbricksCloud || organization.billing?.stripe?.subscriptionStatus !== "trialing") return null;
-    const trialEnd = organization.billing.stripe.trialEnd;
-    if (!trialEnd) return null;
-    const ts = new Date(trialEnd).getTime();
-    if (!Number.isFinite(ts)) return null;
-    const msPerDay = 86_400_000;
-    return Math.ceil((ts - Date.now()) / msPerDay);
-  }, [
-    isFormbricksCloud,
-    organization.billing?.stripe?.subscriptionStatus,
-    organization.billing?.stripe?.trialEnd,
-  ]);
-
   const mainNavigationLink = `/environments/${environment.id}/${isBilling ? "settings/billing/" : "surveys/"}`;
 
   return (
@@ -256,13 +241,6 @@ export const MainNavigation = ({
               </Link>
             )}
 
-            {/* Trial Days Remaining */}
-            {!isCollapsed && isFormbricksCloud && trialDaysRemaining !== null && (
-              <Link href={`/environments/${environment.id}/settings/billing`} className="m-2 block">
-                <TrialAlert trialDaysRemaining={trialDaysRemaining} size="small" />
-              </Link>
-            )}
-
             {/* User Switch */}
             <div className="flex items-center">
               <DropdownMenu>

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/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";
@@ -61,7 +60,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
                   buttons={[
                     {
                       text: IS_FORMBRICKS_CLOUD
-                        ? t("common.upgrade_plan")
+                        ? t("common.start_free_trial")
                         : t("common.request_trial_license"),
                       href: IS_FORMBRICKS_CLOUD
                         ? `/environments/${params.environmentId}/settings/billing`

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)/enterprise/components/EnterpriseLicenseFeaturesTable.tsx

@@ -1,146 +0,0 @@
-"use client";
-
-import type { TFunction } from "i18next";
-import Link from "next/link";
-import { useTranslation } from "react-i18next";
-import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
-import type { TEnterpriseLicenseFeatures } from "@/modules/ee/license-check/types/enterprise-license";
-import { Badge } from "@/modules/ui/components/badge";
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/modules/ui/components/table";
-
-type TPublicLicenseFeatureKey = Exclude<keyof TEnterpriseLicenseFeatures, "isMultiOrgEnabled" | "ai">;
-
-type TFeatureDefinition = {
-  key: TPublicLicenseFeatureKey;
-  labelKey: string;
-  docsUrl: string;
-};
-
-const getFeatureDefinitions = (t: TFunction): TFeatureDefinition[] => {
-  return [
-    {
-      key: "contacts",
-      labelKey: t("environments.settings.enterprise.license_feature_contacts"),
-      docsUrl:
-        "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/contact-management-segments",
-    },
-    {
-      key: "projects",
-      labelKey: t("environments.settings.enterprise.license_feature_projects"),
-      docsUrl: "https://formbricks.com/docs/self-hosting/advanced/license",
-    },
-    {
-      key: "whitelabel",
-      labelKey: t("environments.settings.enterprise.license_feature_whitelabel"),
-      docsUrl:
-        "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/whitelabel-email-follow-ups",
-    },
-    {
-      key: "removeBranding",
-      labelKey: t("environments.settings.enterprise.license_feature_remove_branding"),
-      docsUrl:
-        "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/hide-powered-by-formbricks",
-    },
-    {
-      key: "twoFactorAuth",
-      labelKey: t("environments.settings.enterprise.license_feature_two_factor_auth"),
-      docsUrl: "https://formbricks.com/docs/xm-and-surveys/core-features/user-management/two-factor-auth",
-    },
-    {
-      key: "sso",
-      labelKey: t("environments.settings.enterprise.license_feature_sso"),
-      docsUrl: "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/oidc-sso",
-    },
-    {
-      key: "saml",
-      labelKey: t("environments.settings.enterprise.license_feature_saml"),
-      docsUrl: "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/saml-sso",
-    },
-    {
-      key: "spamProtection",
-      labelKey: t("environments.settings.enterprise.license_feature_spam_protection"),
-      docsUrl: "https://formbricks.com/docs/xm-and-surveys/surveys/general-features/spam-protection",
-    },
-    {
-      key: "auditLogs",
-      labelKey: t("environments.settings.enterprise.license_feature_audit_logs"),
-      docsUrl: "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/audit-logging",
-    },
-    {
-      key: "accessControl",
-      labelKey: t("environments.settings.enterprise.license_feature_access_control"),
-      docsUrl: "https://formbricks.com/docs/self-hosting/advanced/enterprise-features/team-access",
-    },
-    {
-      key: "quotas",
-      labelKey: t("environments.settings.enterprise.license_feature_quotas"),
-      docsUrl: "https://formbricks.com/docs/xm-and-surveys/surveys/general-features/quota-management",
-    },
-  ];
-};
-
-interface EnterpriseLicenseFeaturesTableProps {
-  features: TEnterpriseLicenseFeatures;
-}
-
-export const EnterpriseLicenseFeaturesTable = ({ features }: EnterpriseLicenseFeaturesTableProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <SettingsCard
-      title={t("environments.settings.enterprise.license_features_table_title")}
-      description={t("environments.settings.enterprise.license_features_table_description")}
-      noPadding>
-      <Table>
-        <TableHeader>
-          <TableRow className="hover:bg-white">
-            <TableHead>{t("environments.settings.enterprise.license_features_table_feature")}</TableHead>
-            <TableHead>{t("environments.settings.enterprise.license_features_table_access")}</TableHead>
-            <TableHead>{t("environments.settings.enterprise.license_features_table_value")}</TableHead>
-            <TableHead>{t("common.documentation")}</TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {getFeatureDefinitions(t).map((feature) => {
-            const value = features[feature.key];
-            const isEnabled = typeof value === "boolean" ? value : value === null || value > 0;
-            let displayValue: number | string = "—";
-
-            if (typeof value === "number") {
-              displayValue = value;
-            } else if (value === null) {
-              displayValue = t("environments.settings.enterprise.license_features_table_unlimited");
-            }
-
-            return (
-              <TableRow key={feature.key} className="hover:bg-white">
-                <TableCell className="font-medium text-slate-900">{t(feature.labelKey)}</TableCell>
-                <TableCell>
-                  <Badge
-                    type={isEnabled ? "success" : "gray"}
-                    size="normal"
-                    text={
-                      isEnabled
-                        ? t("environments.settings.enterprise.license_features_table_enabled")
-                        : t("environments.settings.enterprise.license_features_table_disabled")
-                    }
-                  />
-                </TableCell>
-                <TableCell className="text-slate-600">{displayValue}</TableCell>
-                <TableCell>
-                  <Link
-                    href={feature.docsUrl}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-sm font-medium text-slate-700 underline underline-offset-2 hover:text-slate-900">
-                    {t("common.read_docs")}
-                  </Link>
-                </TableCell>
-              </TableRow>
-            );
-          })}
-        </TableBody>
-      </Table>
-    </SettingsCard>
-  );
-};

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

@@ -6,23 +6,22 @@ import { useRouter } from "next/navigation";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { formatDateForDisplay, formatDateTimeForDisplay } from "@/lib/utils/datetime";
 import { recheckLicenseAction } from "@/modules/ee/license-check/actions";
-import type { TLicenseStatus } from "@/modules/ee/license-check/types/enterprise-license";
 import { Alert, AlertDescription } from "@/modules/ui/components/alert";
 import { Badge } from "@/modules/ui/components/badge";
 import { Button } from "@/modules/ui/components/button";
 import { SettingsCard } from "../../../components/SettingsCard";
 
+type LicenseStatus = "active" | "expired" | "unreachable" | "invalid_license";
+
 interface EnterpriseLicenseStatusProps {
-  status: TLicenseStatus;
-  lastChecked: Date;
+  status: LicenseStatus;
   gracePeriodEnd?: Date;
   environmentId: string;
 }
 
 const getBadgeConfig = (
-  status: TLicenseStatus,
+  status: LicenseStatus,
   t: TFunction
 ): { type: "success" | "error" | "warning" | "gray"; label: string } => {
   switch (status) {
@@ -30,11 +29,6 @@ const getBadgeConfig = (
       return { type: "success", label: t("environments.settings.enterprise.license_status_active") };
     case "expired":
       return { type: "error", label: t("environments.settings.enterprise.license_status_expired") };
-    case "instance_mismatch":
-      return {
-        type: "error",
-        label: t("environments.settings.enterprise.license_status_instance_mismatch"),
-      };
     case "unreachable":
       return { type: "warning", label: t("environments.settings.enterprise.license_status_unreachable") };
     case "invalid_license":
@@ -46,12 +40,10 @@ const getBadgeConfig = (
 
 export const EnterpriseLicenseStatus = ({
   status,
-  lastChecked,
   gracePeriodEnd,
   environmentId,
 }: EnterpriseLicenseStatusProps) => {
-  const { t, i18n } = useTranslation();
-  const locale = i18n.resolvedLanguage ?? i18n.language ?? "en-US";
+  const { t } = useTranslation();
   const router = useRouter();
   const [isRechecking, setIsRechecking] = useState(false);
 
@@ -67,8 +59,6 @@ export const EnterpriseLicenseStatus = ({
       if (result?.data) {
         if (result.data.status === "unreachable") {
           toast.error(t("environments.settings.enterprise.recheck_license_unreachable"));
-        } else if (result.data.status === "instance_mismatch") {
-          toast.error(t("environments.settings.enterprise.recheck_license_instance_mismatch"));
         } else if (result.data.status === "invalid_license") {
           toast.error(t("environments.settings.enterprise.recheck_license_invalid"));
         } else {
@@ -96,12 +86,7 @@ export const EnterpriseLicenseStatus = ({
       <div className="flex flex-col gap-4">
         <div className="flex items-center justify-between gap-3">
           <div className="flex flex-col gap-1.5">
-            <div className="flex flex-wrap items-center gap-3">
-              <Badge type={badgeConfig.type} text={badgeConfig.label} size="normal" className="w-fit" />
-              <span className="text-sm text-slate-500">
-                {t("common.updated_at")} {formatDateTimeForDisplay(new Date(lastChecked), locale)}
-              </span>
-            </div>
+            <Badge type={badgeConfig.type} text={badgeConfig.label} size="normal" className="w-fit" />
           </div>
           <Button
             type="button"
@@ -127,7 +112,7 @@ export const EnterpriseLicenseStatus = ({
           <Alert variant="warning" size="small">
             <AlertDescription className="overflow-visible whitespace-normal">
               {t("environments.settings.enterprise.license_unreachable_grace_period", {
-                gracePeriodEnd: formatDateForDisplay(new Date(gracePeriodEnd), locale, {
+                gracePeriodEnd: new Date(gracePeriodEnd).toLocaleDateString(undefined, {
                   year: "numeric",
                   month: "short",
                   day: "numeric",
@@ -143,13 +128,6 @@ export const EnterpriseLicenseStatus = ({
             </AlertDescription>
           </Alert>
         )}
-        {status === "instance_mismatch" && (
-          <Alert variant="error" size="small">
-            <AlertDescription className="overflow-visible whitespace-normal">
-              {t("environments.settings.enterprise.license_instance_mismatch_description")}
-            </AlertDescription>
-          </Alert>
-        )}
         <p className="border-t border-slate-100 pt-4 text-sm text-slate-500">
           {t("environments.settings.enterprise.questions_please_reach_out_to")}{" "}
           <a

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

@@ -10,7 +10,6 @@ import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { Button } from "@/modules/ui/components/button";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
-import { EnterpriseLicenseFeaturesTable } from "./components/EnterpriseLicenseFeaturesTable";
 
 const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const params = await props.params;
@@ -94,19 +93,15 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
         />
       </PageHeader>
       {hasLicense ? (
-        <>
-          <EnterpriseLicenseStatus
-            status={licenseState.status}
-            lastChecked={licenseState.lastChecked}
-            gracePeriodEnd={
-              licenseState.status === "unreachable"
-                ? new Date(licenseState.lastChecked.getTime() + GRACE_PERIOD_MS)
-                : undefined
-            }
-            environmentId={params.environmentId}
-          />
-          {licenseState.features && <EnterpriseLicenseFeaturesTable features={licenseState.features} />}
-        </>
+        <EnterpriseLicenseStatus
+          status={licenseState.status as "active" | "expired" | "unreachable" | "invalid_license"}
+          gracePeriodEnd={
+            licenseState.status === "unreachable"
+              ? new Date(licenseState.lastChecked.getTime() + GRACE_PERIOD_MS)
+              : undefined
+          }
+          environmentId={params.environmentId}
+        />
       ) : (
         <div>
           <div className="relative isolate mt-8 overflow-hidden rounded-lg bg-slate-900 px-3 pt-8 shadow-2xl sm:px-8 md:pt-12 lg:flex lg:gap-x-10 lg:px-12 lg:pt-0">

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

@@ -96,8 +96,8 @@ export const ResponseTable = ({
   const showQuotasColumn = isQuotasAllowed && quotas.length > 0;
   // Generate columns
   const columns = useMemo(
-    () => generateResponseTableColumns(survey, isExpanded ?? false, isReadOnly, locale, t, showQuotasColumn),
-    [survey, isExpanded, isReadOnly, locale, t, showQuotasColumn]
+    () => generateResponseTableColumns(survey, isExpanded ?? false, isReadOnly, t, showQuotasColumn),
+    [survey, isExpanded, isReadOnly, t, showQuotasColumn]
   );
 
   // Save settings to localStorage when they change
@@ -300,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/components/ResponseTableColumns.tsx

@@ -8,11 +8,10 @@ import { TResponseTableData } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getTextContent } from "@formbricks/types/surveys/validation";
-import { TUserLocale } from "@formbricks/types/user";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { extractChoiceIdsFromResponse } from "@/lib/response/utils";
 import { getContactIdentifier } from "@/lib/utils/contact";
-import { formatDateTimeForDisplay } from "@/lib/utils/datetime";
+import { getFormattedDateTimeString } from "@/lib/utils/datetime";
 import { recallToHeadline } from "@/lib/utils/recall";
 import { RenderResponse } from "@/modules/analysis/components/SingleResponseCard/components/RenderResponse";
 import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
@@ -35,7 +34,6 @@ const getElementColumnsData = (
   element: TSurveyElement,
   survey: TSurvey,
   isExpanded: boolean,
-  locale: TUserLocale,
   t: TFunction
 ): ColumnDef<TResponseTableData>[] => {
   const ELEMENTS_ICON_MAP = getElementIconMap(t);
@@ -169,7 +167,6 @@ const getElementColumnsData = (
                 survey={survey}
                 responseData={responseValue}
                 language={language}
-                locale={locale}
                 isExpanded={isExpanded}
                 showId={false}
               />
@@ -221,7 +218,6 @@ const getElementColumnsData = (
                 survey={survey}
                 responseData={responseValue}
                 language={language}
-                locale={locale}
                 isExpanded={isExpanded}
                 showId={false}
               />
@@ -263,14 +259,11 @@ export const generateResponseTableColumns = (
   survey: TSurvey,
   isExpanded: boolean,
   isReadOnly: boolean,
-  locale: TUserLocale,
   t: TFunction,
   showQuotasColumn: boolean
 ): ColumnDef<TResponseTableData>[] => {
   const elements = getElementsFromBlocks(survey.blocks);
-  const elementColumns = elements.flatMap((element) =>
-    getElementColumnsData(element, survey, isExpanded, locale, t)
-  );
+  const elementColumns = elements.flatMap((element) => getElementColumnsData(element, survey, isExpanded, t));
 
   const dateColumn: ColumnDef<TResponseTableData> = {
     accessorKey: "createdAt",
@@ -278,7 +271,7 @@ export const generateResponseTableColumns = (
     size: 200,
     cell: ({ row }) => {
       const date = new Date(row.original.createdAt);
-      return <p className="text-slate-900">{formatDateTimeForDisplay(date, locale)}</p>;
+      return <p className="text-slate-900">{getFormattedDateTimeString(date)}</p>;
     },
   };
 

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";
@@ -8,6 +7,7 @@ import { getResponseCountBySurveyId, getResponses } from "@/lib/response/service
 import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { getUser } from "@/lib/user/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
 import { getIsContactsEnabled, getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
@@ -23,24 +23,25 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
 
   const { session, environment, organization, isReadOnly } = await getEnvironmentAuth(params.environmentId);
 
-  const [survey, user, tags, isContactsEnabled, responseCount] = await Promise.all([
+  const [survey, user, tags, isContactsEnabled, responseCount, locale] = await Promise.all([
     getSurvey(params.surveyId),
     getUser(session.user.id),
     getTagsByEnvironmentId(params.environmentId),
     getIsContactsEnabled(organization.id),
     getResponseCountBySurveyId(params.surveyId),
+    findMatchingLocale(),
   ]);
 
   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 +50,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);
@@ -85,7 +86,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
         environmentTags={tags}
         user={user}
         responsesPerPage={RESPONSES_PER_PAGE}
-        locale={user.locale}
+        locale={locale}
         isReadOnly={isReadOnly}
         isQuotasAllowed={isQuotasAllowed}
         quotas={quotas}

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

@@ -64,17 +64,15 @@ export const sendEmbedSurveyPreviewEmailAction = authenticatedActionClient
 
 const ZResetSurveyAction = z.object({
   surveyId: ZId,
+  organizationId: ZId,
   projectId: ZId,
 });
 
 export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSurveyAction).action(
   withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
-    const organizationId = await getOrganizationIdFromSurveyId(parsedInput.surveyId);
-    const projectId = await getProjectIdFromSurveyId(parsedInput.surveyId);
-
     await checkAuthorizationUpdated({
       userId: ctx.user.id,
-      organizationId,
+      organizationId: parsedInput.organizationId,
       access: [
         {
           type: "organization",
@@ -83,12 +81,12 @@ export const resetSurveyAction = authenticatedActionClient.inputSchema(ZResetSur
         {
           type: "projectTeam",
           minPermission: "readWrite",
-          projectId,
+          projectId: parsedInput.projectId,
         },
       ],
     });
 
-    ctx.auditLoggingCtx.organizationId = organizationId;
+    ctx.auditLoggingCtx.organizationId = parsedInput.organizationId;
     ctx.auditLoggingCtx.surveyId = parsedInput.surveyId;
     ctx.auditLoggingCtx.oldObject = null;
 

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

@@ -7,7 +7,7 @@ import { TSurvey, TSurveyElementSummaryDate } from "@formbricks/types/surveys/ty
 import { TUserLocale } from "@formbricks/types/user";
 import { timeSince } from "@/lib/time";
 import { getContactIdentifier } from "@/lib/utils/contact";
-import { formatStoredDateForDisplay } from "@/lib/utils/date-display";
+import { formatDateWithOrdinal } from "@/lib/utils/datetime";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
 import { EmptyState } from "@/modules/ui/components/empty-state";
@@ -32,14 +32,13 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
   };
 
   const renderResponseValue = (value: string) => {
-    const formattedDate = formatStoredDateForDisplay(value, elementSummary.element.format, locale);
+    const parsedDate = new Date(value);
 
-    return (
-      formattedDate ??
-      t("common.invalid_date_with_value", {
-        value,
-      })
-    );
+    const formattedDate = isNaN(parsedDate.getTime())
+      ? `${t("common.invalid_date")}(${value})`
+      : formatDateWithOrdinal(parsedDate);
+
+    return formattedDate;
   };
 
   return (
@@ -60,7 +59,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
             elementSummary.samples.slice(0, visibleResponses).map((response) => (
               <div
                 key={response.id}
-                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent">
+                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
                 <div className="pl-4 md:pl-6">
                   {response.contact ? (
                     <Link
@@ -85,7 +84,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
                 <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
                   {renderResponseValue(response.value)}
                 </div>
-                <div className="px-4 md:px-6">
+                <div className="px-4 text-slate-500 md:px-6">
                   {timeSince(new Date(response.updatedAt).toISOString(), locale)}
                 </div>
               </div>

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

@@ -64,7 +64,7 @@ export const SurveyAnalysisCTA = ({
   const [isResetModalOpen, setIsResetModalOpen] = useState(false);
   const [isResetting, setIsResetting] = useState(false);
 
-  const { project } = useEnvironment();
+  const { organizationId, project } = useEnvironment();
   const { refreshSingleUseId } = useSingleUseId(survey, isReadOnly);
 
   const appSetupCompleted = survey.type === "app" && environment.appSetupCompleted;
@@ -128,6 +128,7 @@ export const SurveyAnalysisCTA = ({
     setIsResetting(true);
     const result = await resetSurveyAction({
       surveyId: survey.id,
+      organizationId: organizationId,
       projectId: project.id,
     });
     if (result?.data) {

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

@@ -165,7 +165,7 @@ export const PersonalLinksTab = ({
         description={t("environments.surveys.share.personal_links.upgrade_prompt_description")}
         buttons={[
           {
-            text: isFormbricksCloud ? t("common.upgrade_plan") : t("common.request_trial_license"),
+            text: isFormbricksCloud ? t("common.start_free_trial") : t("common.request_trial_license"),
             href: isFormbricksCloud
               ? `/environments/${environmentId}/settings/billing`
               : "https://formbricks.com/upgrade-self-hosting-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

@@ -2,16 +2,21 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZResponseFilterCriteria } from "@formbricks/types/responses";
+import { ZSurvey } from "@formbricks/types/surveys/types";
+import { getOrganization } from "@/lib/organization/service";
 import { getResponseDownloadFile, getResponseFilteringValues } from "@/lib/response/service";
-import { getSurvey } from "@/lib/survey/service";
+import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
+import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getQuotas } from "@/modules/ee/quotas/lib/quotas";
+import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
+import { checkSpamProtectionPermission } from "@/modules/survey/lib/permission";
 import { getOrganizationBilling } from "@/modules/survey/lib/survey";
 
 const ZGetResponsesDownloadUrlAction = z.object({
@@ -92,3 +97,68 @@ export const getSurveyFilterDataAction = authenticatedActionClient
 
     return { environmentTags: tags, attributes, meta, hiddenFields, quotas };
   });
+
+/**
+ * Checks if survey follow-ups are enabled for the given organization.
+ *
+ * @param {string} organizationId  The ID of the organization to check.
+ * @returns {Promise<void>}  A promise that resolves if the permission is granted.
+ * @throws {ResourceNotFoundError}  If the organization is not found.
+ * @throws {OperationNotAllowedError}  If survey follow-ups are not enabled for the organization.
+ */
+const checkSurveyFollowUpsPermission = async (organizationId: string): Promise<void> => {
+  const organization = await getOrganization(organizationId);
+
+  if (!organization) {
+    throw new ResourceNotFoundError("Organization not found", organizationId);
+  }
+
+  const isSurveyFollowUpsEnabled = await getSurveyFollowUpsPermission(organizationId);
+  if (!isSurveyFollowUpsEnabled) {
+    throw new OperationNotAllowedError("Survey follow ups are not enabled for this organization");
+  }
+};
+
+export const updateSurveyAction = authenticatedActionClient.inputSchema(ZSurvey).action(
+  withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
+    const organizationId = await getOrganizationIdFromSurveyId(parsedInput.id);
+    await checkAuthorizationUpdated({
+      userId: ctx.user?.id ?? "",
+      organizationId,
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          projectId: await getProjectIdFromSurveyId(parsedInput.id),
+          minPermission: "readWrite",
+        },
+      ],
+    });
+
+    const { followUps } = parsedInput;
+
+    const oldSurvey = await getSurvey(parsedInput.id);
+
+    if (parsedInput.recaptcha?.enabled) {
+      await checkSpamProtectionPermission(organizationId);
+    }
+
+    if (followUps?.length) {
+      await checkSurveyFollowUpsPermission(organizationId);
+    }
+
+    // Context for audit log
+    ctx.auditLoggingCtx.surveyId = parsedInput.id;
+    ctx.auditLoggingCtx.organizationId = organizationId;
+    ctx.auditLoggingCtx.oldObject = oldSurvey;
+
+    const newSurvey = await updateSurvey(parsedInput);
+
+    ctx.auditLoggingCtx.newObject = newSurvey;
+
+    return newSurvey;
+  })
+);

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]/components/SurveyStatusDropdown.tsx

@@ -6,7 +6,6 @@ import { useTranslation } from "react-i18next";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { updateSurveyAction } from "@/modules/survey/editor/actions";
 import {
   Select,
   SelectContent,
@@ -15,6 +14,7 @@ import {
   SelectValue,
 } from "@/modules/ui/components/select";
 import { SurveyStatusIndicator } from "@/modules/ui/components/survey-status-indicator";
+import { updateSurveyAction } from "../actions";
 
 interface SurveyStatusDropdownProps {
   environment: TEnvironment;

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]/workspace/integrations/airtable/page.tsx

@@ -4,9 +4,9 @@ import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
 import { AirtableWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/airtable/components/AirtableWrapper";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { getAirtableTables } from "@/lib/airtable/service";
-import { AIRTABLE_CLIENT_ID, DEFAULT_LOCALE, WEBAPP_URL } from "@/lib/constants";
+import { AIRTABLE_CLIENT_ID, WEBAPP_URL } from "@/lib/constants";
 import { getIntegrations } from "@/lib/integration/service";
-import { getUserLocale } from "@/lib/user/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -18,12 +18,11 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!AIRTABLE_CLIENT_ID;
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, integrations, locale] = await Promise.all([
+  const [surveys, integrations] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrations(params.environmentId),
-    getUserLocale(session.user.id),
   ]);
 
   const airtableIntegration: TIntegrationAirtable | undefined = integrations?.find(
@@ -34,6 +33,9 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   if (airtableIntegration?.config.key) {
     airtableArray = await getAirtableTables(params.environmentId);
   }
+
+  const locale = await findMatchingLocale();
+
   if (isReadOnly) {
     return redirect("./");
   }
@@ -50,7 +52,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           environmentId={environment.id}
           surveys={surveys}
           webAppUrl={WEBAPP_URL}
-          locale={locale ?? DEFAULT_LOCALE}
+          locale={locale}
         />
       </div>
     </PageContentWrapper>

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

@@ -3,14 +3,13 @@ import { TIntegrationGoogleSheets } from "@formbricks/types/integration/google-s
 import { GoogleSheetWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/GoogleSheetWrapper";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import {
-  DEFAULT_LOCALE,
   GOOGLE_SHEETS_CLIENT_ID,
   GOOGLE_SHEETS_CLIENT_SECRET,
   GOOGLE_SHEETS_REDIRECT_URL,
   WEBAPP_URL,
 } from "@/lib/constants";
 import { getIntegrations } from "@/lib/integration/service";
-import { getUserLocale } from "@/lib/user/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -22,17 +21,19 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!(GOOGLE_SHEETS_CLIENT_ID && GOOGLE_SHEETS_CLIENT_SECRET && GOOGLE_SHEETS_REDIRECT_URL);
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, integrations, locale] = await Promise.all([
+  const [surveys, integrations] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrations(params.environmentId),
-    getUserLocale(session.user.id),
   ]);
 
   const googleSheetIntegration: TIntegrationGoogleSheets | undefined = integrations?.find(
     (integration): integration is TIntegrationGoogleSheets => integration.type === "googleSheets"
   );
+
+  const locale = await findMatchingLocale();
+
   if (isReadOnly) {
     return redirect("./");
   }
@@ -48,7 +49,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           surveys={surveys}
           googleSheetIntegration={googleSheetIntegration}
           webAppUrl={WEBAPP_URL}
-          locale={locale ?? DEFAULT_LOCALE}
+          locale={locale}
         />
       </div>
     </PageContentWrapper>

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

@@ -3,7 +3,6 @@ import { TIntegrationNotion, TIntegrationNotionDatabase } from "@formbricks/type
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { NotionWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/notion/components/NotionWrapper";
 import {
-  DEFAULT_LOCALE,
   NOTION_AUTH_URL,
   NOTION_OAUTH_CLIENT_ID,
   NOTION_OAUTH_CLIENT_SECRET,
@@ -12,7 +11,7 @@ import {
 } from "@/lib/constants";
 import { getIntegrationByType } from "@/lib/integration/service";
 import { getNotionDatabases } from "@/lib/notion/service";
-import { getUserLocale } from "@/lib/user/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -29,18 +28,18 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     NOTION_REDIRECT_URI
   );
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, notionIntegration, locale] = await Promise.all([
+  const [surveys, notionIntegration] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrationByType(params.environmentId, "notion"),
-    getUserLocale(session.user.id),
   ]);
 
   let databasesArray: TIntegrationNotionDatabase[] = [];
   if (notionIntegration && (notionIntegration as TIntegrationNotion).config.key?.bot_id) {
     databasesArray = (await getNotionDatabases(environment.id)) ?? [];
   }
+  const locale = await findMatchingLocale();
 
   if (isReadOnly) {
     return redirect("./");
@@ -57,7 +56,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
         notionIntegration={notionIntegration as TIntegrationNotion}
         webAppUrl={WEBAPP_URL}
         databasesArray={databasesArray}
-        locale={locale ?? DEFAULT_LOCALE}
+        locale={locale}
       />
     </PageContentWrapper>
   );

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

@@ -2,9 +2,9 @@ import { redirect } from "next/navigation";
 import { TIntegrationSlack } from "@formbricks/types/integration/slack";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { SlackWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/slack/components/SlackWrapper";
-import { DEFAULT_LOCALE, SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, WEBAPP_URL } from "@/lib/constants";
+import { SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, WEBAPP_URL } from "@/lib/constants";
 import { getIntegrationByType } from "@/lib/integration/service";
-import { getUserLocale } from "@/lib/user/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -17,14 +17,15 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
 
   const t = await getTranslate();
 
-  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, slackIntegration, locale] = await Promise.all([
+  const [surveys, slackIntegration] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrationByType(params.environmentId, "slack"),
-    getUserLocale(session.user.id),
   ]);
 
+  const locale = await findMatchingLocale();
+
   if (isReadOnly) {
     return redirect("./");
   }
@@ -40,7 +41,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           surveys={surveys}
           slackIntegration={slackIntegration as TIntegrationSlack}
           webAppUrl={WEBAPP_URL}
-          locale={locale ?? DEFAULT_LOCALE}
+          locale={locale}
         />
       </div>
     </PageContentWrapper>

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

@@ -1,15 +1,7 @@
 import { getServerSession } from "next-auth";
 import { ChatwootWidget } from "@/app/chatwoot/ChatwootWidget";
-import { PostHogIdentify } from "@/app/posthog/PostHogIdentify";
-import {
-  CHATWOOT_BASE_URL,
-  CHATWOOT_WEBSITE_TOKEN,
-  IS_CHATWOOT_CONFIGURED,
-  POSTHOG_KEY,
-  SESSION_MAX_AGE,
-} from "@/lib/constants";
+import { CHATWOOT_BASE_URL, CHATWOOT_WEBSITE_TOKEN, IS_CHATWOOT_CONFIGURED } 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,11 +17,8 @@ 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} />
-      )}
       {IS_CHATWOOT_CONFIGURED && (
         <ChatwootWidget
           userEmail={user?.email}
@@ -41,7 +30,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
       )}
       <ToasterClient />
       {children}
-    </NextAuthProvider>
+    </>
   );
 };
 

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

@@ -50,7 +50,6 @@ vi.mock("@/lib/env", () => ({
     RECAPTCHA_SITE_KEY: "site-key",
     RECAPTCHA_SECRET_KEY: "secret-key",
     GITHUB_ID: "github-id",
-    SAML_DATABASE_URL: "postgresql://saml.example.com/formbricks",
   },
 }));
 
@@ -139,7 +138,6 @@ describe("sendTelemetryEvents", () => {
     expect(payload.userCount).toBe(5);
     expect(payload.integrations.notion).toBe(true);
     expect(payload.sso.github).toBe(true);
-    expect(payload.sso.saml).toBe(true);
 
     // Check cache update (no TTL parameter)
     expect(mockCacheService.set).toHaveBeenCalledWith("telemetry_last_sent_ts", expect.any(String));

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

@@ -212,7 +212,6 @@ const sendTelemetry = async (lastSent: number) => {
     google: !!env.GOOGLE_CLIENT_ID || ssoProviders.some((p) => p.provider === "google"),
     azureAd: !!env.AZUREAD_CLIENT_ID || ssoProviders.some((p) => p.provider === "azuread"),
     oidc: !!env.OIDC_CLIENT_ID || ssoProviders.some((p) => p.provider === "openid"),
-    saml: !!env.SAML_DATABASE_URL || ssoProviders.some((p) => p.provider === "saml"),
   };
 
   // Construct telemetry payload with usage statistics and configuration.

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/management/surveys/[surveyId]/route.ts

@@ -190,7 +190,7 @@ export const PUT = withV1ApiWrapper({
         };
       }
 
-      const featureCheckResult = await checkFeaturePermissions(surveyUpdate, organization, result.survey);
+      const featureCheckResult = await checkFeaturePermissions(surveyUpdate, organization);
       if (featureCheckResult) {
         return {
           response: featureCheckResult,

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

@@ -1,14 +1,12 @@
-import { afterEach, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { TOrganization } from "@formbricks/types/organizations";
 import {
-  TSurvey,
   TSurveyCreateInputWithEnvironmentId,
   TSurveyQuestionTypeEnum,
 } from "@formbricks/types/surveys/types";
 import { responses } from "@/app/lib/api/response";
 import { getIsSpamProtectionEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
-import { getExternalUrlsPermission } from "@/modules/survey/lib/permission";
 import { checkFeaturePermissions } from "./utils";
 
 // Mock dependencies
@@ -26,14 +24,6 @@ vi.mock("@/modules/survey/follow-ups/lib/utils", () => ({
   getSurveyFollowUpsPermission: vi.fn(),
 }));
 
-vi.mock("@/modules/survey/lib/permission", () => ({
-  getExternalUrlsPermission: vi.fn().mockResolvedValue(true),
-}));
-
-vi.mock("@/lib/survey/utils", () => ({
-  getElementsFromBlocks: vi.fn((blocks: any[]) => blocks.flatMap((block: any) => block.elements)),
-}));
-
 const mockOrganization: TOrganization = {
   id: "test-org",
   name: "Test Organization",
@@ -108,13 +98,6 @@ const baseSurveyData: TSurveyCreateInputWithEnvironmentId = {
 };
 
 describe("checkFeaturePermissions", () => {
-  vi.mocked(getExternalUrlsPermission).mockResolvedValue(true);
-
-  afterEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(true);
-  });
-
   test("should return null if no restricted features are used", async () => {
     const surveyData = { ...baseSurveyData };
     const result = await checkFeaturePermissions(surveyData, mockOrganization);
@@ -214,315 +197,4 @@ describe("checkFeaturePermissions", () => {
     );
     expect(responses.forbiddenResponse).toHaveBeenCalledTimes(1); // Ensure it stops at the first failure
   });
-
-  // External URLs - ending card button link tests
-  test("should return forbiddenResponse when adding new ending with buttonLink without permission", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://example.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    };
-    const result = await checkFeaturePermissions(surveyData, mockOrganization);
-    expect(result).toBeInstanceOf(Response);
-    expect(result?.status).toBe(403);
-    expect(responses.forbiddenResponse).toHaveBeenCalledWith(
-      "External URLs are not enabled for this organization. Upgrade to use external button links."
-    );
-  });
-
-  test("should return forbiddenResponse when changing ending buttonLink without permission", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://new-url.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    };
-    const oldSurvey = {
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://old-url.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    } as unknown as TSurvey;
-    const result = await checkFeaturePermissions(surveyData, mockOrganization, oldSurvey);
-    expect(result).toBeInstanceOf(Response);
-    expect(result?.status).toBe(403);
-  });
-
-  test("should allow keeping existing ending buttonLink without permission (grandfathering)", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://existing-url.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    };
-    const oldSurvey = {
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://existing-url.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    } as unknown as TSurvey;
-    const result = await checkFeaturePermissions(surveyData, mockOrganization, oldSurvey);
-    expect(result).toBeNull();
-  });
-
-  test("should allow ending buttonLink when permission is granted", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(true);
-    const surveyData = {
-      ...baseSurveyData,
-      endings: [
-        {
-          id: "ending1",
-          type: "endScreen" as const,
-          headline: { default: "Thanks" },
-          subheader: { default: "" },
-          buttonLink: "https://example.com",
-          buttonLabel: { default: "Click" },
-        },
-      ],
-    };
-    const result = await checkFeaturePermissions(surveyData, mockOrganization);
-    expect(result).toBeNull();
-  });
-
-  // External URLs - CTA external button tests
-  test("should return forbiddenResponse when adding CTA with external button without permission", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://example.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-    };
-    const result = await checkFeaturePermissions(surveyData, mockOrganization);
-    expect(result).toBeInstanceOf(Response);
-    expect(result?.status).toBe(403);
-    expect(responses.forbiddenResponse).toHaveBeenCalledWith(
-      "External URLs are not enabled for this organization. Upgrade to use external CTA buttons."
-    );
-  });
-
-  test("should return forbiddenResponse when changing CTA external button URL without permission", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://new-url.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-    };
-    const oldSurvey = {
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://old-url.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-      endings: [],
-    } as unknown as TSurvey;
-    const result = await checkFeaturePermissions(surveyData, mockOrganization, oldSurvey);
-    expect(result).toBeInstanceOf(Response);
-    expect(result?.status).toBe(403);
-  });
-
-  test("should allow keeping existing CTA external button without permission (grandfathering)", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://existing-url.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-    };
-    const oldSurvey = {
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://existing-url.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-      endings: [],
-    } as unknown as TSurvey;
-    const result = await checkFeaturePermissions(surveyData, mockOrganization, oldSurvey);
-    expect(result).toBeNull();
-  });
-
-  test("should allow CTA external button when permission is granted", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(true);
-    const surveyData = {
-      ...baseSurveyData,
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://example.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-    };
-    const result = await checkFeaturePermissions(surveyData, mockOrganization);
-    expect(result).toBeNull();
-  });
-
-  test("should return forbiddenResponse when switching CTA from internal to external without permission", async () => {
-    vi.mocked(getExternalUrlsPermission).mockResolvedValue(false);
-    const surveyData = {
-      ...baseSurveyData,
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: true,
-              buttonUrl: "https://example.com",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-    };
-    const oldSurvey = {
-      blocks: [
-        {
-          id: "block1",
-          name: "Block 1",
-          elements: [
-            {
-              id: "cta1",
-              type: TSurveyQuestionTypeEnum.CTA,
-              headline: { default: "CTA" },
-              required: false,
-              buttonExternal: false,
-              buttonUrl: "",
-              ctaButtonLabel: { default: "Click" },
-            },
-          ],
-          buttonLabel: { default: "Next" },
-        },
-      ],
-      endings: [],
-    } as unknown as TSurvey;
-    const result = await checkFeaturePermissions(surveyData, mockOrganization, oldSurvey);
-    expect(result).toBeInstanceOf(Response);
-    expect(result?.status).toBe(403);
-  });
 });

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

@@ -1,15 +1,12 @@
 import { TOrganization } from "@formbricks/types/organizations";
-import { TSurvey, TSurveyCreateInputWithEnvironmentId } from "@formbricks/types/surveys/types";
+import { TSurveyCreateInputWithEnvironmentId } from "@formbricks/types/surveys/types";
 import { responses } from "@/app/lib/api/response";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
 import { getIsSpamProtectionEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
-import { getExternalUrlsPermission } from "@/modules/survey/lib/permission";
 
 export const checkFeaturePermissions = async (
   surveyData: TSurveyCreateInputWithEnvironmentId,
-  organization: TOrganization,
-  oldSurvey?: TSurvey
+  organization: TOrganization
 ): Promise<Response | null> => {
   if (surveyData.recaptcha?.enabled) {
     const isSpamProtectionEnabled = await getIsSpamProtectionEnabled(organization.id);
@@ -25,46 +22,5 @@ export const checkFeaturePermissions = async (
     }
   }
 
-  const isExternalUrlsAllowed = await getExternalUrlsPermission(organization.id);
-  if (!isExternalUrlsAllowed) {
-    // Check ending cards for new/changed button links
-    if (surveyData.endings) {
-      for (const newEnding of surveyData.endings) {
-        const oldEnding = oldSurvey?.endings.find((e) => e.id === newEnding.id);
-
-        if (newEnding.type === "endScreen" && newEnding.buttonLink) {
-          if (!oldEnding || oldEnding.type !== "endScreen" || oldEnding.buttonLink !== newEnding.buttonLink) {
-            return responses.forbiddenResponse(
-              "External URLs are not enabled for this organization. Upgrade to use external button links."
-            );
-          }
-        }
-      }
-    }
-
-    // Check CTA elements for new/changed external button URLs
-    if (surveyData.blocks) {
-      const newElements = getElementsFromBlocks(surveyData.blocks);
-      const oldElements = oldSurvey?.blocks ? getElementsFromBlocks(oldSurvey.blocks) : [];
-
-      for (const newElement of newElements) {
-        const oldElement = oldElements.find((e) => e.id === newElement.id);
-
-        if (newElement.type === "cta" && newElement.buttonExternal) {
-          if (
-            !oldElement ||
-            oldElement.type !== "cta" ||
-            !oldElement.buttonExternal ||
-            oldElement.buttonUrl !== newElement.buttonUrl
-          ) {
-            return responses.forbiddenResponse(
-              "External URLs are not enabled for this organization. Upgrade to use external CTA buttons."
-            );
-          }
-        }
-      }
-    }
-  }
-
   return null;
 };

apps/web/app/api/v3/lib/api-wrapper.test.ts

@@ -1,324 +0,0 @@
-import { NextRequest } from "next/server";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { z } from "zod";
-import { TooManyRequestsError } from "@formbricks/types/errors";
-import { withV3ApiWrapper } from "./api-wrapper";
-
-const { mockAuthenticateRequest, mockGetServerSession } = vi.hoisted(() => ({
-  mockAuthenticateRequest: vi.fn(),
-  mockGetServerSession: vi.fn(),
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: mockGetServerSession,
-}));
-
-vi.mock("@/app/api/v1/auth", () => ({
-  authenticateRequest: mockAuthenticateRequest,
-}));
-
-vi.mock("@/modules/auth/lib/authOptions", () => ({
-  authOptions: {},
-}));
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyRateLimit: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: vi.fn(),
-      warn: vi.fn(),
-    })),
-  },
-}));
-
-describe("withV3ApiWrapper", () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-    mockGetServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(null);
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("uses session auth first in both mode and injects request id into plain responses", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1", name: "Test", email: "t@example.com" },
-      expires: "2026-01-01",
-    });
-
-    const handler = vi.fn(async ({ authentication, requestId, instance }) => {
-      expect(authentication).toMatchObject({ user: { id: "user_1" } });
-      expect(requestId).toBe("req-1");
-      expect(instance).toBe("/api/v3/surveys");
-      return Response.json({ ok: true });
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?limit=10", {
-        headers: { "x-request-id": "req-1" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(response.headers.get("X-Request-Id")).toBe("req-1");
-    expect(handler).toHaveBeenCalledOnce();
-    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
-      expect.objectContaining({ namespace: "api:v3" }),
-      "user_1"
-    );
-    expect(mockAuthenticateRequest).not.toHaveBeenCalled();
-  });
-
-  test("falls back to api key auth in both mode", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockAuthenticateRequest.mockResolvedValue({
-      type: "apiKey",
-      apiKeyId: "key_1",
-      organizationId: "org_1",
-      organizationAccess: { accessControl: { read: true, write: false } },
-      environmentPermissions: [],
-    });
-
-    const handler = vi.fn(async ({ authentication }) => {
-      expect(authentication).toMatchObject({ apiKeyId: "key_1" });
-      return Response.json({ ok: true });
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        headers: { "x-api-key": "fbk_test" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
-      expect.objectContaining({ namespace: "api:v3" }),
-      "key_1"
-    );
-    expect(mockGetServerSession).not.toHaveBeenCalled();
-  });
-
-  test("returns 401 problem response when authentication is required but missing", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
-
-    expect(response.status).toBe(401);
-    expect(handler).not.toHaveBeenCalled();
-    expect(response.headers.get("Content-Type")).toBe("application/problem+json");
-  });
-
-  test("returns 400 problem response for invalid query input", async () => {
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      schemas: {
-        query: z.object({
-          limit: z.coerce.number().int().positive(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?limit=oops", {
-        headers: { "x-request-id": "req-invalid" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual(expect.arrayContaining([expect.objectContaining({ name: "limit" })]));
-    expect(body.requestId).toBe("req-invalid");
-  });
-
-  test("parses body, repeated query params, and async route params", async () => {
-    const handler = vi.fn(async ({ parsedInput }) => {
-      expect(parsedInput).toEqual({
-        body: { name: "Survey API" },
-        query: { tag: ["a", "b"] },
-        params: { workspaceId: "ws_123" },
-      });
-
-      return Response.json(
-        { ok: true },
-        {
-          headers: {
-            "X-Request-Id": "handler-request-id",
-          },
-        }
-      );
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        body: z.object({
-          name: z.string(),
-        }),
-        query: z.object({
-          tag: z.array(z.string()),
-        }),
-        params: z.object({
-          workspaceId: z.string(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?tag=a&tag=b", {
-        method: "POST",
-        body: JSON.stringify({ name: "Survey API" }),
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }),
-      {
-        params: Promise.resolve({
-          workspaceId: "ws_123",
-        }),
-      } as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(response.headers.get("X-Request-Id")).toBe("handler-request-id");
-    expect(handler).toHaveBeenCalledOnce();
-  });
-
-  test("returns 400 problem response for malformed JSON input", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        body: z.object({
-          name: z.string(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        method: "POST",
-        body: "{",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual([
-      {
-        name: "body",
-        reason: "Malformed JSON input, please check your request body",
-      },
-    ]);
-  });
-
-  test("returns 400 problem response for invalid route params", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        params: z.object({
-          workspaceId: z.string().min(3),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {
-      params: Promise.resolve({
-        workspaceId: "x",
-      }),
-    } as never);
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual(
-      expect.arrayContaining([expect.objectContaining({ name: "workspaceId" })])
-    );
-  });
-
-  test("returns 429 problem response when rate limited", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-    vi.mocked(applyRateLimit).mockRejectedValueOnce(new TooManyRequestsError("Too many requests", 60));
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler: async () => Response.json({ ok: true }),
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
-
-    expect(response.status).toBe(429);
-    expect(response.headers.get("Retry-After")).toBe("60");
-    const body = await response.json();
-    expect(body.code).toBe("too_many_requests");
-  });
-
-  test("returns 500 problem response when the handler throws unexpectedly", async () => {
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler: async () => {
-        throw new Error("boom");
-      },
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        headers: { "x-request-id": "req-boom" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(500);
-    const body = await response.json();
-    expect(body.code).toBe("internal_server_error");
-    expect(body.requestId).toBe("req-boom");
-  });
-});

apps/web/app/api/v3/lib/api-wrapper.ts

@@ -1,349 +0,0 @@
-import { getServerSession } from "next-auth";
-import { type NextRequest } from "next/server";
-import { z } from "zod";
-import { logger } from "@formbricks/logger";
-import { TooManyRequestsError } from "@formbricks/types/errors";
-import { authenticateRequest } from "@/app/api/v1/auth";
-import { authOptions } from "@/modules/auth/lib/authOptions";
-import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
-import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
-import type { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
-import {
-  type InvalidParam,
-  problemBadRequest,
-  problemInternalError,
-  problemTooManyRequests,
-  problemUnauthorized,
-} from "./response";
-import type { TV3Authentication } from "./types";
-
-type TV3Schema = z.ZodTypeAny;
-type MaybePromise<T> = T | Promise<T>;
-
-export type TV3AuthMode = "none" | "session" | "apiKey" | "both";
-
-export type TV3Schemas = {
-  body?: TV3Schema;
-  query?: TV3Schema;
-  params?: TV3Schema;
-};
-
-export type TV3ParsedInput<S extends TV3Schemas | undefined> = S extends object
-  ? {
-      [K in keyof S as NonNullable<S[K]> extends TV3Schema ? K : never]: z.infer<NonNullable<S[K]>>;
-    }
-  : Record<string, never>;
-
-export type TV3HandlerParams<TParsedInput = Record<string, never>, TProps = unknown> = {
-  req: NextRequest;
-  props: TProps;
-  authentication: TV3Authentication;
-  parsedInput: TParsedInput;
-  requestId: string;
-  instance: string;
-};
-
-export type TWithV3ApiWrapperParams<S extends TV3Schemas | undefined, TProps = unknown> = {
-  auth?: TV3AuthMode;
-  schemas?: S;
-  rateLimit?: boolean;
-  customRateLimitConfig?: TRateLimitConfig;
-  handler: (params: TV3HandlerParams<TV3ParsedInput<S>, TProps>) => MaybePromise<Response>;
-};
-
-function getUnauthenticatedDetail(authMode: TV3AuthMode): string {
-  if (authMode === "session") {
-    return "Session required";
-  }
-
-  if (authMode === "apiKey") {
-    return "API key required";
-  }
-
-  return "Not authenticated";
-}
-
-function formatZodIssues(error: z.ZodError, fallbackName: "body" | "query" | "params"): InvalidParam[] {
-  return error.issues.map((issue) => ({
-    name: issue.path.length > 0 ? issue.path.join(".") : fallbackName,
-    reason: issue.message,
-  }));
-}
-
-function searchParamsToObject(searchParams: URLSearchParams): Record<string, string | string[]> {
-  const query: Record<string, string | string[]> = {};
-
-  for (const key of new Set(searchParams.keys())) {
-    const values = searchParams.getAll(key);
-    query[key] = values.length > 1 ? values : (values[0] ?? "");
-  }
-
-  return query;
-}
-
-function getRateLimitIdentifier(authentication: TV3Authentication): string | null {
-  if (!authentication) {
-    return null;
-  }
-
-  if ("user" in authentication && authentication.user?.id) {
-    return authentication.user.id;
-  }
-
-  if ("apiKeyId" in authentication) {
-    return authentication.apiKeyId;
-  }
-
-  return null;
-}
-
-function isPromiseLike<T>(value: unknown): value is Promise<T> {
-  return typeof value === "object" && value !== null && "then" in value;
-}
-
-async function getRouteParams<TProps>(props: TProps): Promise<Record<string, unknown>> {
-  if (!props || typeof props !== "object" || !("params" in props)) {
-    return {};
-  }
-
-  const params = (props as { params?: unknown }).params;
-  if (!params) {
-    return {};
-  }
-
-  const resolvedParams = isPromiseLike<Record<string, unknown>>(params) ? await params : params;
-  return typeof resolvedParams === "object" && resolvedParams !== null
-    ? (resolvedParams as Record<string, unknown>)
-    : {};
-}
-
-async function authenticateV3Request(req: NextRequest, authMode: TV3AuthMode): Promise<TV3Authentication> {
-  if (authMode === "none") {
-    return null;
-  }
-
-  if (authMode === "both" && req.headers.has("x-api-key")) {
-    const apiKeyAuth = await authenticateRequest(req);
-    if (apiKeyAuth) {
-      return apiKeyAuth;
-    }
-  }
-
-  if (authMode === "session" || authMode === "both") {
-    const session = await getServerSession(authOptions);
-    if (session?.user?.id) {
-      return session;
-    }
-
-    if (authMode === "session") {
-      return null;
-    }
-  }
-
-  if (authMode === "apiKey" || authMode === "both") {
-    return await authenticateRequest(req);
-  }
-
-  return null;
-}
-
-async function parseV3Input<S extends TV3Schemas | undefined, TProps>(
-  req: NextRequest,
-  props: TProps,
-  schemas: S | undefined,
-  requestId: string,
-  instance: string
-): Promise<
-  | { ok: true; parsedInput: TV3ParsedInput<S> }
-  | {
-      ok: false;
-      response: Response;
-    }
-> {
-  const parsedInput = {} as TV3ParsedInput<S>;
-
-  if (schemas?.body) {
-    let bodyData: unknown;
-
-    try {
-      bodyData = await req.json();
-    } catch {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid request body", {
-          instance,
-          invalid_params: [{ name: "body", reason: "Malformed JSON input, please check your request body" }],
-        }),
-      };
-    }
-
-    const bodyResult = schemas.body.safeParse(bodyData);
-    if (!bodyResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid request body", {
-          instance,
-          invalid_params: formatZodIssues(bodyResult.error, "body"),
-        }),
-      };
-    }
-
-    parsedInput.body = bodyResult.data as TV3ParsedInput<S>["body"];
-  }
-
-  if (schemas?.query) {
-    const queryResult = schemas.query.safeParse(searchParamsToObject(req.nextUrl.searchParams));
-    if (!queryResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid query parameters", {
-          instance,
-          invalid_params: formatZodIssues(queryResult.error, "query"),
-        }),
-      };
-    }
-
-    parsedInput.query = queryResult.data as TV3ParsedInput<S>["query"];
-  }
-
-  if (schemas?.params) {
-    const paramsResult = schemas.params.safeParse(await getRouteParams(props));
-    if (!paramsResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid route parameters", {
-          instance,
-          invalid_params: formatZodIssues(paramsResult.error, "params"),
-        }),
-      };
-    }
-
-    parsedInput.params = paramsResult.data as TV3ParsedInput<S>["params"];
-  }
-
-  return { ok: true, parsedInput };
-}
-
-function ensureRequestIdHeader(response: Response, requestId: string): Response {
-  if (response.headers.get("X-Request-Id")) {
-    return response;
-  }
-
-  const headers = new Headers(response.headers);
-  headers.set("X-Request-Id", requestId);
-
-  return new Response(response.body, {
-    status: response.status,
-    statusText: response.statusText,
-    headers,
-  });
-}
-
-async function authenticateV3RequestOrRespond(
-  req: NextRequest,
-  authMode: TV3AuthMode,
-  requestId: string,
-  instance: string
-): Promise<
-  { authentication: TV3Authentication; response: null } | { authentication: null; response: Response }
-> {
-  const authentication = await authenticateV3Request(req, authMode);
-
-  if (!authentication && authMode !== "none") {
-    return {
-      authentication: null,
-      response: problemUnauthorized(requestId, getUnauthenticatedDetail(authMode), instance),
-    };
-  }
-
-  return {
-    authentication,
-    response: null,
-  };
-}
-
-async function applyV3RateLimitOrRespond(params: {
-  authentication: TV3Authentication;
-  enabled: boolean;
-  config: TRateLimitConfig;
-  requestId: string;
-  log: ReturnType<typeof logger.withContext>;
-}): Promise<Response | null> {
-  const { authentication, enabled, config, requestId, log } = params;
-  if (!enabled) {
-    return null;
-  }
-
-  const identifier = getRateLimitIdentifier(authentication);
-  if (!identifier) {
-    return null;
-  }
-
-  try {
-    await applyRateLimit(config, identifier);
-  } catch (error) {
-    log.warn({ error, statusCode: 429 }, "V3 API rate limit exceeded");
-    return problemTooManyRequests(
-      requestId,
-      error instanceof Error ? error.message : "Rate limit exceeded",
-      error instanceof TooManyRequestsError ? error.retryAfter : undefined
-    );
-  }
-
-  return null;
-}
-
-export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unknown>(
-  params: TWithV3ApiWrapperParams<S, TProps>
-): ((req: NextRequest, props: TProps) => Promise<Response>) => {
-  const { auth = "both", schemas, rateLimit = true, customRateLimitConfig, handler } = params;
-
-  return async (req: NextRequest, props: TProps): Promise<Response> => {
-    const requestId = req.headers.get("x-request-id") ?? crypto.randomUUID();
-    const instance = req.nextUrl.pathname;
-    const log = logger.withContext({
-      requestId,
-      method: req.method,
-      path: instance,
-    });
-
-    try {
-      const authResult = await authenticateV3RequestOrRespond(req, auth, requestId, instance);
-      if (authResult.response) {
-        log.warn({ statusCode: authResult.response.status }, "V3 API authentication failed");
-        return authResult.response;
-      }
-
-      const parsedInputResult = await parseV3Input(req, props, schemas, requestId, instance);
-      if (!parsedInputResult.ok) {
-        log.warn({ statusCode: parsedInputResult.response.status }, "V3 API request validation failed");
-        return parsedInputResult.response;
-      }
-
-      const rateLimitResponse = await applyV3RateLimitOrRespond({
-        authentication: authResult.authentication,
-        enabled: rateLimit,
-        config: customRateLimitConfig ?? rateLimitConfigs.api.v3,
-        requestId,
-        log,
-      });
-      if (rateLimitResponse) {
-        return rateLimitResponse;
-      }
-
-      const response = await handler({
-        req,
-        props,
-        authentication: authResult.authentication,
-        parsedInput: parsedInputResult.parsedInput,
-        requestId,
-        instance,
-      });
-
-      return ensureRequestIdHeader(response, requestId);
-    } catch (error) {
-      log.error({ error, statusCode: 500 }, "V3 API unexpected error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
-    }
-  };
-};

apps/web/app/api/v3/lib/auth.test.ts

@@ -1,274 +0,0 @@
-import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-import { requireSessionWorkspaceAccess, requireV3WorkspaceAccess } from "./auth";
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      warn: vi.fn(),
-      error: vi.fn(),
-    })),
-  },
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromProjectId: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/services", () => ({
-  getEnvironment: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/action-client/action-client-middleware", () => ({
-  checkAuthorizationUpdated: vi.fn(),
-}));
-
-const requestId = "req-123";
-
-describe("requireSessionWorkspaceAccess", () => {
-  test("returns 401 when authentication is null", async () => {
-    const result = await requireSessionWorkspaceAccess(null, "proj_abc", "read", requestId);
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(401);
-    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.status).toBe(401);
-    expect(body.code).toBe("not_authenticated");
-    expect(getEnvironment).not.toHaveBeenCalled();
-    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
-  });
-
-  test("returns 401 when authentication is API key (no user)", async () => {
-    const result = await requireSessionWorkspaceAccess(
-      { apiKeyId: "key_1", organizationId: "org_1", environmentPermissions: [] } as any,
-      "proj_abc",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(401);
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("not_authenticated");
-    expect(getEnvironment).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when workspace (environment) is not found (avoid leaking existence)", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_nonexistent",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(403);
-    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("forbidden");
-    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
-    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when user has no access to workspace", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_abc",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
-    vi.mocked(checkAuthorizationUpdated).mockRejectedValueOnce(new AuthorizationError("Not authorized"));
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_abc",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(403);
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("forbidden");
-    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
-      userId: "user_1",
-      organizationId: "org_1",
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: "proj_abc", minPermission: "read" },
-      ],
-    });
-  });
-
-  test("returns workspace context when session is valid and user has access", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_abc",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
-    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_abc",
-      "readWrite",
-      requestId
-    );
-    expect(result).not.toBeInstanceOf(Response);
-    expect(result).toEqual({
-      environmentId: "env_abc",
-      projectId: "proj_abc",
-      organizationId: "org_1",
-    });
-    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
-      userId: "user_1",
-      organizationId: "org_1",
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: "proj_abc", minPermission: "readWrite" },
-      ],
-    });
-  });
-});
-
-const keyBase = {
-  type: "apiKey" as const,
-  apiKeyId: "key_1",
-  organizationId: "org_k",
-  organizationAccess: { accessControl: { read: true, write: false } },
-};
-
-function envPerm(environmentId: string, permission: ApiKeyPermission = ApiKeyPermission.read) {
-  return {
-    environmentId,
-    environmentType: EnvironmentType.development,
-    projectId: "proj_k",
-    projectName: "K",
-    permission,
-  };
-}
-
-describe("requireV3WorkspaceAccess", () => {
-  beforeEach(() => {
-    vi.mocked(getEnvironment).mockResolvedValue({
-      id: "env_k",
-      projectId: "proj_k",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValue("org_k");
-  });
-
-  test("401 when authentication is null", async () => {
-    const r = await requireV3WorkspaceAccess(null, "env_x", "read", requestId);
-    expect((r as Response).status).toBe(401);
-  });
-
-  test("delegates to session flow when user is present", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_s",
-      projectId: "proj_s",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_s");
-    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
-    const r = await requireV3WorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_s",
-      "read",
-      requestId
-    );
-    expect(r).toEqual({
-      environmentId: "env_s",
-      projectId: "proj_s",
-      organizationId: "org_s",
-    });
-  });
-
-  test("returns context for API key with read on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_a", ApiKeyPermission.read)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_a", "read", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_a",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-    expect(getEnvironment).toHaveBeenCalledWith("ws_a");
-  });
-
-  test("returns context for API key with write on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_b", ApiKeyPermission.write)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_b", "read", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_b",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-  });
-
-  test("returns 403 when API key permission is lower than the required permission", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_write", ApiKeyPermission.read)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_write", "readWrite", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("403 when API key has no matching environment", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("other_env")],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "wanted", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("403 when API key permission is not list-eligible (runtime value)", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [
-        {
-          ...envPerm("ws_c"),
-          permission: "invalid" as unknown as ApiKeyPermission,
-        },
-      ],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_c", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("returns context for API key with manage on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_m", ApiKeyPermission.manage)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_m", "manage", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_m",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-  });
-
-  test("returns 403 when the workspace cannot be resolved for an API key", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_missing", ApiKeyPermission.manage)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_missing", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("401 when auth is neither session nor valid API key payload", async () => {
-    const r = await requireV3WorkspaceAccess({ user: {} } as any, "env", "read", requestId);
-    expect((r as Response).status).toBe(401);
-  });
-});

apps/web/app/api/v3/lib/auth.ts

@@ -1,122 +0,0 @@
-/**
- * V3 API auth — session (browser) or API key with environment-scoped access.
- */
-import { ApiKeyPermission } from "@prisma/client";
-import { logger } from "@formbricks/logger";
-import type { TAuthenticationApiKey } from "@formbricks/types/auth";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import type { TTeamPermission } from "@/modules/ee/teams/project-teams/types/team";
-import { problemForbidden, problemUnauthorized } from "./response";
-import type { TV3Authentication } from "./types";
-import { type V3WorkspaceContext, resolveV3WorkspaceContext } from "./workspace-context";
-
-function apiKeyPermissionAllows(permission: ApiKeyPermission, minPermission: TTeamPermission): boolean {
-  const grantedRank = {
-    [ApiKeyPermission.read]: 1,
-    [ApiKeyPermission.write]: 2,
-    [ApiKeyPermission.manage]: 3,
-  }[permission];
-
-  const requiredRank = {
-    read: 1,
-    readWrite: 2,
-    manage: 3,
-  }[minPermission];
-
-  return grantedRank >= requiredRank;
-}
-
-/**
- * Require session and workspace access. workspaceId is resolved via the V3 workspace-context layer.
- * Returns a Response (401 or 403) on failure, or the resolved workspace context on success so callers
- * use internal IDs (environmentId, projectId, organizationId) without resolving again.
- * We use 403 (not 404) when the workspace is not found to avoid leaking resource existence.
- */
-export async function requireSessionWorkspaceAccess(
-  authentication: TV3Authentication,
-  workspaceId: string,
-  minPermission: TTeamPermission,
-  requestId: string,
-  instance?: string
-): Promise<Response | V3WorkspaceContext> {
-  // --- Session checks ---
-  if (!authentication) {
-    return problemUnauthorized(requestId, "Not authenticated", instance);
-  }
-  if (!("user" in authentication) || !authentication.user?.id) {
-    return problemUnauthorized(requestId, "Session required", instance);
-  }
-
-  const userId = authentication.user.id;
-  const log = logger.withContext({ requestId, workspaceId });
-
-  try {
-    // Resolve workspaceId → environmentId, projectId, organizationId (single place to change when Workspace exists).
-    const context = await resolveV3WorkspaceContext(workspaceId);
-
-    // Org + project-team access; we use internal IDs from context.
-    await checkAuthorizationUpdated({
-      userId,
-      organizationId: context.organizationId,
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: context.projectId, minPermission },
-      ],
-    });
-
-    return context;
-  } catch (err) {
-    if (err instanceof ResourceNotFoundError || err instanceof AuthorizationError) {
-      const message = err instanceof ResourceNotFoundError ? "Workspace not found" : "Forbidden";
-      log.warn({ statusCode: 403, errorCode: err.name }, message);
-      return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-    }
-    throw err;
-  }
-}
-
-/** Session or API key: authorize `workspaceId` against the resolved V3 workspace context. */
-export async function requireV3WorkspaceAccess(
-  authentication: TV3Authentication,
-  workspaceId: string,
-  minPermission: TTeamPermission,
-  requestId: string,
-  instance?: string
-): Promise<Response | V3WorkspaceContext> {
-  if (!authentication) {
-    return problemUnauthorized(requestId, "Not authenticated", instance);
-  }
-
-  if ("user" in authentication && authentication.user?.id) {
-    return requireSessionWorkspaceAccess(authentication, workspaceId, minPermission, requestId, instance);
-  }
-
-  const keyAuth = authentication as TAuthenticationApiKey;
-  if (keyAuth.apiKeyId && Array.isArray(keyAuth.environmentPermissions)) {
-    const log = logger.withContext({ requestId, workspaceId, apiKeyId: keyAuth.apiKeyId });
-
-    try {
-      const context = await resolveV3WorkspaceContext(workspaceId);
-      const permission = keyAuth.environmentPermissions.find(
-        (environmentPermission) => environmentPermission.environmentId === context.environmentId
-      );
-
-      if (!permission || !apiKeyPermissionAllows(permission.permission, minPermission)) {
-        log.warn({ statusCode: 403 }, "API key not allowed for workspace");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-
-      return context;
-    } catch (error) {
-      if (error instanceof ResourceNotFoundError) {
-        log.warn({ statusCode: 403, errorCode: error.name }, "Workspace not found");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-
-      throw error;
-    }
-  }
-
-  return problemUnauthorized(requestId, "Not authenticated", instance);
-}

apps/web/app/api/v3/lib/response.test.ts

@@ -1,95 +0,0 @@
-import { describe, expect, test } from "vitest";
-import {
-  problemBadRequest,
-  problemForbidden,
-  problemInternalError,
-  problemNotFound,
-  problemTooManyRequests,
-  problemUnauthorized,
-  successListResponse,
-} from "./response";
-
-describe("v3 problem responses", () => {
-  test("problemBadRequest includes invalid_params", async () => {
-    const res = problemBadRequest("rid", "bad", {
-      invalid_params: [{ name: "x", reason: "y" }],
-      instance: "/p",
-    });
-    expect(res.status).toBe(400);
-    expect(res.headers.get("X-Request-Id")).toBe("rid");
-    const body = await res.json();
-    expect(body.code).toBe("bad_request");
-    expect(body.requestId).toBe("rid");
-    expect(body.invalid_params).toEqual([{ name: "x", reason: "y" }]);
-    expect(body.instance).toBe("/p");
-  });
-
-  test("problemUnauthorized default detail", async () => {
-    const res = problemUnauthorized("r1");
-    expect(res.status).toBe(401);
-    const body = await res.json();
-    expect(body.detail).toBe("Not authenticated");
-    expect(body.code).toBe("not_authenticated");
-  });
-
-  test("problemForbidden", async () => {
-    const res = problemForbidden("r2", undefined, "/api/x");
-    expect(res.status).toBe(403);
-    const body = await res.json();
-    expect(body.code).toBe("forbidden");
-    expect(body.instance).toBe("/api/x");
-  });
-
-  test("problemInternalError", async () => {
-    const res = problemInternalError("r3", "oops", "/i");
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-    expect(body.detail).toBe("oops");
-  });
-
-  test("problemNotFound includes details", async () => {
-    const res = problemNotFound("r4", "Survey", "s1", "/s");
-    expect(res.status).toBe(404);
-    const body = await res.json();
-    expect(body.code).toBe("not_found");
-    expect(body.details).toEqual({ resource_type: "Survey", resource_id: "s1" });
-  });
-
-  test("problemTooManyRequests with Retry-After", async () => {
-    const res = problemTooManyRequests("r5", "slow down", 60);
-    expect(res.status).toBe(429);
-    expect(res.headers.get("Retry-After")).toBe("60");
-    const body = await res.json();
-    expect(body.code).toBe("too_many_requests");
-  });
-
-  test("problemTooManyRequests without Retry-After", async () => {
-    const res = problemTooManyRequests("r6", "nope");
-    expect(res.headers.get("Retry-After")).toBeNull();
-  });
-});
-
-describe("successListResponse", () => {
-  test("sets X-Request-Id and default cache", async () => {
-    const res = successListResponse(
-      [{ a: 1 }],
-      { limit: 10, nextCursor: "cursor-1" },
-      {
-        requestId: "req-x",
-      }
-    );
-    expect(res.status).toBe(200);
-    expect(res.headers.get("X-Request-Id")).toBe("req-x");
-    expect(res.headers.get("Cache-Control")).toContain("no-store");
-    expect(await res.json()).toEqual({
-      data: [{ a: 1 }],
-      meta: { limit: 10, nextCursor: "cursor-1" },
-    });
-  });
-
-  test("custom Cache-Control", async () => {
-    const res = successListResponse([], { limit: 5, nextCursor: null }, { cache: "private, max-age=0" });
-    expect(res.headers.get("Cache-Control")).toBe("private, max-age=0");
-  });
-});

apps/web/app/api/v3/lib/response.ts

@@ -1,149 +0,0 @@
-/**
- * V3 API response helpers — RFC 9457 Problem Details (application/problem+json)
- * and list envelope for success responses.
- */
-
-const PROBLEM_JSON = "application/problem+json" as const;
-const CACHE_NO_STORE = "private, no-store" as const;
-
-export type InvalidParam = { name: string; reason: string };
-
-export type ProblemExtension = {
-  code?: string;
-  requestId: string;
-  details?: Record<string, unknown>;
-  invalid_params?: InvalidParam[];
-};
-
-export type ProblemBody = {
-  type?: string;
-  title: string;
-  status: number;
-  detail: string;
-  instance?: string;
-} & ProblemExtension;
-
-function problemResponse(
-  status: number,
-  title: string,
-  detail: string,
-  requestId: string,
-  options?: {
-    type?: string;
-    instance?: string;
-    code?: string;
-    details?: Record<string, unknown>;
-    invalid_params?: InvalidParam[];
-    headers?: Record<string, string>;
-  }
-): Response {
-  const body: ProblemBody = {
-    title,
-    status,
-    detail,
-    requestId,
-    ...(options?.type && { type: options.type }),
-    ...(options?.instance && { instance: options.instance }),
-    ...(options?.code && { code: options.code }),
-    ...(options?.details && { details: options.details }),
-    ...(options?.invalid_params && { invalid_params: options.invalid_params }),
-  };
-
-  const headers: Record<string, string> = {
-    "Content-Type": PROBLEM_JSON,
-    "Cache-Control": CACHE_NO_STORE,
-    "X-Request-Id": requestId,
-    ...options?.headers,
-  };
-
-  return Response.json(body, { status, headers });
-}
-
-export function problemBadRequest(
-  requestId: string,
-  detail: string,
-  options?: { invalid_params?: InvalidParam[]; instance?: string }
-): Response {
-  return problemResponse(400, "Bad Request", detail, requestId, {
-    code: "bad_request",
-    instance: options?.instance,
-    invalid_params: options?.invalid_params,
-  });
-}
-
-export function problemUnauthorized(
-  requestId: string,
-  detail: string = "Not authenticated",
-  instance?: string
-): Response {
-  return problemResponse(401, "Unauthorized", detail, requestId, {
-    code: "not_authenticated",
-    instance,
-  });
-}
-
-export function problemForbidden(
-  requestId: string,
-  detail: string = "You are not authorized to access this resource",
-  instance?: string
-): Response {
-  return problemResponse(403, "Forbidden", detail, requestId, {
-    code: "forbidden",
-    instance,
-  });
-}
-
-/**
- * 404 with resource details. Do not use for auth-sensitive or existence-sensitive resources:
- * the body includes resource_type and resource_id, which can leak existence to unauthenticated or unauthorized callers.
- * Prefer problemForbidden with a generic message for those cases.
- */
-export function problemNotFound(
-  requestId: string,
-  resourceType: string,
-  resourceId: string | null,
-  instance?: string
-): Response {
-  return problemResponse(404, "Not Found", `${resourceType} not found`, requestId, {
-    code: "not_found",
-    details: { resource_type: resourceType, resource_id: resourceId },
-    instance,
-  });
-}
-
-export function problemInternalError(
-  requestId: string,
-  detail: string = "An unexpected error occurred.",
-  instance?: string
-): Response {
-  return problemResponse(500, "Internal Server Error", detail, requestId, {
-    code: "internal_server_error",
-    instance,
-  });
-}
-
-export function problemTooManyRequests(requestId: string, detail: string, retryAfter?: number): Response {
-  const headers: Record<string, string> = {};
-  if (retryAfter !== undefined) {
-    headers["Retry-After"] = String(retryAfter);
-  }
-  return problemResponse(429, "Too Many Requests", detail, requestId, {
-    code: "too_many_requests",
-    headers,
-  });
-}
-
-export function successListResponse<T, TMeta extends Record<string, unknown>>(
-  data: T[],
-  meta: TMeta,
-  options?: { requestId?: string; cache?: string }
-): Response {
-  const headers: Record<string, string> = {
-    "Content-Type": "application/json",
-    "Cache-Control": options?.cache ?? CACHE_NO_STORE,
-  };
-  if (options?.requestId) {
-    headers["X-Request-Id"] = options.requestId;
-  }
-  return Response.json({ data, meta }, { status: 200, headers });
-}

apps/web/app/api/v3/lib/types.ts

@@ -1,4 +0,0 @@
-import type { Session } from "next-auth";
-import type { TAuthenticationApiKey } from "@formbricks/types/auth";
-
-export type TV3Authentication = TAuthenticationApiKey | Session | null;

apps/web/app/api/v3/lib/workspace-context.test.ts

@@ -1,38 +0,0 @@
-import { describe, expect, test, vi } from "vitest";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-import { resolveV3WorkspaceContext } from "./workspace-context";
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromProjectId: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/services", () => ({
-  getEnvironment: vi.fn(),
-}));
-
-describe("resolveV3WorkspaceContext", () => {
-  test("returns environmentId, projectId and organizationId when workspace exists (today: workspaceId === environmentId)", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_xyz",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_123");
-    const result = await resolveV3WorkspaceContext("env_abc");
-    expect(result).toEqual({
-      environmentId: "env_abc",
-      projectId: "proj_xyz",
-      organizationId: "org_123",
-    });
-    expect(getEnvironment).toHaveBeenCalledWith("env_abc");
-    expect(getOrganizationIdFromProjectId).toHaveBeenCalledWith("proj_xyz");
-  });
-
-  test("throws when workspace (environment) does not exist", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    await expect(resolveV3WorkspaceContext("env_nonexistent")).rejects.toThrow(ResourceNotFoundError);
-    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
-    expect(getOrganizationIdFromProjectId).not.toHaveBeenCalled();
-  });
-});

apps/web/app/api/v3/lib/workspace-context.ts

@@ -1,50 +0,0 @@
-/**
- * V3 API workspace → internal IDs translation layer (retro-compatibility / future-proofing).
- *
- * Workspace is the default container for surveys. We are deprecating Environment and making
- * Workspace that container. In the API, workspaceId refers to that container.
- *
- * Today: workspaceId is mapped to environmentId (Environment is the current container for surveys).
- * When Environment is deprecated and Workspace exists: resolve workspaceId to the Workspace entity
- * (and derive environmentId or equivalent from it). Change only this file.
- */
-import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-
-/**
- * Internal IDs derived from a V3 workspace identifier.
- * Today: environmentId is the workspace (Environment = container for surveys until Workspace exists).
- */
-export type V3WorkspaceContext = {
-  /** Environment ID — the container for surveys today. Replaced by workspace when Environment is deprecated. */
-  environmentId: string;
-  /** Project ID used for projectTeam auth. */
-  projectId: string;
-  /** Organization ID used for org-level auth. */
-  organizationId: string;
-};
-
-/**
- * Resolves a V3 API workspaceId to internal environmentId, projectId, and organizationId.
- * Today: workspaceId is treated as environmentId (workspace = container for surveys = Environment).
- *
- * @throws ResourceNotFoundError if the workspace (environment) does not exist.
- */
-export async function resolveV3WorkspaceContext(workspaceId: string): Promise<V3WorkspaceContext> {
-  // Today: workspaceId is the environment id (survey container). Look it up.
-  const environment = await getEnvironment(workspaceId);
-  if (!environment) {
-    throw new ResourceNotFoundError("environment", workspaceId);
-  }
-
-  // Derive org for auth; project comes from the environment.
-  const organizationId = await getOrganizationIdFromProjectId(environment.projectId);
-
-  // We looked up by workspaceId (as environment id), so the resolved environment id is workspaceId.
-  return {
-    environmentId: workspaceId,
-    projectId: environment.projectId,
-    organizationId,
-  };
-}

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts

@@ -1,122 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { collectMultiValueQueryParam, parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
-
-const wid = "clxx1234567890123456789012";
-
-function params(qs: string): URLSearchParams {
-  return new URLSearchParams(qs);
-}
-
-describe("collectMultiValueQueryParam", () => {
-  test("merges repeated keys and comma-separated values", () => {
-    const sp = params("status=draft&status=inProgress&type=link,app");
-    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft", "inProgress"]);
-    expect(collectMultiValueQueryParam(sp, "type")).toEqual(["link", "app"]);
-  });
-
-  test("dedupes", () => {
-    const sp = params("status=draft&status=draft");
-    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft"]);
-  });
-});
-
-describe("parseV3SurveysListQuery", () => {
-  test("rejects unsupported query parameters like filterCriteria", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filterCriteria={}`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) expect(r.invalid_params[0].name).toBe("filterCriteria");
-  });
-
-  test("rejects unknown query parameters", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&foo=bar`));
-    expect(r.ok).toBe(false);
-    if (!r.ok)
-      expect(r.invalid_params[0]).toEqual({
-        name: "foo",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-  });
-
-  test("rejects the legacy after query parameter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&after=legacy-cursor`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "after",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("rejects the legacy flat name query parameter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&name=Foo`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "name",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("parses minimal query", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}`));
-    expect(r.ok).toBe(true);
-    if (r.ok) {
-      expect(r.limit).toBe(20);
-      expect(r.cursor).toBeNull();
-      expect(r.sortBy).toBe("updatedAt");
-      expect(r.filterCriteria).toBeUndefined();
-    }
-  });
-
-  test("builds filter from explicit operator params", () => {
-    const r = parseV3SurveysListQuery(
-      params(
-        `workspaceId=${wid}&filter[name][contains]=Foo&filter[status][in]=inProgress&filter[status][in]=draft&filter[type][in]=link&sortBy=updatedAt`
-      )
-    );
-    expect(r.ok).toBe(true);
-    if (r.ok) {
-      expect(r.filterCriteria).toEqual({
-        name: "Foo",
-        status: ["inProgress", "draft"],
-        type: ["link"],
-      });
-      expect(r.sortBy).toBe("updatedAt");
-    }
-  });
-
-  test("invalid status", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[status][in]=notastatus`));
-    expect(r.ok).toBe(false);
-  });
-
-  test("rejects the createdBy filter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[createdBy][in]=you`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "filter[createdBy][in]",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("rejects an invalid cursor", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&cursor=not-a-real-cursor`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params).toEqual([
-        {
-          name: "cursor",
-          reason: "The cursor is invalid.",
-        },
-      ]);
-    }
-  });
-});

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts

@@ -1,159 +0,0 @@
-/**
- * Validates GET /api/v3/surveys query string and builds {@link TSurveyFilterCriteria} for list/count.
- * Keeps HTTP parsing separate from the route handler and shared survey list service.
- */
-import { z } from "zod";
-import { ZId } from "@formbricks/types/common";
-import {
-  type TSurveyFilterCriteria,
-  ZSurveyFilters,
-  ZSurveyStatus,
-  ZSurveyType,
-} from "@formbricks/types/surveys/types";
-import {
-  type TSurveyListPageCursor,
-  type TSurveyListSort,
-  decodeSurveyListPageCursor,
-  normalizeSurveyListSort,
-} from "@/modules/survey/list/lib/survey-page";
-
-const V3_SURVEYS_DEFAULT_LIMIT = 20;
-const V3_SURVEYS_MAX_LIMIT = 100;
-
-const FILTER_NAME_CONTAINS_QUERY_PARAM = "filter[name][contains]" as const;
-const FILTER_STATUS_IN_QUERY_PARAM = "filter[status][in]" as const;
-const FILTER_TYPE_IN_QUERY_PARAM = "filter[type][in]" as const;
-
-const SUPPORTED_QUERY_PARAMS = [
-  "workspaceId",
-  "limit",
-  "cursor",
-  FILTER_NAME_CONTAINS_QUERY_PARAM,
-  FILTER_STATUS_IN_QUERY_PARAM,
-  FILTER_TYPE_IN_QUERY_PARAM,
-  "sortBy",
-] as const;
-const SUPPORTED_QUERY_PARAM_SET = new Set<string>(SUPPORTED_QUERY_PARAMS);
-
-type InvalidParam = { name: string; reason: string };
-
-/** Collect repeated query keys and comma-separated values for operator-style filters. */
-export function collectMultiValueQueryParam(searchParams: URLSearchParams, key: string): string[] {
-  const acc: string[] = [];
-  for (const raw of searchParams.getAll(key)) {
-    for (const part of raw.split(",")) {
-      const t = part.trim();
-      if (t) acc.push(t);
-    }
-  }
-  return [...new Set(acc)];
-}
-
-const ZV3SurveysListQuery = z.object({
-  workspaceId: ZId,
-  limit: z.coerce.number().int().min(1).max(V3_SURVEYS_MAX_LIMIT).default(V3_SURVEYS_DEFAULT_LIMIT),
-  cursor: z.string().min(1).optional(),
-  [FILTER_NAME_CONTAINS_QUERY_PARAM]: z
-    .string()
-    .max(512)
-    .optional()
-    .transform((s) => (s === undefined || s.trim() === "" ? undefined : s.trim())),
-  [FILTER_STATUS_IN_QUERY_PARAM]: z.array(ZSurveyStatus).optional(),
-  [FILTER_TYPE_IN_QUERY_PARAM]: z.array(ZSurveyType).optional(),
-  sortBy: ZSurveyFilters.shape.sortBy.optional(),
-});
-
-export type TV3SurveysListQuery = z.infer<typeof ZV3SurveysListQuery>;
-
-export type TV3SurveysListQueryParseResult =
-  | {
-      ok: true;
-      workspaceId: string;
-      limit: number;
-      cursor: TSurveyListPageCursor | null;
-      sortBy: TSurveyListSort;
-      filterCriteria: TSurveyFilterCriteria | undefined;
-    }
-  | { ok: false; invalid_params: InvalidParam[] };
-
-function getUnsupportedQueryParams(searchParams: URLSearchParams): InvalidParam[] {
-  const unsupportedParams = [
-    ...new Set(Array.from(searchParams.keys()).filter((key) => !SUPPORTED_QUERY_PARAM_SET.has(key))),
-  ];
-
-  return unsupportedParams.map((name) => ({
-    name,
-    reason: `Unsupported query parameter. Use only ${SUPPORTED_QUERY_PARAMS.join(", ")}.`,
-  }));
-}
-
-function buildFilterCriteria(q: TV3SurveysListQuery): TSurveyFilterCriteria | undefined {
-  const f: TSurveyFilterCriteria = {};
-  if (q[FILTER_NAME_CONTAINS_QUERY_PARAM]) f.name = q[FILTER_NAME_CONTAINS_QUERY_PARAM];
-  if (q[FILTER_STATUS_IN_QUERY_PARAM]?.length) f.status = q[FILTER_STATUS_IN_QUERY_PARAM];
-  if (q[FILTER_TYPE_IN_QUERY_PARAM]?.length) f.type = q[FILTER_TYPE_IN_QUERY_PARAM];
-  return Object.keys(f).length > 0 ? f : undefined;
-}
-
-export function parseV3SurveysListQuery(searchParams: URLSearchParams): TV3SurveysListQueryParseResult {
-  const unsupportedQueryParams = getUnsupportedQueryParams(searchParams);
-  if (unsupportedQueryParams.length > 0) {
-    return {
-      ok: false,
-      invalid_params: unsupportedQueryParams,
-    };
-  }
-
-  const statusVals = collectMultiValueQueryParam(searchParams, FILTER_STATUS_IN_QUERY_PARAM);
-  const typeVals = collectMultiValueQueryParam(searchParams, FILTER_TYPE_IN_QUERY_PARAM);
-
-  const raw = {
-    workspaceId: searchParams.get("workspaceId"),
-    limit: searchParams.get("limit") ?? undefined,
-    cursor: searchParams.get("cursor")?.trim() || undefined,
-    [FILTER_NAME_CONTAINS_QUERY_PARAM]: searchParams.get(FILTER_NAME_CONTAINS_QUERY_PARAM) ?? undefined,
-    [FILTER_STATUS_IN_QUERY_PARAM]: statusVals.length > 0 ? statusVals : undefined,
-    [FILTER_TYPE_IN_QUERY_PARAM]: typeVals.length > 0 ? typeVals : undefined,
-    sortBy: searchParams.get("sortBy")?.trim() || undefined,
-  };
-
-  const result = ZV3SurveysListQuery.safeParse(raw);
-  if (!result.success) {
-    return {
-      ok: false,
-      invalid_params: result.error.issues.map((issue) => ({
-        name: issue.path.join(".") || "query",
-        reason: issue.message,
-      })),
-    };
-  }
-
-  const q = result.data;
-  const sortBy = normalizeSurveyListSort(q.sortBy);
-  let cursor: TSurveyListPageCursor | null = null;
-
-  if (q.cursor) {
-    try {
-      cursor = decodeSurveyListPageCursor(q.cursor, sortBy);
-    } catch (error) {
-      return {
-        ok: false,
-        invalid_params: [
-          {
-            name: "cursor",
-            reason: error instanceof Error ? error.message : "The cursor is invalid.",
-          },
-        ],
-      };
-    }
-  }
-
-  return {
-    ok: true,
-    workspaceId: q.workspaceId,
-    limit: q.limit,
-    cursor,
-    sortBy,
-    filterCriteria: buildFilterCriteria(q),
-  };
-}

apps/web/app/api/v3/surveys/route.test.ts

@@ -1,357 +0,0 @@
-import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
-import { NextRequest } from "next/server";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
-import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
-import { GET } from "./route";
-
-const { mockAuthenticateRequest } = vi.hoisted(() => ({
-  mockAuthenticateRequest: vi.fn(),
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: vi.fn(),
-}));
-
-vi.mock("@/app/api/v1/auth", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/app/api/v1/auth")>();
-  return { ...actual, authenticateRequest: mockAuthenticateRequest };
-});
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyRateLimit: vi.fn().mockResolvedValue(undefined),
-  applyIPRateLimit: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@/lib/constants", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/lib/constants")>();
-  return { ...actual, AUDIT_LOG_ENABLED: false };
-});
-
-vi.mock("@/app/api/v3/lib/auth", () => ({
-  requireV3WorkspaceAccess: vi.fn(),
-}));
-
-vi.mock("@/modules/survey/list/lib/survey-page", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey-page")>();
-  return {
-    ...actual,
-    getSurveyListPage: vi.fn(),
-  };
-});
-
-vi.mock("@/modules/survey/list/lib/survey", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey")>();
-  return {
-    ...actual,
-    getSurveyCount: vi.fn(),
-  };
-});
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      warn: vi.fn(),
-      error: vi.fn(),
-    })),
-  },
-}));
-
-const getServerSession = vi.mocked((await import("next-auth")).getServerSession);
-
-const validWorkspaceId = "clxx1234567890123456789012";
-const resolvedEnvironmentId = "clzz9876543210987654321098";
-
-function createRequest(url: string, requestId?: string, extraHeaders?: Record<string, string>): NextRequest {
-  const headers: Record<string, string> = { ...extraHeaders };
-  if (requestId) headers["x-request-id"] = requestId;
-  return new NextRequest(url, { headers });
-}
-
-const apiKeyAuth = {
-  type: "apiKey" as const,
-  apiKeyId: "key_1",
-  organizationId: "org_1",
-  organizationAccess: {
-    accessControl: { read: true, write: false },
-  },
-  environmentPermissions: [
-    {
-      environmentId: validWorkspaceId,
-      environmentType: EnvironmentType.development,
-      projectId: "proj_1",
-      projectName: "P",
-      permission: ApiKeyPermission.read,
-    },
-  ],
-};
-
-describe("GET /api/v3/surveys", () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-    getServerSession.mockResolvedValue({
-      user: { id: "user_1", name: "User", email: "u@example.com" },
-      expires: "2026-01-01",
-    } as any);
-    mockAuthenticateRequest.mockResolvedValue(null);
-    vi.mocked(requireV3WorkspaceAccess).mockImplementation(async (auth, workspaceId) => {
-      if (auth && "apiKeyId" in auth) {
-        const p = auth.environmentPermissions.find((e) => e.environmentId === workspaceId);
-        if (!p) {
-          return new Response(
-            JSON.stringify({
-              title: "Forbidden",
-              status: 403,
-              detail: "You are not authorized to access this resource",
-              requestId: "req",
-            }),
-            { status: 403, headers: { "Content-Type": "application/problem+json" } }
-          );
-        }
-        return {
-          environmentId: workspaceId,
-          projectId: p.projectId,
-          organizationId: auth.organizationId,
-        };
-      }
-      return {
-        environmentId: resolvedEnvironmentId,
-        projectId: "proj_1",
-        organizationId: "org_1",
-      };
-    });
-    vi.mocked(getSurveyListPage).mockResolvedValue({ surveys: [], nextCursor: null });
-    vi.mocked(getSurveyCount).mockResolvedValue(0);
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("returns 401 when no session and no API key", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(null);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(401);
-    expect(res.headers.get("Content-Type")).toBe("application/problem+json");
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 200 with session and valid workspaceId", async () => {
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-456");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(res.headers.get("Content-Type")).toBe("application/json");
-    expect(res.headers.get("X-Request-Id")).toBe("req-456");
-    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
-      expect.objectContaining({ user: expect.any(Object) }),
-      validWorkspaceId,
-      "read",
-      "req-456",
-      "/api/v3/surveys"
-    );
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
-  });
-
-  test("returns 200 with x-api-key when workspace is on the key", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(apiKeyAuth as any);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-k", {
-      "x-api-key": "fbk_test",
-    });
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
-      expect.objectContaining({ apiKeyId: "key_1" }),
-      validWorkspaceId,
-      "read",
-      "req-k",
-      "/api/v3/surveys"
-    );
-    expect(getSurveyListPage).toHaveBeenCalledWith(validWorkspaceId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(validWorkspaceId, undefined);
-  });
-
-  test("returns 403 when API key does not include workspace", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue({
-      ...apiKeyAuth,
-      environmentPermissions: [
-        {
-          environmentId: "claa1111111111111111111111",
-          environmentType: EnvironmentType.development,
-          projectId: "proj_x",
-          projectName: "X",
-          permission: ApiKeyPermission.read,
-        },
-      ],
-    } as any);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, undefined, {
-      "x-api-key": "fbk_test",
-    });
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-  });
-
-  test("returns 400 when the createdBy filter is used", async () => {
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[createdBy][in]=you`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    const body = await res.json();
-    expect(body.invalid_params?.some((p: { name: string }) => p.name === "filter[createdBy][in]")).toBe(true);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 400 when workspaceId is missing", async () => {
-    const req = createRequest("http://localhost/api/v3/surveys");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 400 when workspaceId is not cuid2", async () => {
-    const req = createRequest("http://localhost/api/v3/surveys?workspaceId=not-a-cuid");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-  });
-
-  test("returns 400 when limit exceeds max", async () => {
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=101`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-  });
-
-  test("reflects limit, nextCursor, and totalCount in meta", async () => {
-    vi.mocked(getSurveyListPage).mockResolvedValue({
-      surveys: [],
-      nextCursor: "cursor-123",
-    });
-    vi.mocked(getSurveyCount).mockResolvedValue(42);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=10`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    const body = await res.json();
-    expect(body.meta).toEqual({ limit: 10, nextCursor: "cursor-123", totalCount: 42 });
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 10,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
-  });
-
-  test("passes filter query to getSurveyListPage", async () => {
-    const filterCriteria = { status: ["inProgress"] };
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[status][in]=inProgress&sortBy=updatedAt`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, filterCriteria);
-  });
-
-  test("returns 400 when filterCriteria is used", async () => {
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filterCriteria=${encodeURIComponent("{}")}`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when auth returns 403", async () => {
-    vi.mocked(requireV3WorkspaceAccess).mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          title: "Forbidden",
-          status: 403,
-          detail: "You are not authorized to access this resource",
-          requestId: "req-789",
-        }),
-        { status: 403, headers: { "Content-Type": "application/problem+json" } }
-      )
-    );
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-  });
-
-  test("list items expose workspaceId instead of environmentId and omit internal fields", async () => {
-    vi.mocked(getSurveyListPage).mockResolvedValue({
-      surveys: [
-        {
-          id: "s1",
-          name: "Survey 1",
-          environmentId: "env_1",
-          type: "link",
-          status: "draft",
-          createdAt: new Date(),
-          updatedAt: new Date(),
-          responseCount: 0,
-          creator: { name: "Test" },
-          singleUse: null,
-        } as any,
-      ],
-      nextCursor: null,
-    });
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    const body = await res.json();
-    expect(body.data[0]).not.toHaveProperty("blocks");
-    expect(body.data[0]).not.toHaveProperty("singleUse");
-    expect(body.data[0]).not.toHaveProperty("_count");
-    expect(body.data[0]).not.toHaveProperty("environmentId");
-    expect(body.data[0].id).toBe("s1");
-    expect(body.data[0].workspaceId).toBe("env_1");
-  });
-
-  test("returns 403 when getSurveyListPage throws ResourceNotFoundError", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new ResourceNotFoundError("survey", "s1"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-nf");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-    const body = await res.json();
-    expect(body.code).toBe("forbidden");
-  });
-
-  test("returns 500 when getSurveyListPage throws DatabaseError", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new DatabaseError("db down"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-db");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-  });
-
-  test("returns 500 on unexpected error from getSurveyListPage", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new Error("boom"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-err");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-  });
-});

apps/web/app/api/v3/surveys/route.ts

@@ -1,81 +0,0 @@
-/**
- * GET /api/v3/surveys — list surveys for a workspace.
- * Session cookie or x-api-key; scope by workspaceId only.
- */
-import { logger } from "@formbricks/logger";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
-import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
-import {
-  problemBadRequest,
-  problemForbidden,
-  problemInternalError,
-  successListResponse,
-} from "@/app/api/v3/lib/response";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
-import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
-import { parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
-import { serializeV3SurveyListItem } from "./serializers";
-
-export const GET = withV3ApiWrapper({
-  auth: "both",
-  handler: async ({ req, authentication, requestId, instance }) => {
-    const log = logger.withContext({ requestId });
-
-    try {
-      const searchParams = new URL(req.url).searchParams;
-      const parsed = parseV3SurveysListQuery(searchParams);
-      if (!parsed.ok) {
-        log.warn({ statusCode: 400, invalidParams: parsed.invalid_params }, "Validation failed");
-        return problemBadRequest(requestId, "Invalid query parameters", {
-          invalid_params: parsed.invalid_params,
-          instance,
-        });
-      }
-
-      const authResult = await requireV3WorkspaceAccess(
-        authentication,
-        parsed.workspaceId,
-        "read",
-        requestId,
-        instance
-      );
-      if (authResult instanceof Response) {
-        return authResult;
-      }
-
-      const { environmentId } = authResult;
-
-      const [{ surveys, nextCursor }, totalCount] = await Promise.all([
-        getSurveyListPage(environmentId, {
-          limit: parsed.limit,
-          cursor: parsed.cursor,
-          sortBy: parsed.sortBy,
-          filterCriteria: parsed.filterCriteria,
-        }),
-        getSurveyCount(environmentId, parsed.filterCriteria),
-      ]);
-
-      return successListResponse(
-        surveys.map(serializeV3SurveyListItem),
-        {
-          limit: parsed.limit,
-          nextCursor,
-          totalCount,
-        },
-        { requestId, cache: "private, no-store" }
-      );
-    } catch (err) {
-      if (err instanceof ResourceNotFoundError) {
-        log.warn({ statusCode: 403, errorCode: err.name }, "Resource not found");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-      if (err instanceof DatabaseError) {
-        log.error({ error: err, statusCode: 500 }, "Database error");
-        return problemInternalError(requestId, "An unexpected error occurred.", instance);
-      }
-      log.error({ error: err, statusCode: 500 }, "V3 surveys list unexpected error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
-    }
-  },
-});

apps/web/app/api/v3/surveys/serializers.ts

@@ -1,18 +0,0 @@
-import type { TSurvey } from "@/modules/survey/list/types/surveys";
-
-export type TV3SurveyListItem = Omit<TSurvey, "environmentId" | "singleUse"> & {
-  workspaceId: string;
-};
-
-/**
- * Keep the v3 API contract isolated from internal persistence naming.
- * Internally surveys are still scoped by environmentId; externally v3 exposes workspaceId.
- */
-export function serializeV3SurveyListItem(survey: TSurvey): TV3SurveyListItem {
-  const { environmentId, singleUse: _omitSingleUse, ...rest } = survey;
-
-  return {
-    ...rest,
-    workspaceId: environmentId,
-  };
-}

apps/web/app/chatwoot/ChatwootWidget.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { useCallback, useEffect, useRef } from "react";
-import { getIsActiveCustomerAction } from "./actions";
 
 interface ChatwootWidgetProps {
   chatwootBaseUrl: string;
@@ -13,18 +12,6 @@ interface ChatwootWidgetProps {
 
 const CHATWOOT_SCRIPT_ID = "chatwoot-script";
 
-interface ChatwootInstance {
-  setUser: (
-    userId: string,
-    userInfo: {
-      email?: string | null;
-      name?: string | null;
-    }
-  ) => void;
-  setCustomAttributes: (attributes: Record<string, unknown>) => void;
-  reset: () => void;
-}
-
 export const ChatwootWidget = ({
   userEmail,
   userName,
@@ -33,14 +20,15 @@ export const ChatwootWidget = ({
   chatwootBaseUrl,
 }: ChatwootWidgetProps) => {
   const userSetRef = useRef(false);
-  const customerStatusSetRef = useRef(false);
-
-  const getChatwoot = useCallback((): ChatwootInstance | null => {
-    return (globalThis as unknown as { $chatwoot: ChatwootInstance }).$chatwoot ?? null;
-  }, []);
 
   const setUserInfo = useCallback(() => {
-    const $chatwoot = getChatwoot();
+    const $chatwoot = (
+      globalThis as unknown as {
+        $chatwoot: {
+          setUser: (userId: string, userInfo: { email?: string | null; name?: string | null }) => void;
+        };
+      }
+    ).$chatwoot;
     if (userId && $chatwoot && !userSetRef.current) {
       $chatwoot.setUser(userId, {
         email: userEmail,
@@ -48,19 +36,7 @@ export const ChatwootWidget = ({
       });
       userSetRef.current = true;
     }
-  }, [userId, userEmail, userName, getChatwoot]);
-
-  const setCustomerStatus = useCallback(async () => {
-    if (customerStatusSetRef.current) return;
-    const $chatwoot = getChatwoot();
-    if (!$chatwoot) return;
-
-    const response = await getIsActiveCustomerAction();
-    if (response?.data !== undefined) {
-      $chatwoot.setCustomAttributes({ isActiveCustomer: response.data });
-    }
-    customerStatusSetRef.current = true;
-  }, [getChatwoot]);
+  }, [userId, userEmail, userName]);
 
   useEffect(() => {
     if (!chatwootWebsiteToken) return;
@@ -89,19 +65,23 @@ export const ChatwootWidget = ({
     const handleChatwootReady = () => setUserInfo();
     globalThis.addEventListener("chatwoot:ready", handleChatwootReady);
 
-    const handleChatwootOpen = () => setCustomerStatus();
-    globalThis.addEventListener("chatwoot:open", handleChatwootOpen);
-
     // Check if Chatwoot is already ready
-    if (getChatwoot()) {
+    if (
+      (
+        globalThis as unknown as {
+          $chatwoot: {
+            setUser: (userId: string, userInfo: { email?: string | null; name?: string | null }) => void;
+          };
+        }
+      ).$chatwoot
+    ) {
       setUserInfo();
     }
 
     return () => {
       globalThis.removeEventListener("chatwoot:ready", handleChatwootReady);
-      globalThis.removeEventListener("chatwoot:open", handleChatwootOpen);
 
-      const $chatwoot = getChatwoot();
+      const $chatwoot = (globalThis as unknown as { $chatwoot: { reset: () => void } }).$chatwoot;
       if ($chatwoot) {
         $chatwoot.reset();
       }
@@ -110,18 +90,8 @@ export const ChatwootWidget = ({
       scriptElement?.remove();
 
       userSetRef.current = false;
-      customerStatusSetRef.current = false;
     };
-  }, [
-    chatwootBaseUrl,
-    chatwootWebsiteToken,
-    userId,
-    userEmail,
-    userName,
-    setUserInfo,
-    setCustomerStatus,
-    getChatwoot,
-  ]);
+  }, [chatwootBaseUrl, chatwootWebsiteToken, userId, userEmail, userName, setUserInfo]);
 
   return null;
 };

apps/web/app/chatwoot/actions.ts

@@ -1,18 +0,0 @@
-"use server";
-
-import { TCloudBillingPlan } from "@formbricks/types/organizations";
-import { getOrganizationsByUserId } from "@/lib/organization/service";
-import { authenticatedActionClient } from "@/lib/utils/action-client";
-
-export const getIsActiveCustomerAction = authenticatedActionClient.action(async ({ ctx }) => {
-  const paidBillingPlans = new Set<TCloudBillingPlan>(["pro", "scale", "custom"]);
-
-  const organizations = await getOrganizationsByUserId(ctx.user.id);
-  return organizations.some((organization) => {
-    const stripe = organization.billing.stripe;
-    const isPaidPlan = stripe?.plan ? paidBillingPlans.has(stripe.plan) : false;
-    const isActiveSubscription =
-      stripe?.subscriptionStatus === "active" || stripe?.subscriptionStatus === "trialing";
-    return isPaidPlan && isActiveSubscription;
-  });
-});

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

@@ -421,38 +421,6 @@ describe("withV1ApiWrapper", () => {
     expect(handler).not.toHaveBeenCalled();
   });
 
-  test("uses unauthenticatedResponse when provided instead of default 401", async () => {
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
-      await import("@/app/middleware/endpoint-validator");
-    const { getServerSession } = await import("next-auth");
-
-    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
-    vi.mocked(isManagementApiRoute).mockReturnValue({
-      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.Session,
-    });
-    vi.mocked(isIntegrationRoute).mockReturnValue(false);
-    vi.mocked(getServerSession).mockResolvedValue(null);
-
-    const custom401 = new Response(JSON.stringify({ title: "Custom", status: 401 }), {
-      status: 401,
-      headers: { "Content-Type": "application/problem+json" },
-    });
-
-    const handler = vi.fn();
-    const req = createMockRequest({ url: "https://api.test/api/v3/surveys" });
-    const { withV1ApiWrapper } = await import("./with-api-logging");
-    const wrapped = withV1ApiWrapper({
-      handler,
-      unauthenticatedResponse: () => custom401,
-    });
-    const res = await wrapped(req, undefined);
-
-    expect(res).toBe(custom401);
-    expect(handler).not.toHaveBeenCalled();
-    expect(mockContextualLoggerError).toHaveBeenCalled();
-  });
-
   test("handles rate limiting errors", async () => {
     const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
     const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =

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

@@ -38,11 +38,6 @@ export interface TWithV1ApiWrapperParams<TResult extends { response: Response },
   action?: TAuditAction;
   targetType?: TAuditTarget;
   customRateLimitConfig?: TRateLimitConfig;
-  /**
-   * When the route requires auth but the client is unauthenticated, the wrapper normally returns
-   * the legacy JSON 401. Use this to return a custom response (e.g. RFC 9457 problem+json for V3).
-   */
-  unauthenticatedResponse?: (req: NextRequest) => Response;
 }
 
 enum ApiV1RouteTypeEnum {
@@ -270,7 +265,7 @@ const getRouteType = (
 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;
+  const { handler, action, targetType, customRateLimitConfig } = params;
   return async (req: NextRequest, props: TProps): Promise<Response> => {
     // === Audit Log Setup ===
     const saveAuditLog = action && targetType;
@@ -292,11 +287,6 @@ export const withV1ApiWrapper = <TResult extends { response: Response }, TProps
     const authentication = await handleAuthentication(authenticationMethod, req);
 
     if (!authentication && routeType !== ApiV1RouteTypeEnum.Client) {
-      if (unauthenticatedResponse) {
-        const res = unauthenticatedResponse(req);
-        await processResponse(res, req, auditLog);
-        return res;
-      }
       return responses.notAuthenticatedResponse();
     }
 

apps/web/app/middleware/endpoint-validator.test.ts

@@ -90,17 +90,6 @@ describe("endpoint-validator", () => {
   });
 
   describe("isManagementApiRoute", () => {
-    test("should return Both for v3 surveys routes", () => {
-      expect(isManagementApiRoute("/api/v3/surveys")).toEqual({
-        isManagementApi: true,
-        authenticationMethod: AuthenticationMethod.Both,
-      });
-      expect(isManagementApiRoute("/api/v3/surveys/clxxxxxxxxxxxxxxxxxxxxxxxx")).toEqual({
-        isManagementApi: true,
-        authenticationMethod: AuthenticationMethod.Both,
-      });
-    });
-
     test("should return correct object for management API routes with API key authentication", () => {
       expect(isManagementApiRoute("/api/v1/management/something")).toEqual({
         isManagementApi: true,

apps/web/app/middleware/endpoint-validator.ts

@@ -22,9 +22,6 @@ export const isClientSideApiRoute = (url: string): { isClientSideApi: boolean; i
 export const isManagementApiRoute = (
   url: string
 ): { isManagementApi: boolean; authenticationMethod: AuthenticationMethod } => {
-  // V3 surveys: session cookie or x-api-key (same pattern as management storage)
-  if (/^\/api\/v3\/surveys(?:\/|$)/.test(url))
-    return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/management/storage"))
     return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/webhooks"))

apps/web/app/posthog/PostHogIdentify.tsx

@@ -1,36 +0,0 @@
-"use client";
-
-import posthog from "posthog-js";
-import { useEffect, useRef } from "react";
-
-interface PostHogIdentifyProps {
-  posthogKey: string;
-  userId: string;
-  email: string;
-  name: string | null;
-}
-
-export const PostHogIdentify = ({ posthogKey, userId, email, name }: PostHogIdentifyProps) => {
-  const lastIdentifiedUserId = useRef<string | null>(null);
-
-  useEffect(() => {
-    if (!posthog.__loaded) {
-      posthog.init(posthogKey, {
-        api_host: "/ingest",
-        ui_host: "https://eu.i.posthog.com",
-        defaults: "2026-01-30",
-        capture_exceptions: true,
-        debug: process.env.NODE_ENV === "development",
-      });
-    }
-
-    if (lastIdentifiedUserId.current && lastIdentifiedUserId.current !== userId) {
-      posthog.reset();
-    }
-
-    posthog.identify(userId, { email, name });
-    lastIdentifiedUserId.current = userId;
-  }, [posthogKey, userId, email, name]);
-
-  return null;
-};

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

@@ -1,15 +1,12 @@
 "use server";
 
 import { z } from "zod";
-import { logger } from "@formbricks/logger";
 import { OperationNotAllowedError } from "@formbricks/types/errors";
-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 { authenticatedActionClient } from "@/lib/utils/action-client";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
-import { ensureCloudStripeSetupForOrganization } from "@/modules/ee/billing/lib/organization-billing";
 import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
 
 const ZCreateOrganizationAction = z.object({
@@ -36,16 +33,6 @@ export const createOrganizationAction = authenticatedActionClient
         accepted: true,
       });
 
-      // Stripe setup must run AFTER membership is created so the owner email is available
-      if (IS_FORMBRICKS_CLOUD) {
-        ensureCloudStripeSetupForOrganization(newOrganization.id).catch((error) => {
-          logger.error(
-            { error, organizationId: newOrganization.id },
-            "Stripe setup failed after organization creation"
-          );
-        });
-      }
-
       ctx.auditLoggingCtx.organizationId = newOrganization.id;
       ctx.auditLoggingCtx.newObject = newOrganization;
 

apps/web/i18n.lock

@@ -140,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
@@ -148,7 +147,6 @@ checksums:
     common/copy: 627c00d2c850b9b45f7341a6ac01b6bb
     common/copy_code: 704c13d9bc01caad29a1cf3179baa111
     common/copy_link: 57a37acfe6d7ed71d00fbbc8079fbb35
-    common/copy_to_environment: c482d26b8fd4962af6542bbf49e49a32
     common/count_attributes: 48805e836a9b50f9635ad00fed953058
     common/count_contacts: 9f71d503455264f1eec1ae58894cf143
     common/count_members: 31ce64ca63fdf95e02ab5543b6e2f717
@@ -188,12 +186,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
@@ -230,7 +228,7 @@ checksums:
     common/inactive_surveys: 324b8e1844739cdc2a3bc71aef143a76
     common/integration: 40d02f65c4356003e0e90ffb944907d2
     common/integrations: 0ccce343287704cd90150c32e2fcad36
-    common/invalid_date_with_value: f7f9dbe99f25f1724367ee57572b52bf
+    common/invalid_date: 4c18c82f7317d4a02f8d5fef611e82b7
     common/invalid_file_name: 8243c91b898110fb15ebb24aa6a7d313
     common/invalid_file_type: f0c83e7d61dbad8250abb59869af4b9e
     common/invite: 181884cea804cbde665f160811ee7ad0
@@ -257,9 +255,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
@@ -273,7 +269,6 @@ checksums:
     common/new: 126d036fae5fb6b629728ecb97e6195b
     common/new_version_available: 399ddfc4232712e18ddab2587356b3dc
     common/next: 89ddbcf710eba274963494f312bdc8a9
-    common/no_actions_found: 4d92b789eb121fc76cd6868136dcbcd4
     common/no_background_image_found: 4108a781a9022c65671a826d4e299d5b
     common/no_code: f602144ab7d28a5b19a446bf74b4dcc4
     common/no_files_uploaded: c97be829e195a41b2f6b6717b87a232b
@@ -299,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
@@ -318,7 +314,6 @@ checksums:
     common/please_select_at_least_one_survey: fb1cbeb670480115305e23444c347e50
     common/please_select_at_least_one_trigger: e88e64a1010a039745e80ed2e30951fe
     common/please_upgrade_your_plan: 03d54a21ecd27723c72a13644837e5ed
-    common/powered_by_formbricks: 1c3e19894583292bfaf686cac84a4960
     common/preview: 3173ee1f0f1d4e50665ca4a84c38e15d
     common/preview_survey: 7409e9c118e3e5d5f2a86201c2b354f2
     common/privacy: 7459744a63ef8af4e517a09024bd7c08
@@ -360,7 +355,6 @@ checksums:
     common/select: 5ac04c47a98deb85906bc02e0de91ab0
     common/select_all: eedc7cdb02de467c15dc418a066a77f2
     common/select_filter: c50082c3981f1161022f9787a19aed71
-    common/select_language: d75cf5fbce8a4c7a9055e2210af74480
     common/select_survey: bac52e59c7847417bef6fe7b7096b475
     common/select_teams: ae5d451929846ae6367562bc671a1af9
     common/selected: 9f09e059ba20c88ed34e2b4e8e032d56
@@ -380,7 +374,7 @@ checksums:
     common/something_went_wrong: a3cd2f01c073f1f5ff436d4b132d39cf
     common/something_went_wrong_please_try_again: c62a7718d9a1e9c4ffb707807550f836
     common/sort_by: 8adf3dbc5668379558957662f0c43563
-    common/start_free_trial: e346e4ed7d138dcc873db187922369da
+    common/start_free_trial: 4fab76a3fc5d5c94e3248cd279cfdd14
     common/status: 4e1fcce15854d824919b4a582c697c90
     common/step_by_step_manual: 2894a07952a4fd11d98d5d8f1088690c
     common/storage_not_configured: b0c3e339f6d71f23fdd189e7bcb076f6
@@ -393,6 +387,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
@@ -407,15 +402,13 @@ 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
     common/title: 344e64395eaff6822a57d18623853e1a
     common/top_left: aa61bb29b56df3e046b6d68d89ee8986
     common/top_right: 241f95c923846911aaf13af6109333e5
-    common/trial_days_remaining: 914ff3132895e410bf0f862433ccb49e
-    common/trial_expired: ca9f0532ac40ca427ca1ba4c86454e07
-    common/trial_one_day_remaining: 2d64d39fca9589c4865357817bcc24d5
     common/try_again: 33dd8820e743e35a66e6977f69e9d3b5
     common/type: f04471a7ddac844b9ad145eb9911ef75
     common/unknown_survey: dd8f6985e17ccf19fac1776e18b2c498
@@ -423,13 +416,13 @@ checksums:
     common/update: 079fc039262fd31b10532929685c2d1b
     common/updated: 8aa8ff2dc2977ca4b269e80a513100b4
     common/updated_at: 8fdb85248e591254973403755dcc3724
-    common/upgrade_plan: 81c9e7a593c0e9290f7078ecdc1c6693
     common/upload: 4a6c84aa16db0f4e5697f49b45257bc7
     common/upload_failed: d4dd7b6ee4c1572e4136659f74d9632b
     common/upload_input_description: 64f59bc339568d52b8464b82546b70ea
     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
@@ -445,13 +438,14 @@ checksums:
     common/weeks: 545de30df4f44d3f6d1d344af6a10815
     common/welcome_card: 76081ebd5b2e35da9b0f080323704ae7
     common/workflows: b0c9c8615a9ba7d9cb73e767290a7f72
-    common/workspace: b63ef0e99ee6f7fef6cbe4971ca6cf0f
     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
@@ -627,6 +621,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
@@ -806,16 +801,9 @@ 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
     environments/integrations/webhooks/please_enter_a_url: c24c74d0ce7ed3a6b858aadbc82108fe
     environments/integrations/webhooks/response_created: 8c43b1b6d748f6096f6f8d9232a3c469
@@ -927,80 +915,44 @@ checksums:
     environments/settings/api_keys/add_api_key: 1c11117b1d4665ccdeb68530381c6a9d
     environments/settings/api_keys/add_permission: 4f0481d26a32aef6137ee6f18aaf8e89
     environments/settings/api_keys/api_keys_description: 42c2d587834d54f124b9541b32ff7133
-    environments/settings/billing/add_payment_method: 38ad2a7f6bc599bf596eab394b379c02
-    environments/settings/billing/add_payment_method_to_upgrade_tooltip: 977005ad38bfe0800a78c21edcd16e4d
-    environments/settings/billing/billing_interval_toggle: 62c76eb73507108fc6aefdf1ab86cc38
-    environments/settings/billing/current_plan_badge: 27f172f76ac28e72cb062f80002b0ad5
-    environments/settings/billing/current_plan_cta: 53ac259fd40a361274861ee7c7498424
-    environments/settings/billing/custom_plan_description: 53faa38123cc74e5adc7e59630641d66
-    environments/settings/billing/custom_plan_title: f3b71be0d1cd4f81a177ada040119f30
+    environments/settings/billing/cancelling: 6e46e789720395bfa1e3a4b3b1519634
     environments/settings/billing/failed_to_start_trial: 43e28223f51af382042b3a753d9e4380
-    environments/settings/billing/keep_current_plan: 57ac15ffa2c29ac364dd405669eeb7f6
-    environments/settings/billing/manage_billing_details: 40448f0b5ed4b3bb1d864ba6e1bb6a3b
-    environments/settings/billing/monthly: 818f1192e32bb855597f930d3e78806e
-    environments/settings/billing/most_popular: 03051978338d93d9abdd999bc06284f9
-    environments/settings/billing/pending_change_removed: c80cc7f1f83f28db186e897fb18282a3
-    environments/settings/billing/pending_plan_badge: 1283929a2810dcf6110765f387dc118e
-    environments/settings/billing/pending_plan_change_description: a50400c802ab04c23019d8219c5e7e1c
-    environments/settings/billing/pending_plan_change_title: 730a8df084494ccf06c0a2f44c28f9fc
-    environments/settings/billing/pending_plan_cta: 1283929a2810dcf6110765f387dc118e
-    environments/settings/billing/per_month: 64e96490ee2d7811496cf04adae30aa4
-    environments/settings/billing/per_year: bf02408d157486e53c15a521a5645617
-    environments/settings/billing/plan_change_applied: d1e04599487247dd0e21a7d99785dc7a
-    environments/settings/billing/plan_change_scheduled: 16455d4aa9a152b156ee434d8c7e34d4
+    environments/settings/billing/manage_subscription: b83a75127b8eabc21dfa1e0f7104db56
     environments/settings/billing/plan_custom: b7b89901f46267f532600a23cfc54ae2
-    environments/settings/billing/plan_feature_everything_in_hobby: 5417a498136fa29988c8215291e3fd8b
-    environments/settings/billing/plan_feature_everything_in_pro: 3f5129ff1f01eed4f051a8790ed62997
     environments/settings/billing/plan_hobby: 3e96a8e688032f9bd21b436bc70c19d5
-    environments/settings/billing/plan_hobby_description: 1fa1cf69b42ec82727aebc5ef1ec24a2
-    environments/settings/billing/plan_hobby_feature_responses: d1e6c1d83f5e57cbae2a09e6a818a25d
-    environments/settings/billing/plan_hobby_feature_workspaces: 02a34669419ed7f30f728980f54d42ef
     environments/settings/billing/plan_pro: 682b3c9feab30112b4454cb5bb7974b1
-    environments/settings/billing/plan_pro_description: 748c848ea0d8cf81a66704762edcd6f4
-    environments/settings/billing/plan_pro_feature_responses: e16ffe385051a16dba76538c13d97a5f
-    environments/settings/billing/plan_pro_feature_workspaces: 819874022b491209ca7f0f1ab1e3daea
     environments/settings/billing/plan_scale: 5f55a30a5bdf8f331b56bad9c073473c
-    environments/settings/billing/plan_scale_description: ef5c66e0b52686f56319e31388bd8409
-    environments/settings/billing/plan_scale_feature_responses: 0b74bf8d089c738ebb7f0867bdd7d7f1
-    environments/settings/billing/plan_scale_feature_workspaces: 6bd1b676b9470ca8cc4e73be3ffd4bef
-    environments/settings/billing/plan_selection_description: 8367b137b31234cafe0e297a35b0b599
-    environments/settings/billing/plan_selection_title: 8b814effdaee1787281b740f67482d7d
     environments/settings/billing/plan_unknown: 5cd12b882fe90320f93130c1b50e2e32
     environments/settings/billing/remove_branding: 88b6b818750e478bfa153b33dd658280
     environments/settings/billing/retry_setup: bef560e42fa8798271fea150476791e0
+    environments/settings/billing/scale_banner_description: 79a9734c77ab0336d5d2fadb5f2151be
+    environments/settings/billing/scale_banner_title: a2a78f57ebcbf444ad881ece234b8f45
+    environments/settings/billing/scale_feature_api: 67231215e5452944b86edc2bc47d2a16
+    environments/settings/billing/scale_feature_quota: 31fb6b5e846dd44de140a69fd3e4c067
+    environments/settings/billing/scale_feature_spam: 8a8229b6ac3f3e0427fd347cb667ce11
+    environments/settings/billing/scale_feature_teams: f6e8428f6cdb227176a5fa8c5c95c976
     environments/settings/billing/select_plan_header_subtitle: 8de6b4e3ce5726829829bd46582f343a
-    environments/settings/billing/select_plan_header_title: b15a9d86b819a7fae8e956a50572184c
+    environments/settings/billing/select_plan_header_title: d851e9fa093ddb248924cf99e1d79b4e
     environments/settings/billing/status_trialing: 4fd32760caf3bd7169935b0a6d2b5b67
     environments/settings/billing/stay_on_hobby_plan: 966ab0c752a79f00ef10d6a5ed1d8cad
     environments/settings/billing/stripe_setup_incomplete: fa6d6e295dd14b73c17ac8678205109b
     environments/settings/billing/stripe_setup_incomplete_description: 9f28a542729cc719bca2ca08e7406284
     environments/settings/billing/subscription: ba9f3675e18987d067d48533c8897343
     environments/settings/billing/subscription_description: b03618508e576666198d4adf3c2cb9a9
-    environments/settings/billing/switch_at_period_end: 9c91b2287886e077a0571efab8908623
-    environments/settings/billing/switch_plan_now: dad56622a1916fe5d1a2bda5b0393194
-    environments/settings/billing/this_includes: 127e0fe104f47886b54106a057a6b26f
-    environments/settings/billing/trial_alert_description: aba3076cc6814cc6128d425d3d1957e8
     environments/settings/billing/trial_already_used: 5433347ff7647fe0aba0fe91a44560ba
-    environments/settings/billing/trial_feature_api_access: 8c6d03728c3d9470616eb5cee5f9f65d
-    environments/settings/billing/trial_feature_attribute_segmentation: 90087da973ae48e32ec6d863516fc8c9
-    environments/settings/billing/trial_feature_contact_segment_management: 27f17a039ebed6413811ab3a461db2f4
-    environments/settings/billing/trial_feature_email_followups: 0cc02dc14aa28ce94ca6153c306924e5
-    environments/settings/billing/trial_feature_hide_branding: b8dbcb24e50e0eb4aeb0c97891cac61d
-    environments/settings/billing/trial_feature_mobile_sdks: 0963480a27df49657c1b7507adec9a06
-    environments/settings/billing/trial_feature_respondent_identification: a82e24ab4c27c5e485326678d9b7bd79
-    environments/settings/billing/trial_feature_unlimited_seats: a3257d5b6a23bfbc4b7fd1108087a823
-    environments/settings/billing/trial_feature_webhooks: 5ead39fba97fbd37835a476ee67fdd94
+    environments/settings/billing/trial_feature_api_access: d7aabb2de18beb5bd30c274cd768a2a9
+    environments/settings/billing/trial_feature_collaboration: a43509fffe319e14d69a981ef2791517
+    environments/settings/billing/trial_feature_email_followups: add368efdd84c5aef8886f369d54cbed
+    environments/settings/billing/trial_feature_quotas: 3a67818b3901bdaa72abc62db72ab170
+    environments/settings/billing/trial_feature_webhooks: 8d7f034e006b2fe0eb8fa9b8f1abef51
+    environments/settings/billing/trial_feature_whitelabel: 624a7aeca6a0fa65935c63fd7a8e9638
     environments/settings/billing/trial_no_credit_card: 01c70aa6e1001815a9a11951394923ca
-    environments/settings/billing/trial_payment_method_added_description: 872a5c557f56bafc9b7ec4895f9c33e8
-    environments/settings/billing/trial_title: f2c3791c1fb2970617ec0f2d243a931b
+    environments/settings/billing/trial_title: 23d0d2cbe306ae0f784b8289bf66a2c7
     environments/settings/billing/unlimited_responses: 25bd1cd99bc08c66b8d7d3380b2812e1
     environments/settings/billing/unlimited_workspaces: f7433bc693ee6d177e76509277f5c173
     environments/settings/billing/upgrade: 63c3b52882e0d779859307d672c178c2
-    environments/settings/billing/upgrade_now: 059e020c0eddd549ac6c6369a427915a
     environments/settings/billing/usage_cycle: 4986315c0b486c7490bab6ada2205bee
     environments/settings/billing/used: 9e2eff0ac536d11a9f8fcb055dd68f2e
-    environments/settings/billing/yearly: 87f43e016c19cb25860f456549a2f431
-    environments/settings/billing/yearly_checkout_unavailable: f7b694de0e554c8583d8aaa4740e01a2
     environments/settings/billing/your_plan: dc56f0334977d7d5d7d8f1f5801ac54b
     environments/settings/domain/customize_favicon_description: d3ac29934a66fd56294c0d8069fbc11e
     environments/settings/domain/customize_favicon_with_higher_plan: 43a6b834a8fd013c52923863d62248f3
@@ -1022,32 +974,11 @@ checksums:
     environments/settings/enterprise/enterprise_features: 3271476140733924b2a2477c4fdf3d12
     environments/settings/enterprise/get_an_enterprise_license_to_get_access_to_all_features: afd3c00f19097e88ed051800979eea44
     environments/settings/enterprise/keep_full_control_over_your_data_privacy_and_security: 43aa041cc3e2b2fdd35d2d34659a6b7a
-    environments/settings/enterprise/license_feature_access_control: bdc5ce7e88ad724d4abd3e8a07a9de5d
-    environments/settings/enterprise/license_feature_audit_logs: e93f59c176cfc8460d2bd56551ed78b8
-    environments/settings/enterprise/license_feature_contacts: fd76522bc82324ac914e124cdf9935b0
-    environments/settings/enterprise/license_feature_projects: 8ba082a84aa35cf851af1cf874b853e2
-    environments/settings/enterprise/license_feature_quotas: e6afead11b5b8ae627885ce2b84a548f
-    environments/settings/enterprise/license_feature_remove_branding: a5c71d43cd3ed25e6e48bca64e8ffc9f
-    environments/settings/enterprise/license_feature_saml: 86b76024524fc585b2c3950126ef6f62
-    environments/settings/enterprise/license_feature_spam_protection: e1fb0dd0723044bf040b92d8fc58015d
-    environments/settings/enterprise/license_feature_sso: 8c029b7dd2cb3aa1393d2814aba6cd7b
-    environments/settings/enterprise/license_feature_two_factor_auth: bc68ddd9c3c82225ef641f097e0940db
-    environments/settings/enterprise/license_feature_whitelabel: 81e9ec1d4230419f4230e6f5a318497c
-    environments/settings/enterprise/license_features_table_access: 550606d4a12bdf108c1b12b925ca1b3a
-    environments/settings/enterprise/license_features_table_description: d6260830d0703f5a2c9ed59c9da462e3
-    environments/settings/enterprise/license_features_table_disabled: 0889a3dfd914a7ef638611796b17bf72
-    environments/settings/enterprise/license_features_table_enabled: 20236664b7e62df0e767921b4450205f
-    environments/settings/enterprise/license_features_table_feature: 58f5f3f37862b6312a2f20ec1a1fd0e8
-    environments/settings/enterprise/license_features_table_title: 82d1d7b30d876cf4312f78140a90e394
-    environments/settings/enterprise/license_features_table_unlimited: e1a92523172cd1bdde5550689840e42d
-    environments/settings/enterprise/license_features_table_value: 34b0eaa85808b15cbc4be94c64d0146b
-    environments/settings/enterprise/license_instance_mismatch_description: 00f47e33ff54fca52ce9b125cd77fda5
     environments/settings/enterprise/license_invalid_description: b500c22ab17893fdf9532d2bd94aa526
     environments/settings/enterprise/license_status: f6f85c59074ca2455321bd5288d94be8
     environments/settings/enterprise/license_status_active: 3e1ec025c4a50830bbb9ad57a176630a
     environments/settings/enterprise/license_status_description: 828e4527f606471cd8cf58b55ff824f6
     environments/settings/enterprise/license_status_expired: 63b27cccba4ab2143e0f5f3d46e4168a
-    environments/settings/enterprise/license_status_instance_mismatch: 2c85ca34eef67c5ca34477dc1eda68c0
     environments/settings/enterprise/license_status_invalid: a4bfd3787fc0bf0a38db61745bd25cec
     environments/settings/enterprise/license_status_unreachable: 202b110dab099f1167b13c326349e570
     environments/settings/enterprise/license_unreachable_grace_period: c0587c9d79ac55ff2035fb8b8eec4433
@@ -1058,7 +989,6 @@ checksums:
     environments/settings/enterprise/questions_please_reach_out_to: ac4be65ffef9349eaeb137c254d3fee7
     environments/settings/enterprise/recheck_license: b913b64f89df184b5059710f4a0b26fa
     environments/settings/enterprise/recheck_license_failed: dd410acbb8887625cf194189f832dd7c
-    environments/settings/enterprise/recheck_license_instance_mismatch: 655cd1cce2f25b100439d8725c1e72f2
     environments/settings/enterprise/recheck_license_invalid: 58f41bc208692b7d53b975dfcf9f4ad8
     environments/settings/enterprise/recheck_license_success: 700ddd805be904a415f614de3df1da78
     environments/settings/enterprise/recheck_license_unreachable: 0ca81bd89595a9da24bc94dcef132175
@@ -1350,6 +1280,7 @@ checksums:
     environments/surveys/edit/custom_hostname: bc2b1c8de3f9b8ef145b45aeba6ab429
     environments/surveys/edit/customize_survey_logo: 7f7e26026c88a727228f2d7a00d914e2
     environments/surveys/edit/darken_or_lighten_background_of_your_choice: 304a64a8050ebf501d195e948cd25b6f
+    environments/surveys/edit/date_format: e95dfc41ac944874868487457ddc057a
     environments/surveys/edit/days_before_showing_this_survey_again: 9ee757e5c3a07844b12ceb406dc65b04
     environments/surveys/edit/delete_anyways: cc8683ab625280eefc9776bd381dc2e8
     environments/surveys/edit/delete_block: c00617cb0724557e486304276063807a
@@ -1387,7 +1318,6 @@ checksums:
     environments/surveys/edit/error_saving_changes: b75aa9e4e42e1d43c8f9c33c2b7dc9a7
     environments/surveys/edit/even_after_they_submitted_a_response_e_g_feedback_box: 7b99f30397dcde76f65e1ab64bdbd113
     environments/surveys/edit/everyone: 2112aa71b568773e8e8a792c63f4d413
-    environments/surveys/edit/expand_preview: 6b694829e05432b9b54e7da53bc5be2f
     environments/surveys/edit/external_urls_paywall_tooltip: 427f29bbbec18ebf8b3ea8d0253ddd66
     environments/surveys/edit/fallback_missing: 43dbedbe1a178d455e5f80783a7b6722
     environments/surveys/edit/fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first: ad4afe2980e1dfeffb20aa78eb892350
@@ -1611,8 +1541,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
@@ -1641,7 +1569,6 @@ checksums:
     environments/surveys/edit/show_survey_maximum_of: 721ed61b01a9fc8ce4becb72823bb72e
     environments/surveys/edit/show_survey_to_users: d5e90fd17babfea978fce826e9df89b0
     environments/surveys/edit/show_to_x_percentage_of_targeted_users: b745169011fa7e8ca475baa5500c5197
-    environments/surveys/edit/shrink_preview: 42567389520b226f211f94f052197ad8
     environments/surveys/edit/simple: 65575bd903091299bc4a94b7517a6288
     environments/surveys/edit/six_points: c6c09b3f07171dc388cb5a610ea79af7
     environments/surveys/edit/smiley: e68e3b28fc3c04255e236c6a0feb662b
@@ -1657,12 +1584,10 @@ checksums:
     environments/surveys/edit/styling_set_to_theme_styles: f2c108bf422372b00cf7c87f1b042f69
     environments/surveys/edit/subheading: c0f6f57155692fd8006381518ce4fef0
     environments/surveys/edit/subtract: 2d83b8b9ef35110f2583ddc155b6c486
-    environments/surveys/edit/survey_closed_message_heading_required: f7c48e324c4a5c335ec68eaa27b2d67e
     environments/surveys/edit/survey_completed_heading: dae5ac4a02a886dc9d9fc40927091919
     environments/surveys/edit/survey_completed_subheading: db537c356c3ab6564d24de0d11a0fee2
     environments/surveys/edit/survey_display_settings: 8ed19e6a8e1376f7a1ba037d82c4ae11
     environments/surveys/edit/survey_placement: 083c10f257337f9648bf9d435b18ec2c
-    environments/surveys/edit/survey_preview: 33644451073149383d3ace08be930739
     environments/surveys/edit/survey_styling: 7f96d6563e934e65687b74374a33b1dc
     environments/surveys/edit/survey_trigger: f0c7014a684ca566698b87074fad5579
     environments/surveys/edit/switch_multi_language_on_to_get_started: cca0ef91ee49095da30cd1e3f26c406f
@@ -2931,7 +2856,7 @@ checksums:
     templates/preview_survey_question_2_choice_2_label: 1af148222f327f28cf0db6513de5989e
     templates/preview_survey_question_2_headline: 5cfb173d156555227fbc2c97ad921e72
     templates/preview_survey_question_2_subheader: 2e652d8acd68d072e5a0ae686c4011c0
-    templates/preview_survey_question_open_text_headline: 573f1b04b79f672ad42ba5e54320a940
+    templates/preview_survey_question_open_text_headline: a9509a47e0456ae98ec3ddac3d6fad2c
     templates/preview_survey_question_open_text_placeholder: 37ee9c84f3777b9220d4faec1e1c78ee
     templates/preview_survey_question_open_text_subheader: 3c7bf09f3f17b02bc2fbbbdb347a5830
     templates/preview_survey_welcome_card_headline: 8778dc41547a2778d0f9482da989fc00
@@ -3184,7 +3109,7 @@ checksums:
     templates/usability_score_name: 5cbf1172d24dfcb17d979dff6dfdf7e2
     workflows/coming_soon_description: 1e0621d287924d84fb539afab7372b23
     workflows/coming_soon_title: d79be80559c70c828cf20811d2ed5039
-    workflows/follow_up_label: ead918852c5840636a14baabfe94821e
+    workflows/follow_up_label: 8cafe669370271035aeac8e8cab0f123
     workflows/follow_up_placeholder: f680918bec28192282e229c3d4b5e80a
     workflows/generate_button: b194b6172a49af8374a19dd2cf39cfdc
     workflows/heading: a98a6b14d3e955f38cc16386df9a4111

apps/web/instrumentation.ts

@@ -1,19 +1,7 @@
 import * as Sentry from "@sentry/nextjs";
-import { type Instrumentation } from "next";
-import { isExpectedError } from "@formbricks/types/errors";
 import { IS_PRODUCTION, PROMETHEUS_ENABLED, SENTRY_DSN } from "@/lib/constants";
 
-export const onRequestError: Instrumentation.onRequestError = (...args) => {
-  const [error] = args;
-
-  // Skip expected business-logic errors (AuthorizationError, ResourceNotFoundError, etc.)
-  // These are handled gracefully in the UI and don't need server-side Sentry reporting
-  if (error instanceof Error && isExpectedError(error)) {
-    return;
-  }
-
-  Sentry.captureRequestError(...args);
-};
+export const onRequestError = Sentry.captureRequestError;
 
 export const register = async () => {
   if (process.env.NEXT_RUNTIME === "nodejs") {

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/constants.ts

@@ -26,7 +26,6 @@ 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 PASSWORD_RESET_DISABLED = env.PASSWORD_RESET_DISABLED === "1";
 export const EMAIL_VERIFICATION_DISABLED = env.EMAIL_VERIFICATION_DISABLED === "1";
 
@@ -187,8 +186,6 @@ export const CHATWOOT_WEBSITE_TOKEN = env.CHATWOOT_WEBSITE_TOKEN;
 export const CHATWOOT_BASE_URL = env.CHATWOOT_BASE_URL || "https://app.chatwoot.com";
 export const IS_CHATWOOT_CONFIGURED = Boolean(env.CHATWOOT_WEBSITE_TOKEN);
 
-export const POSTHOG_KEY = env.POSTHOG_KEY;
-
 export const TURNSTILE_SECRET_KEY = env.TURNSTILE_SECRET_KEY;
 export const TURNSTILE_SITE_KEY = env.TURNSTILE_SITE_KEY;
 export const IS_TURNSTILE_CONFIGURED = Boolean(env.TURNSTILE_SITE_KEY && TURNSTILE_SECRET_KEY);

apps/web/lib/crypto.test.ts

@@ -55,7 +55,7 @@ describe("Crypto Utils", () => {
       // But both should verify correctly
       expect(await verifySecret(secret, hash1)).toBe(true);
       expect(await verifySecret(secret, hash2)).toBe(true);
-    }, 15000);
+    });
 
     test("should use custom cost factor", async () => {
       const secret = "test-secret-123";

apps/web/lib/env.ts

@@ -15,7 +15,6 @@ export const env = 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(),
     AUTH_DEFAULT_TEAM_ID: z.string().optional(),
     AUTH_SKIP_INVITE_FOR_SSO: z.enum(["1", "0"]).optional(),
@@ -43,7 +42,6 @@ export const env = createEnv({
     CHATWOOT_WEBSITE_TOKEN: z.string().optional(),
     CHATWOOT_BASE_URL: z.url().optional(),
     IS_FORMBRICKS_CLOUD: z.enum(["1", "0"]).optional(),
-    POSTHOG_KEY: z.string().optional(),
     LOG_LEVEL: z.enum(["debug", "info", "warn", "error", "fatal"]).optional(),
     MAIL_FROM: z.email().optional(),
     NEXTAUTH_URL: z.url().optional(),
@@ -86,6 +84,7 @@ export const env = createEnv({
     STRIPE_SECRET_KEY: z.string().optional(),
     STRIPE_WEBHOOK_SECRET: z.string().optional(),
     STRIPE_PUBLISHABLE_KEY: z.string().optional(),
+    STRIPE_PRICING_TABLE_ID: z.string().optional(),
     PUBLIC_URL: z
       .url()
       .refine(
@@ -142,7 +141,6 @@ export const env = 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,
     AUTH_DEFAULT_TEAM_ID: process.env.AUTH_SSO_DEFAULT_TEAM_ID,
     AUTH_SKIP_INVITE_FOR_SSO: process.env.AUTH_SKIP_INVITE_FOR_SSO,
@@ -167,7 +165,6 @@ export const env = createEnv({
     CHATWOOT_WEBSITE_TOKEN: process.env.CHATWOOT_WEBSITE_TOKEN,
     CHATWOOT_BASE_URL: process.env.CHATWOOT_BASE_URL,
     IS_FORMBRICKS_CLOUD: process.env.IS_FORMBRICKS_CLOUD,
-    POSTHOG_KEY: process.env.POSTHOG_KEY,
     LOG_LEVEL: process.env.LOG_LEVEL,
     MAIL_FROM: process.env.MAIL_FROM,
     MAIL_FROM_NAME: process.env.MAIL_FROM_NAME,
@@ -204,6 +201,7 @@ export const env = createEnv({
     STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
     STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
     STRIPE_PUBLISHABLE_KEY: process.env.STRIPE_PUBLISHABLE_KEY,
+    STRIPE_PRICING_TABLE_ID: process.env.STRIPE_PRICING_TABLE_ID,
     PUBLIC_URL: process.env.PUBLIC_URL,
     TURNSTILE_SECRET_KEY: process.env.TURNSTILE_SECRET_KEY,
     TURNSTILE_SITE_KEY: process.env.TURNSTILE_SITE_KEY,

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/organization/service.ts

@@ -308,7 +308,12 @@ export const deleteOrganization = async (organizationId: string) => {
 
     const stripeCustomerId = deletedOrganization.billing?.stripeCustomerId;
     if (IS_FORMBRICKS_CLOUD && stripeCustomerId) {
-      await cleanupStripeCustomer(stripeCustomerId);
+      cleanupStripeCustomer(stripeCustomerId).catch((error) => {
+        logger.error(
+          { error, organizationId, stripeCustomerId },
+          "Failed to clean up Stripe customer after organization deletion"
+        );
+      });
     }
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/lib/response/service.ts

@@ -378,7 +378,7 @@ export const getResponseDownloadFile = async (
 
     const organizationId = await getOrganizationIdFromEnvironmentId(survey.environmentId);
     if (!organizationId) {
-      throw new ResourceNotFoundError("Organization", null);
+      throw new Error("Organization ID not found");
     }
 
     const organizationBilling = await getOrganizationBilling(organizationId);

apps/web/lib/time.test.ts

@@ -1,13 +1,62 @@
 import { describe, expect, test } from "vitest";
 import {
+  convertDateString,
+  convertDateTimeString,
+  convertDateTimeStringShort,
   convertDatesInObject,
+  convertTimeString,
   formatDate,
+  getTodaysDateFormatted,
   getTodaysDateTimeFormatted,
   timeSince,
   timeSinceDate,
 } from "./time";
 
 describe("Time Utilities", () => {
+  describe("convertDateString", () => {
+    test("should format date string correctly", () => {
+      expect(convertDateString("2024-03-20:12:30:00")).toBe("Mar 20, 2024");
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateString("")).toBe("");
+    });
+
+    test("should return null for null input", () => {
+      expect(convertDateString(null as any)).toBe(null);
+    });
+
+    test("should handle invalid date strings", () => {
+      expect(convertDateString("not-a-date")).toBe("Invalid Date");
+    });
+  });
+
+  describe("convertDateTimeString", () => {
+    test("should format date and time string correctly", () => {
+      expect(convertDateTimeString("2024-03-20T15:30:00")).toBe("Wednesday, March 20, 2024 at 3:30 PM");
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateTimeString("")).toBe("");
+    });
+  });
+
+  describe("convertDateTimeStringShort", () => {
+    test("should format date and time string in short format", () => {
+      expect(convertDateTimeStringShort("2024-03-20T15:30:00")).toBe("March 20, 2024 at 3:30 PM");
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateTimeStringShort("")).toBe("");
+    });
+  });
+
+  describe("convertTimeString", () => {
+    test("should format time string correctly", () => {
+      expect(convertTimeString("2024-03-20T15:30:45")).toBe("3:30:45 PM");
+    });
+  });
+
   describe("timeSince", () => {
     test("should format time since in English", () => {
       const now = new Date();
@@ -26,18 +75,6 @@ describe("Time Utilities", () => {
       const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
       expect(timeSince(oneHourAgo.toISOString(), "sv-SE")).toBe("ungefär en timme sedan");
     });
-
-    test("should format time since in Brazilian Portuguese", () => {
-      const now = new Date();
-      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
-      expect(timeSince(oneHourAgo.toISOString(), "pt-BR")).toBe("há cerca de 1 hora");
-    });
-
-    test("should format time since in European Portuguese", () => {
-      const now = new Date();
-      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
-      expect(timeSince(oneHourAgo.toISOString(), "pt-PT")).toBe("há aproximadamente 1 hora");
-    });
   });
 
   describe("timeSinceDate", () => {
@@ -46,12 +83,6 @@ describe("Time Utilities", () => {
       const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
       expect(timeSinceDate(oneHourAgo)).toBe("about 1 hour ago");
     });
-
-    test("should format time since from Date object in the provided locale", () => {
-      const now = new Date();
-      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
-      expect(timeSinceDate(oneHourAgo, "de-DE")).toBe("vor etwa 1 Stunde");
-    });
   });
 
   describe("formatDate", () => {
@@ -59,17 +90,13 @@ describe("Time Utilities", () => {
       const date = new Date(2024, 2, 20); // March is month 2 (0-based)
       expect(formatDate(date)).toBe("March 20, 2024");
     });
+  });
 
-    test("should format date with the provided locale", () => {
-      const date = new Date(2024, 2, 20);
-
-      expect(formatDate(date, "de-DE")).toBe(
-        new Intl.DateTimeFormat("de-DE", {
-          year: "numeric",
-          month: "long",
-          day: "numeric",
-        }).format(date)
-      );
+  describe("getTodaysDateFormatted", () => {
+    test("should format today's date with specified separator", () => {
+      const today = new Date();
+      const expected = today.toISOString().split("T")[0].split("-").join(".");
+      expect(getTodaysDateFormatted(".")).toBe(expected);
     });
   });
 

apps/web/lib/time.ts

@@ -1,33 +1,120 @@
-import { type Locale, formatDistance } from "date-fns";
+import { formatDistance, intlFormat } from "date-fns";
 import { de, enUS, es, fr, hu, ja, nl, pt, ptBR, ro, ru, sv, zhCN, zhTW } from "date-fns/locale";
 import { TUserLocale } from "@formbricks/types/user";
-import { formatDateForDisplay } from "./utils/datetime";
 
-const DEFAULT_LOCALE: TUserLocale = "en-US";
-const TIME_SINCE_LOCALES: Record<TUserLocale, Locale> = {
-  "de-DE": de,
-  "en-US": enUS,
-  "es-ES": es,
-  "fr-FR": fr,
-  "hu-HU": hu,
-  "ja-JP": ja,
-  "nl-NL": nl,
-  "pt-BR": ptBR,
-  "pt-PT": pt,
-  "ro-RO": ro,
-  "ru-RU": ru,
-  "sv-SE": sv,
-  "zh-Hans-CN": zhCN,
-  "zh-Hant-TW": zhTW,
+export const convertDateString = (dateString: string | null) => {
+  if (dateString === null) return null;
+  if (!dateString) {
+    return dateString;
+  }
+
+  const date = new Date(dateString);
+  if (isNaN(date.getTime())) {
+    return "Invalid Date";
+  }
+  return intlFormat(
+    date,
+    {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    },
+    {
+      locale: "en",
+    }
+  );
 };
 
-const isUserLocale = (locale: string): locale is TUserLocale => Object.hasOwn(TIME_SINCE_LOCALES, locale);
+export const convertDateTimeString = (dateString: string) => {
+  if (!dateString) {
+    return dateString;
+  }
+  const date = new Date(dateString);
+  return intlFormat(
+    date,
+    {
+      weekday: "long",
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+    },
+    {
+      locale: "en",
+    }
+  );
+};
 
-/** Maps locale strings to date-fns locales and falls back to English for unsupported inputs. */
-const getLocaleForTimeSince = (locale: string): Locale =>
-  isUserLocale(locale) ? TIME_SINCE_LOCALES[locale] : enUS;
+export const convertDateTimeStringShort = (dateString: string) => {
+  if (!dateString) {
+    return dateString;
+  }
+  const date = new Date(dateString);
+  return intlFormat(
+    date,
+    {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+    },
+    {
+      locale: "en",
+    }
+  );
+};
 
-export const timeSince = (dateString: string, locale: string = DEFAULT_LOCALE) => {
+export const convertTimeString = (dateString: string) => {
+  const date = new Date(dateString);
+  return intlFormat(
+    date,
+    {
+      hour: "numeric",
+      minute: "2-digit",
+      second: "2-digit",
+    },
+    {
+      locale: "en",
+    }
+  );
+};
+
+const getLocaleForTimeSince = (locale: TUserLocale) => {
+  switch (locale) {
+    case "de-DE":
+      return de;
+    case "en-US":
+      return enUS;
+    case "es-ES":
+      return es;
+    case "fr-FR":
+      return fr;
+    case "hu-HU":
+      return hu;
+    case "ja-JP":
+      return ja;
+    case "nl-NL":
+      return nl;
+    case "pt-BR":
+      return ptBR;
+    case "pt-PT":
+      return pt;
+    case "ro-RO":
+      return ro;
+    case "ru-RU":
+      return ru;
+    case "sv-SE":
+      return sv;
+    case "zh-Hans-CN":
+      return zhCN;
+    case "zh-Hant-TW":
+      return zhTW;
+  }
+};
+
+export const timeSince = (dateString: string, locale: TUserLocale) => {
   const date = new Date(dateString);
   return formatDistance(date, new Date(), {
     addSuffix: true,
@@ -35,21 +122,27 @@ export const timeSince = (dateString: string, locale: string = DEFAULT_LOCALE) =
   });
 };
 
-export const timeSinceDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
+export const timeSinceDate = (date: Date) => {
   return formatDistance(date, new Date(), {
     addSuffix: true,
-    locale: getLocaleForTimeSince(locale),
   });
 };
 
-export const formatDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
-  return formatDateForDisplay(date, locale, {
+export const formatDate = (date: Date) => {
+  return intlFormat(date, {
     year: "numeric",
     month: "long",
     day: "numeric",
   });
 };
 
+export const getTodaysDateFormatted = (seperator: string) => {
+  const date = new Date();
+  const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);
+
+  return formattedDate;
+};
+
 export const getTodaysDateTimeFormatted = (seperator: string) => {
   const date = new Date();
   const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);

apps/web/lib/utils/date-display.test.ts

@@ -1,67 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { type TSurveyElement } from "@formbricks/types/surveys/elements";
-import { formatStoredDateForDisplay, getSurveyDateFormatMap, parseStoredDateValue } from "./date-display";
-
-describe("date display utils", () => {
-  test("parses ISO stored dates", () => {
-    const parsedDate = parseStoredDateValue("2025-05-06");
-
-    expect(parsedDate).not.toBeNull();
-    expect(parsedDate?.getFullYear()).toBe(2025);
-    expect(parsedDate?.getMonth()).toBe(4);
-    expect(parsedDate?.getDate()).toBe(6);
-  });
-
-  test("parses legacy stored dates using the element format", () => {
-    const parsedDate = parseStoredDateValue("5-6-2025", "M-d-y");
-
-    expect(parsedDate).not.toBeNull();
-    expect(parsedDate?.getFullYear()).toBe(2025);
-    expect(parsedDate?.getMonth()).toBe(4);
-    expect(parsedDate?.getDate()).toBe(6);
-  });
-
-  test("parses day-first stored dates when no format is provided", () => {
-    const parsedDate = parseStoredDateValue("06-05-2025");
-
-    expect(parsedDate).not.toBeNull();
-    expect(parsedDate?.getFullYear()).toBe(2025);
-    expect(parsedDate?.getMonth()).toBe(4);
-    expect(parsedDate?.getDate()).toBe(6);
-  });
-
-  test("formats stored dates using the selected locale", () => {
-    const date = new Date(2025, 4, 6);
-
-    expect(formatStoredDateForDisplay("2025-05-06", undefined, "de-DE")).toBe(
-      new Intl.DateTimeFormat("de-DE", {
-        weekday: "long",
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-      }).format(date)
-    );
-  });
-
-  test("returns null for invalid stored dates", () => {
-    expect(formatStoredDateForDisplay("2025-02-30", "y-M-d")).toBeNull();
-  });
-
-  test("builds a date format map for survey date elements", () => {
-    const elements = [
-      {
-        id: "dateQuestion",
-        type: "date",
-        format: "d-M-y",
-      },
-      {
-        id: "textQuestion",
-        type: "openText",
-      },
-    ] as TSurveyElement[];
-
-    expect(getSurveyDateFormatMap(elements)).toEqual({
-      dateQuestion: "d-M-y",
-    });
-  });
-});

apps/web/lib/utils/date-display.ts

@@ -1,85 +0,0 @@
-import type { TSurveyDateElement, TSurveyElement } from "@formbricks/types/surveys/elements";
-import { formatDateWithOrdinal } from "./datetime";
-
-export type TSurveyDateFormatMap = Partial<Record<string, TSurveyDateElement["format"]>>;
-
-const ISO_STORED_DATE_PATTERN = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
-
-const buildDate = (year: number, month: number, day: number): Date | null => {
-  if ([year, month, day].some((value) => Number.isNaN(value))) {
-    return null;
-  }
-
-  const parsedDate = new Date(year, month - 1, day);
-
-  if (
-    parsedDate.getFullYear() !== year ||
-    parsedDate.getMonth() !== month - 1 ||
-    parsedDate.getDate() !== day
-  ) {
-    return null;
-  }
-
-  return parsedDate;
-};
-
-const parseLegacyStoredDateValue = (value: string, format: TSurveyDateElement["format"]): Date | null => {
-  const parts = value.split("-");
-
-  if (parts.length !== 3 || parts.some((part) => !/^\d{1,4}$/.test(part))) {
-    return null;
-  }
-
-  const [first, second, third] = parts.map(Number);
-
-  switch (format) {
-    case "M-d-y":
-      return buildDate(third, first, second);
-    case "d-M-y":
-      return buildDate(third, second, first);
-    case "y-M-d":
-      return buildDate(first, second, third);
-  }
-};
-
-export const parseStoredDateValue = (value: string, format?: TSurveyDateElement["format"]): Date | null => {
-  const isoMatch = ISO_STORED_DATE_PATTERN.exec(value);
-
-  if (isoMatch) {
-    return buildDate(Number(isoMatch[1]), Number(isoMatch[2]), Number(isoMatch[3]));
-  }
-
-  if (format) {
-    return parseLegacyStoredDateValue(value, format);
-  }
-
-  if (/^\d{1,2}-\d{1,2}-\d{4}$/.test(value)) {
-    return parseLegacyStoredDateValue(value, "d-M-y");
-  }
-
-  return null;
-};
-
-export const formatStoredDateForDisplay = (
-  value: string,
-  format: TSurveyDateElement["format"] | undefined,
-  locale: string = "en-US"
-): string | null => {
-  const parsedDate = parseStoredDateValue(value, format);
-
-  if (!parsedDate) {
-    return null;
-  }
-
-  return formatDateWithOrdinal(parsedDate, locale);
-};
-
-export const getSurveyDateFormatMap = (elements: TSurveyElement[]): TSurveyDateFormatMap => {
-  return elements.reduce<TSurveyDateFormatMap>((dateFormats, element) => {
-    if (element.type === "date") {
-      dateFormats[element.id] = element.format;
-    }
-
-    return dateFormats;
-  }, {});
-};

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

@@ -1,12 +1,5 @@
 import { describe, expect, test } from "vitest";
-import {
-  diffInDays,
-  formatDateForDisplay,
-  formatDateTimeForDisplay,
-  formatDateWithOrdinal,
-  getFormattedDateTimeString,
-  isValidDateString,
-} from "./datetime";
+import { diffInDays, formatDateWithOrdinal, getFormattedDateTimeString, isValidDateString } from "./datetime";
 
 describe("datetime utils", () => {
   test("diffInDays calculates the difference in days between two dates", () => {
@@ -15,45 +8,13 @@ describe("datetime utils", () => {
     expect(diffInDays(date1, date2)).toBe(5);
   });
 
-  test("formatDateWithOrdinal formats a date using the provided locale", () => {
+  test("formatDateWithOrdinal formats a date with ordinal suffix", () => {
     // Create a date that's fixed to May 6, 2025 at noon UTC
     // Using noon ensures the date won't change in most timezones
     const date = new Date(Date.UTC(2025, 4, 6, 12, 0, 0));
 
-    expect(formatDateWithOrdinal(date)).toBe(
-      new Intl.DateTimeFormat("en-US", {
-        weekday: "long",
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-      }).format(date)
-    );
-  });
-
-  test("formatDateForDisplay uses the provided locale", () => {
-    const date = new Date(Date.UTC(2025, 4, 6, 12, 0, 0));
-
-    expect(formatDateForDisplay(date, "de-DE")).toBe(
-      new Intl.DateTimeFormat("de-DE", {
-        year: "numeric",
-        month: "short",
-        day: "numeric",
-      }).format(date)
-    );
-  });
-
-  test("formatDateTimeForDisplay uses the provided locale", () => {
-    const date = new Date(Date.UTC(2025, 4, 6, 12, 30, 0));
-
-    expect(formatDateTimeForDisplay(date, "fr-FR")).toBe(
-      new Intl.DateTimeFormat("fr-FR", {
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-        hour: "numeric",
-        minute: "2-digit",
-      }).format(date)
-    );
+    // Test the function
+    expect(formatDateWithOrdinal(date)).toBe("Tuesday, May 6th, 2025");
   });
 
   test("isValidDateString validates correct date strings", () => {

apps/web/lib/utils/datetime.ts

@@ -1,17 +1,7 @@
-const DEFAULT_LOCALE = "en-US";
-
-const DEFAULT_DATE_DISPLAY_OPTIONS: Intl.DateTimeFormatOptions = {
-  year: "numeric",
-  month: "short",
-  day: "numeric",
-};
-
-const DEFAULT_DATE_TIME_DISPLAY_OPTIONS: Intl.DateTimeFormatOptions = {
-  year: "numeric",
-  month: "long",
-  day: "numeric",
-  hour: "numeric",
-  minute: "2-digit",
+const getOrdinalSuffix = (day: number) => {
+  const suffixes = ["th", "st", "nd", "rd"];
+  const relevantDigits = day < 30 ? day % 20 : day % 30;
+  return suffixes[relevantDigits <= 3 ? relevantDigits : 0];
 };
 
 // Helper function to calculate difference in days between two dates
@@ -20,44 +10,23 @@ export const diffInDays = (date1: Date, date2: Date) => {
   return Math.floor(diffTime / (1000 * 60 * 60 * 24));
 };
 
-export const formatDateForDisplay = (
-  date: Date,
-  locale: string = DEFAULT_LOCALE,
-  options: Intl.DateTimeFormatOptions = DEFAULT_DATE_DISPLAY_OPTIONS
-): string => {
-  return new Intl.DateTimeFormat(locale, options).format(date);
-};
-
-export const formatDateTimeForDisplay = (
-  date: Date,
-  locale: string = DEFAULT_LOCALE,
-  options: Intl.DateTimeFormatOptions = DEFAULT_DATE_TIME_DISPLAY_OPTIONS
-): string => {
-  return new Intl.DateTimeFormat(locale, options).format(date);
-};
-
-export const formatDateWithOrdinal = (date: Date, locale: string = DEFAULT_LOCALE): string => {
-  return formatDateForDisplay(date, locale, {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-  });
+export const formatDateWithOrdinal = (date: Date, locale: string = "en-US"): string => {
+  const dayOfWeek = new Intl.DateTimeFormat(locale, { weekday: "long" }).format(date);
+  const day = date.getDate();
+  const month = new Intl.DateTimeFormat(locale, { month: "long" }).format(date);
+  const year = date.getFullYear();
+  return `${dayOfWeek}, ${month} ${day}${getOrdinalSuffix(day)}, ${year}`;
 };
 
 export const isValidDateString = (value: string) => {
-  const regex = /^(?:\d{4}-\d{1,2}-\d{1,2}|\d{1,2}-\d{1,2}-\d{4})$/;
+  const regex = /^(?:\d{4}-\d{2}-\d{2}|\d{2}-\d{2}-\d{4})$/;
 
   if (!regex.test(value)) {
     return false;
   }
 
-  const normalizedValue = /^\d{1,2}-\d{1,2}-\d{4}$/.test(value)
-    ? value.replace(/(\d{1,2})-(\d{1,2})-(\d{4})/, "$3-$2-$1")
-    : value;
-
-  const date = new Date(normalizedValue);
-  return !Number.isNaN(date.getTime());
+  const date = new Date(value);
+  return date;
 };
 
 export const getFormattedDateTimeString = (date: Date): string => {

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

@@ -32,17 +32,16 @@ vi.mock("@/lib/pollyfills/structuredClone", () => ({
   structuredClone: vi.fn((obj) => JSON.parse(JSON.stringify(obj))),
 }));
 
-vi.mock("@/lib/utils/date-display", () => ({
-  formatStoredDateForDisplay: vi.fn((value: string, format: string | undefined, locale: string) => {
-    if (value === "2023-01-01") {
-      return `formatted-${locale}-${format ?? "iso"}`;
+vi.mock("@/lib/utils/datetime", () => ({
+  isValidDateString: vi.fn((value) => {
+    try {
+      return !isNaN(new Date(value as string).getTime());
+    } catch {
+      return false;
     }
-
-    if (value === "01-02-2023" && format === "M-d-y") {
-      return `legacy-${locale}-${format}`;
-    }
-
-    return null;
+  }),
+  formatDateWithOrdinal: vi.fn(() => {
+    return "January 1st, 2023";
   }),
 }));
 
@@ -478,20 +477,7 @@ describe("recall utility functions", () => {
       };
 
       const result = parseRecallInfo(text, responseData);
-      expect(result).toBe("You joined on formatted-en-US-iso");
-    });
-
-    test("formats legacy date values using the provided locale and stored format", () => {
-      const text = "You joined on #recall:joinDate/fallback:an-unknown-date#";
-      const responseData: TResponseData = {
-        joinDate: "01-02-2023",
-      };
-
-      const result = parseRecallInfo(text, responseData, undefined, false, "fr-FR", {
-        joinDate: "M-d-y",
-      });
-
-      expect(result).toBe("You joined on legacy-fr-FR-M-d-y");
+      expect(result).toBe("You joined on January 1st, 2023");
     });
 
     test("formats array values as comma-separated list", () => {

apps/web/lib/utils/recall.ts

@@ -6,7 +6,7 @@ import { getTextContent } from "@formbricks/types/surveys/validation";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { structuredClone } from "@/lib/pollyfills/structuredClone";
 import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
-import { type TSurveyDateFormatMap, formatStoredDateForDisplay } from "./date-display";
+import { formatDateWithOrdinal, isValidDateString } from "./datetime";
 
 export interface fallbacks {
   [id: string]: string;
@@ -224,9 +224,7 @@ export const parseRecallInfo = (
   text: string,
   responseData?: TResponseData,
   variables?: TResponseVariables,
-  withSlash: boolean = false,
-  locale: string = "en-US",
-  dateFormats?: TSurveyDateFormatMap
+  withSlash: boolean = false
 ) => {
   let modifiedText = text;
   const questionIds = responseData ? Object.keys(responseData) : [];
@@ -256,14 +254,12 @@ export const parseRecallInfo = (
       value = responseData[recallItemId];
 
       // Apply formatting for special value types
-      if (typeof value === "string") {
-        const formattedDate = formatStoredDateForDisplay(value, dateFormats?.[recallItemId], locale);
-
-        if (formattedDate) {
-          value = formattedDate;
+      if (value) {
+        if (isValidDateString(value as string)) {
+          value = formatDateWithOrdinal(new Date(value as string));
+        } else if (Array.isArray(value)) {
+          value = value.filter((item) => item).join(", ");
         }
-      } else if (Array.isArray(value)) {
-        value = value.filter((item) => item).join(", ");
       }
     }
 

apps/web/lib/utils/validate-webhook-url.test.ts

@@ -9,10 +9,6 @@ vi.mock("node:dns", () => ({
   },
 }));
 
-vi.mock("../constants", () => ({
-  DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: false,
-}));
-
 const mockResolve = vi.mocked(dns.resolve);
 const mockResolve6 = vi.mocked(dns.resolve6);
 
@@ -298,78 +294,4 @@ describe("validateWebhookUrl", () => {
       });
     });
   });
-
-  describe("DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS", () => {
-    test("allows private IP URLs when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("http://127.0.0.1/")).resolves.toBeUndefined();
-      await expect(validateWithFlag("http://192.168.1.1/test")).resolves.toBeUndefined();
-      await expect(validateWithFlag("http://10.0.0.1/webhook")).resolves.toBeUndefined();
-    });
-
-    test("allows localhost when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("http://localhost/webhook")).resolves.toBeUndefined();
-      await expect(validateWithFlag("http://localhost:3333/webhook")).resolves.toBeUndefined();
-    });
-
-    test("allows localhost.localdomain when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("http://localhost.localdomain/path")).resolves.toBeUndefined();
-    });
-
-    test("allows hostname resolving to private IP when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      setupDnsResolution(["192.168.1.1"]);
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("https://internal.company.com/webhook")).resolves.toBeUndefined();
-    });
-
-    test("still rejects unresolvable hostnames when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      setupDnsResolution(null, null);
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("https://typo-gibberish.invalid/hook")).rejects.toThrow(
-        "Could not resolve webhook URL hostname"
-      );
-    });
-
-    test("still rejects invalid URL format when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("not-a-url")).rejects.toThrow("Invalid webhook URL format");
-    });
-
-    test("still rejects non-HTTP protocols when enabled", async () => {
-      vi.doMock("../constants", () => ({
-        DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS: true,
-      }));
-
-      const { validateWebhookUrl: validateWithFlag } = await import("./validate-webhook-url");
-      await expect(validateWithFlag("ftp://192.168.1.1/")).rejects.toThrow(
-        "Webhook URL must use HTTPS or HTTP protocol"
-      );
-    });
-  });
 });

apps/web/lib/utils/validate-webhook-url.ts

@@ -1,7 +1,6 @@
 import "server-only";
 import dns from "node:dns";
 import { InvalidInputError } from "@formbricks/types/errors";
-import { DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS } from "../constants";
 
 const BLOCKED_HOSTNAMES = new Set([
   "localhost",
@@ -140,10 +139,8 @@ export const validateWebhookUrl = async (url: string): Promise<void> => {
 
   const hostname = parsed.hostname;
 
-  if (!DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS) {
-    if (BLOCKED_HOSTNAMES.has(hostname.toLowerCase())) {
-      throw new InvalidInputError("Webhook URL must not point to localhost or internal services");
-    }
+  if (BLOCKED_HOSTNAMES.has(hostname.toLowerCase())) {
+    throw new InvalidInputError("Webhook URL must not point to localhost or internal services");
   }
 
   // Direct IP literal — validate without DNS resolution
@@ -152,17 +149,12 @@ export const validateWebhookUrl = async (url: string): Promise<void> => {
 
   if (isIPv4Literal || isIPv6Literal) {
     const ip = isIPv6Literal ? stripIPv6Brackets(hostname) : hostname;
-    if (!DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS && isPrivateIP(ip)) {
+    if (isPrivateIP(ip)) {
       throw new InvalidInputError("Webhook URL must not point to private or internal IP addresses");
     }
     return;
   }
 
-  // Skip DNS resolution for localhost-like hostnames when internal URLs are allowed since these are resolved via /etc/hosts and not DNS
-  if (DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS && BLOCKED_HOSTNAMES.has(hostname.toLowerCase())) {
-    return;
-  }
-
   // Domain name — resolve DNS and validate every resolved IP
   let resolvedIPs: string[];
   try {
@@ -176,11 +168,9 @@ export const validateWebhookUrl = async (url: string): Promise<void> => {
     );
   }
 
-  if (!DANGEROUSLY_ALLOW_WEBHOOK_INTERNAL_URLS) {
-    for (const ip of resolvedIPs) {
-      if (isPrivateIP(ip)) {
-        throw new InvalidInputError("Webhook URL must not point to private or internal IP addresses");
-      }
+  for (const ip of resolvedIPs) {
+    if (isPrivateIP(ip)) {
+      throw new InvalidInputError("Webhook URL must not point to private or internal IP addresses");
     }
   }
 };

apps/web/locales/de-DE.json

@@ -167,7 +167,6 @@
     "connect": "Verbinden",
     "connect_formbricks": "Formbricks verbinden",
     "connected": "Verbunden",
-    "contact": "Kontakt",
     "contacts": "Kontakte",
     "continue": "Weitermachen",
     "copied": "Kopiert",
@@ -175,7 +174,6 @@
     "copy": "Kopieren",
     "copy_code": "Code kopieren",
     "copy_link": "Link kopieren",
-    "copy_to_environment": "In {{environment}} kopieren",
     "count_attributes": "{count, plural, one {{count} Attribut} other {{count} Attribute}}",
     "count_contacts": "{count, plural, one {{count} Kontakt} other {{count} Kontakte}}",
     "count_members": "{count, plural, one {{count} Mitglied} other {{count} Mitglieder}}",
@@ -215,12 +213,12 @@
     "duplicate_copy_number": "(Kopie {copyNumber})",
     "e_commerce": "E-Commerce",
     "edit": "Bearbeiten",
-    "elements": "Elemente",
     "email": "E-Mail",
     "ending_card": "Abschluss-Karte",
     "enter_url": "URL eingeben",
     "enterprise_license": "Enterprise Lizenz",
     "environment": "Umgebung",
+    "environment_not_found": "Umgebung nicht gefunden",
     "environment_notice": "Du befindest dich derzeit in der {environment}-Umgebung.",
     "error": "Fehler",
     "error_component_description": "Diese Ressource existiert nicht oder Du hast nicht die notwendigen Rechte, um darauf zuzugreifen.",
@@ -257,7 +255,7 @@
     "inactive_surveys": "Inaktive Umfragen",
     "integration": "Integration",
     "integrations": "Integrationen",
-    "invalid_date_with_value": "Ungültiges Datum: {value}",
+    "invalid_date": "Ungültiges Datum",
     "invalid_file_name": "Ungültiger Dateiname, bitte benennen Sie Ihre Datei um und versuchen Sie es erneut",
     "invalid_file_type": "Ungültiger Dateityp",
     "invite": "Einladen",
@@ -284,9 +282,7 @@
     "marketing": "Marketing",
     "members": "Mitglieder",
     "members_and_teams": "Mitglieder & Teams",
-    "membership": "Mitgliedschaft",
     "membership_not_found": "Mitgliedschaft nicht gefunden",
-    "meta": "Meta",
     "metadata": "Metadaten",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funktioniert am besten auf einem größeren Bildschirm. Um Umfragen zu verwalten oder zu erstellen, wechsle zu einem anderen Gerät.",
     "mobile_overlay_surveys_look_good": "Keine Sorge – deine Umfragen sehen auf jedem Gerät und jeder Bildschirmgröße großartig aus!",
@@ -300,7 +296,6 @@
     "new": "Neu",
     "new_version_available": "Formbricks {version} ist da. Jetzt aktualisieren!",
     "next": "Weiter",
-    "no_actions_found": "Keine Aktionen gefunden",
     "no_background_image_found": "Kein Hintergrundbild gefunden.",
     "no_code": "No Code",
     "no_files_uploaded": "Keine Dateien hochgeladen",
@@ -326,9 +321,10 @@
     "or": "oder",
     "organization": "Organisation",
     "organization_id": "Organisations-ID",
+    "organization_not_found": "Organisation nicht gefunden",
     "organization_settings": "Organisationseinstellungen",
+    "organization_teams_not_found": "Organisations-Teams nicht gefunden",
     "other": "Andere",
-    "other_filters": "Weitere Filter",
     "others": "Andere",
     "overlay_color": "Overlay-Farbe",
     "overview": "Überblick",
@@ -345,7 +341,6 @@
     "please_select_at_least_one_survey": "Bitte wähle mindestens eine Umfrage aus",
     "please_select_at_least_one_trigger": "Bitte wähle mindestens einen Auslöser aus",
     "please_upgrade_your_plan": "Bitte aktualisieren Sie Ihren Plan",
-    "powered_by_formbricks": "Bereitgestellt von Formbricks",
     "preview": "Vorschau",
     "preview_survey": "Umfragevorschau",
     "privacy": "Datenschutz",
@@ -387,7 +382,6 @@
     "select": "Auswählen",
     "select_all": "Alles auswählen",
     "select_filter": "Filter auswählen",
-    "select_language": "Sprache auswählen",
     "select_survey": "Umfrage auswählen",
     "select_teams": "Teams auswählen",
     "selected": "Ausgewählt",
@@ -407,7 +401,7 @@
     "something_went_wrong": "Etwas ist schiefgelaufen",
     "something_went_wrong_please_try_again": "Etwas ist schiefgelaufen. Bitte versuche es noch einmal.",
     "sort_by": "Sortieren nach",
-    "start_free_trial": "Kostenlose Testversion starten",
+    "start_free_trial": "Kostenlos starten",
     "status": "Status",
     "step_by_step_manual": "Schritt-für-Schritt-Anleitung",
     "storage_not_configured": "Dateispeicher nicht eingerichtet, Uploads werden wahrscheinlich fehlschlagen",
@@ -420,6 +414,7 @@
     "survey_id": "Umfrage-ID",
     "survey_languages": "Umfragesprachen",
     "survey_live": "Umfrage live",
+    "survey_not_found": "Umfrage nicht gefunden",
     "survey_paused": "Umfrage pausiert.",
     "survey_type": "Umfragetyp",
     "surveys": "Umfragen",
@@ -434,15 +429,13 @@
     "team_name": "Teamname",
     "team_role": "Team-Rolle",
     "teams": "Teams",
+    "teams_not_found": "Teams nicht gefunden",
     "text": "Text",
     "time": "Zeit",
     "time_to_finish": "Zeit zum Fertigstellen",
     "title": "Titel",
     "top_left": "Oben links",
     "top_right": "Oben rechts",
-    "trial_days_remaining": "Noch {count} Tage in deiner Testphase",
-    "trial_expired": "Deine Testphase ist abgelaufen",
-    "trial_one_day_remaining": "Noch 1 Tag in deiner Testphase",
     "try_again": "Versuch's nochmal",
     "type": "Typ",
     "unknown_survey": "Unbekannte Umfrage",
@@ -450,13 +443,13 @@
     "update": "Aktualisierung",
     "updated": "Aktualisiert",
     "updated_at": "Aktualisiert am",
-    "upgrade_plan": "Plan upgraden",
     "upload": "Hochladen",
     "upload_failed": "Upload fehlgeschlagen. Bitte versuche es erneut.",
     "upload_input_description": "Klicke oder ziehe, um Dateien hochzuladen.",
     "url": "URL",
     "user": "Benutzer",
     "user_id": "Benutzer-ID",
+    "user_not_found": "Benutzer nicht gefunden",
     "variable": "Variable",
     "variable_ids": "Variablen-IDs",
     "variables": "Variablen",
@@ -472,13 +465,14 @@
     "weeks": "Wochen",
     "welcome_card": "Willkommenskarte",
     "workflows": "Workflows",
-    "workspace": "Arbeitsbereich",
     "workspace_configuration": "Projektkonfiguration",
     "workspace_created_successfully": "Projekt erfolgreich erstellt",
     "workspace_creation_description": "Organisieren Sie Umfragen in Projekten für eine bessere Zugriffskontrolle.",
     "workspace_id": "Projekt-ID",
     "workspace_name": "Projektname",
     "workspace_name_placeholder": "z. B. Formbricks",
+    "workspace_not_found": "Projekt nicht gefunden",
+    "workspace_permission_not_found": "Projektberechtigung nicht gefunden",
     "workspaces": "Projekte",
     "years": "Jahre",
     "you": "Du",
@@ -663,6 +657,7 @@
       "attributes_msg_new_attribute_created": "Neues Attribut “{key}” mit Typ “{dataType}” erstellt",
       "attributes_msg_userid_already_exists": "Die Benutzer-ID existiert bereits für diese Umgebung und wurde nicht aktualisiert.",
       "contact_deleted_successfully": "Kontakt erfolgreich gelöscht",
+      "contact_not_found": "Kein solcher Kontakt gefunden",
       "contacts_table_refresh": "Kontakte aktualisieren",
       "contacts_table_refresh_success": "Kontakte erfolgreich aktualisiert",
       "create_attribute": "Attribut erstellen",
@@ -853,16 +848,9 @@
         "created_by_third_party": "Erstellt von einer dritten Partei",
         "discord_webhook_not_supported": "Discord-Webhooks werden derzeit nicht unterstützt.",
         "empty_webhook_message": "Deine Webhooks werden hier angezeigt, sobald Du sie hinzufügst ⏲️",
-        "endpoint_bad_gateway_error": "Ungültiges Gateway (502): Proxy-/Gateway-Fehler, Dienst nicht erreichbar",
-        "endpoint_gateway_timeout_error": "Gateway-Zeitüberschreitung (504): Gateway-Zeitüberschreitung, Dienst nicht erreichbar",
-        "endpoint_internal_server_error": "Interner Serverfehler (500): Der Dienst ist auf einen unerwarteten Fehler gestoßen",
-        "endpoint_method_not_allowed_error": "Methode nicht erlaubt (405): Der Endpoint existiert, akzeptiert aber keine POST-Anfragen",
-        "endpoint_not_found_error": "Nicht gefunden (404): Der Endpoint existiert nicht",
         "endpoint_pinged": "Juhu! Wir können den Webhook anpingen!",
         "endpoint_pinged_error": "Kann den Webhook nicht anpingen!",
-        "endpoint_service_unavailable_error": "Dienst nicht verfügbar (503): Dienst ist vorübergehend nicht verfügbar",
         "learn_to_verify": "Erfahren Sie, wie Sie Webhook-Signaturen verifizieren",
-        "no_triggers": "Keine Trigger",
         "please_check_console": "Bitte überprüfe die Konsole für weitere Details",
         "please_enter_a_url": "Bitte gib eine URL ein",
         "response_created": "Antwort erstellt",
@@ -982,80 +970,44 @@
         "api_keys_description": "Verwalte API-Schlüssel, um auf die Formbricks-Management-APIs zuzugreifen"
       },
       "billing": {
-        "add_payment_method": "Zahlungsmethode hinzufügen",
-        "add_payment_method_to_upgrade_tooltip": "Bitte füge oben eine Zahlungsmethode hinzu, um auf einen kostenpflichtigen Plan zu upgraden",
-        "billing_interval_toggle": "Abrechnungsintervall",
-        "current_plan_badge": "Aktuell",
-        "current_plan_cta": "Aktueller Tarif",
-        "custom_plan_description": "Deine Organisation nutzt ein individuelles Abrechnungsmodell. Du kannst trotzdem zu einem der Standardtarife unten wechseln.",
-        "custom_plan_title": "Individueller Tarif",
+        "cancelling": "Wird storniert",
         "failed_to_start_trial": "Die Testversion konnte nicht gestartet werden. Bitte versuche es erneut.",
-        "keep_current_plan": "Aktuellen Tarif beibehalten",
-        "manage_billing_details": "Kartendaten & Rechnungen verwalten",
-        "monthly": "Monatlich",
-        "most_popular": "Am beliebtesten",
-        "pending_change_removed": "Geplante Tarifänderung entfernt.",
-        "pending_plan_badge": "Geplant",
-        "pending_plan_change_description": "Dein Tarif wechselt am {{date}} zu {{plan}}.",
-        "pending_plan_change_title": "Geplante Tarifänderung",
-        "pending_plan_cta": "Geplant",
-        "per_month": "pro Monat",
-        "per_year": "pro Jahr",
-        "plan_change_applied": "Tarif erfolgreich aktualisiert.",
-        "plan_change_scheduled": "Tarifänderung erfolgreich geplant.",
+        "manage_subscription": "Abonnement verwalten",
         "plan_custom": "Custom",
-        "plan_feature_everything_in_hobby": "Alles aus Hobby",
-        "plan_feature_everything_in_pro": "Alles aus Pro",
         "plan_hobby": "Hobby",
-        "plan_hobby_description": "Für Einzelpersonen und kleine Teams, die mit Formbricks Cloud starten.",
-        "plan_hobby_feature_responses": "250 Antworten / Monat",
-        "plan_hobby_feature_workspaces": "1 Arbeitsbereich",
         "plan_pro": "Pro",
-        "plan_pro_description": "Für wachsende Teams, die höhere Limits, Automatisierungen und dynamische Überschreitungen benötigen.",
-        "plan_pro_feature_responses": "2.000 Antworten / Monat (dynamische Überschreitung)",
-        "plan_pro_feature_workspaces": "3 Arbeitsbereiche",
         "plan_scale": "Scale",
-        "plan_scale_description": "Für größere Teams, die mehr Kapazität, stärkere Governance und höheres Antwortvolumen benötigen.",
-        "plan_scale_feature_responses": "5.000 Antworten / Monat (dynamische Mehrnutzung)",
-        "plan_scale_feature_workspaces": "5 Arbeitsbereiche",
-        "plan_selection_description": "Vergleiche Hobby, Pro und Scale und wechsle dann direkt in Formbricks den Plan.",
-        "plan_selection_title": "Wähle deinen Plan",
         "plan_unknown": "Unbekannt",
         "remove_branding": "Branding entfernen",
         "retry_setup": "Erneut einrichten",
+        "scale_banner_description": "Schalte höhere Limits, Teamzusammenarbeit und erweiterte Sicherheitsfunktionen mit dem Scale-Tarif frei.",
+        "scale_banner_title": "Bereit für den nächsten Schritt?",
+        "scale_feature_api": "Vollständiger API-Zugang",
+        "scale_feature_quota": "Quotenverwaltung",
+        "scale_feature_spam": "Spamschutz",
+        "scale_feature_teams": "Teams & Zugriffsrollen",
         "select_plan_header_subtitle": "Keine Kreditkarte erforderlich, keine versteckten Bedingungen.",
-        "select_plan_header_title": "Nahtlos integrierte Umfragen, 100% deine Marke.",
+        "select_plan_header_title": "Versende noch heute professionelle Umfragen ohne Branding!",
         "status_trialing": "Trial",
         "stay_on_hobby_plan": "Ich möchte beim Hobby-Plan bleiben",
         "stripe_setup_incomplete": "Abrechnungseinrichtung unvollständig",
         "stripe_setup_incomplete_description": "Die Abrechnungseinrichtung war nicht erfolgreich. Bitte versuche es erneut, um Dein Abo zu aktivieren.",
         "subscription": "Abonnement",
         "subscription_description": "Verwalte Dein Abonnement und behalte Deine Nutzung im Blick",
-        "switch_at_period_end": "Am Ende der Periode wechseln",
-        "switch_plan_now": "Plan jetzt wechseln",
-        "this_includes": "Das beinhaltet",
-        "trial_alert_description": "Füge eine Zahlungsmethode hinzu, um weiterhin Zugriff auf alle Funktionen zu behalten.",
         "trial_already_used": "Für diese E-Mail-Adresse wurde bereits eine kostenlose Testversion genutzt. Bitte upgraden Sie stattdessen auf einen kostenpflichtigen Plan.",
-        "trial_feature_api_access": "API-Zugriff",
-        "trial_feature_attribute_segmentation": "Attributbasierte Segmentierung",
-        "trial_feature_contact_segment_management": "Kontakt- & Segmentverwaltung",
-        "trial_feature_email_followups": "E-Mail-Nachfassaktionen",
-        "trial_feature_hide_branding": "Formbricks-Branding ausblenden",
-        "trial_feature_mobile_sdks": "iOS & Android SDKs",
-        "trial_feature_respondent_identification": "Befragten-Identifikation",
-        "trial_feature_unlimited_seats": "Unbegrenzte Benutzerplätze",
-        "trial_feature_webhooks": "Individuelle Webhooks",
+        "trial_feature_api_access": "Vollen API-Zugriff erhalten",
+        "trial_feature_collaboration": "Alle Team- und Kollaborationsfunktionen",
+        "trial_feature_email_followups": "E-Mail-Nachfassaktionen einrichten",
+        "trial_feature_quotas": "Kontingente verwalten",
+        "trial_feature_webhooks": "Benutzerdefinierte Webhooks einrichten",
+        "trial_feature_whitelabel": "Vollständig white-labeled Umfragen",
         "trial_no_credit_card": "14 Tage Testversion, keine Kreditkarte erforderlich",
-        "trial_payment_method_added_description": "Alles bereit! Dein Pro-Tarif läuft nach Ende der Testphase automatisch weiter.",
-        "trial_title": "Hol dir Formbricks Pro kostenlos!",
+        "trial_title": "Pro-Funktionen kostenlos testen!",
         "unlimited_responses": "Unbegrenzte Antworten",
         "unlimited_workspaces": "Unbegrenzte Projekte",
         "upgrade": "Upgrade",
-        "upgrade_now": "Jetzt upgraden",
         "usage_cycle": "Usage cycle",
         "used": "verwendet",
-        "yearly": "Jährlich",
-        "yearly_checkout_unavailable": "Die jährliche Abrechnung ist noch nicht verfügbar. Füge zuerst eine Zahlungsmethode bei einem monatlichen Plan hinzu oder kontaktiere den Support.",
         "your_plan": "Dein Tarif"
       },
       "domain": {
@@ -1081,32 +1033,11 @@
         "enterprise_features": "Unternehmensfunktionen",
         "get_an_enterprise_license_to_get_access_to_all_features": "Hol dir eine Enterprise-Lizenz, um Zugriff auf alle Funktionen zu erhalten.",
         "keep_full_control_over_your_data_privacy_and_security": "Behalte die volle Kontrolle über deine Daten, Privatsphäre und Sicherheit.",
-        "license_feature_access_control": "Zugriffskontrolle (RBAC)",
-        "license_feature_audit_logs": "Audit-Protokolle",
-        "license_feature_contacts": "Kontakte & Segmente",
-        "license_feature_projects": "Arbeitsbereiche",
-        "license_feature_quotas": "Kontingente",
-        "license_feature_remove_branding": "Branding entfernen",
-        "license_feature_saml": "SAML SSO",
-        "license_feature_spam_protection": "Spam-Schutz",
-        "license_feature_sso": "OIDC SSO",
-        "license_feature_two_factor_auth": "Zwei-Faktor-Authentifizierung",
-        "license_feature_whitelabel": "White-Label-E-Mails",
-        "license_features_table_access": "Zugriff",
-        "license_features_table_description": "Enterprise-Funktionen und Limits, die für diese Instanz aktuell verfügbar sind.",
-        "license_features_table_disabled": "Deaktiviert",
-        "license_features_table_enabled": "Aktiviert",
-        "license_features_table_feature": "Funktion",
-        "license_features_table_title": "Lizenzierte Funktionen",
-        "license_features_table_unlimited": "Unbegrenzt",
-        "license_features_table_value": "Wert",
-        "license_instance_mismatch_description": "Diese Lizenz ist derzeit an eine andere Formbricks-Instanz gebunden. Falls diese Installation neu aufgebaut oder verschoben wurde, bitte den Formbricks-Support, die vorherige Instanzbindung zu entfernen.",
         "license_invalid_description": "Der Lizenzschlüssel in deiner ENTERPRISE_LICENSE_KEY-Umgebungsvariable ist nicht gültig. Bitte überprüfe auf Tippfehler oder fordere einen neuen Schlüssel an.",
         "license_status": "Lizenzstatus",
         "license_status_active": "Aktiv",
         "license_status_description": "Status deiner Enterprise-Lizenz.",
         "license_status_expired": "Abgelaufen",
-        "license_status_instance_mismatch": "An andere Instanz gebunden",
         "license_status_invalid": "Ungültige Lizenz",
         "license_status_unreachable": "Nicht erreichbar",
         "license_unreachable_grace_period": "Der Lizenzserver ist nicht erreichbar. Deine Enterprise-Funktionen bleiben während einer 3-tägigen Kulanzfrist bis zum {gracePeriodEnd} aktiv.",
@@ -1117,7 +1048,6 @@
         "questions_please_reach_out_to": "Fragen? Bitte melde Dich bei",
         "recheck_license": "Lizenz erneut prüfen",
         "recheck_license_failed": "Lizenzprüfung fehlgeschlagen. Der Lizenzserver ist möglicherweise nicht erreichbar.",
-        "recheck_license_instance_mismatch": "Diese Lizenz ist an eine andere Formbricks-Instanz gebunden. Bitte den Formbricks-Support, die vorherige Bindung zu entfernen.",
         "recheck_license_invalid": "Der Lizenzschlüssel ist ungültig. Bitte überprüfe deinen ENTERPRISE_LICENSE_KEY.",
         "recheck_license_success": "Lizenzprüfung erfolgreich",
         "recheck_license_unreachable": "Lizenzserver ist nicht erreichbar. Bitte versuche es später erneut.",
@@ -1421,6 +1351,7 @@
         "custom_hostname": "Benutzerdefinierter Hostname",
         "customize_survey_logo": "Umfragelogo anpassen",
         "darken_or_lighten_background_of_your_choice": "Hintergrund deiner Wahl abdunkeln oder aufhellen.",
+        "date_format": "Datumsformat",
         "days_before_showing_this_survey_again": "oder mehr Tage müssen zwischen der zuletzt angezeigten Umfrage und der Anzeige dieser Umfrage vergehen.",
         "delete_anyways": "Trotzdem löschen",
         "delete_block": "Block löschen",
@@ -1458,7 +1389,6 @@
         "error_saving_changes": "Fehler beim Speichern der Änderungen",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Mehrfachantworten erlauben; weiterhin anzeigen, auch nach einer Antwort (z.B. Feedback-Box).",
         "everyone": "Jeder",
-        "expand_preview": "Vorschau erweitern",
         "external_urls_paywall_tooltip": "Bitte upgrade auf einen kostenpflichtigen Tarif, um externe URLs anzupassen. So helfen wir, Phishing zu verhindern.",
         "fallback_missing": "Fehlender Fallback",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne es zuerst aus der Logik.",
@@ -1684,8 +1614,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Antwortlimit muss die Anzahl der erhaltenen Antworten ({responseCount}) überschreiten.",
         "response_limits_redirections_and_more": "Antwort Limits, Weiterleitungen und mehr.",
         "response_options": "Antwortoptionen",
-        "reverse_order_occasionally": "Reihenfolge gelegentlich umkehren",
-        "reverse_order_occasionally_except_last": "Reihenfolge gelegentlich umkehren, außer letzter",
         "roundness": "Rundheit",
         "roundness_description": "Steuert, wie abgerundet die Ecken sind.",
         "row_used_in_logic_error": "Diese Zeile wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne sie zuerst aus der Logik.",
@@ -1714,7 +1642,6 @@
         "show_survey_maximum_of": "Umfrage maximal anzeigen von",
         "show_survey_to_users": "Umfrage % der Nutzer anzeigen",
         "show_to_x_percentage_of_targeted_users": "Zeige {percentage}% der Zielbenutzer",
-        "shrink_preview": "Vorschau verkleinern",
         "simple": "Einfach",
         "six_points": "6 Punkte",
         "smiley": "Smiley",
@@ -1730,12 +1657,10 @@
         "styling_set_to_theme_styles": "Styling auf Themenstile eingestellt",
         "subheading": "Zwischenüberschrift",
         "subtract": "Subtrahieren -",
-        "survey_closed_message_heading_required": "Füge der benutzerdefinierten Nachricht für geschlossene Umfragen eine Überschrift hinzu.",
         "survey_completed_heading": "Umfrage abgeschlossen",
         "survey_completed_subheading": "Diese kostenlose und quelloffene Umfrage wurde geschlossen",
         "survey_display_settings": "Einstellungen zur Anzeige der Umfrage",
         "survey_placement": "Platzierung der Umfrage",
-        "survey_preview": "Umfragevorschau 👀",
         "survey_styling": "Umfrage Styling",
         "survey_trigger": "Auslöser der Umfrage",
         "switch_multi_language_on_to_get_started": "Aktiviere Mehrsprachigkeit, um loszulegen 👉",
@@ -3086,7 +3011,7 @@
     "preview_survey_question_2_choice_2_label": "Nein, danke!",
     "preview_survey_question_2_headline": "Möchtest Du auf dem Laufenden bleiben?",
     "preview_survey_question_2_subheader": "Dies ist eine Beispielbeschreibung.",
-    "preview_survey_question_open_text_headline": "Möchten Sie noch etwas mitteilen?",
+    "preview_survey_question_open_text_headline": "Möchtest Du noch etwas teilen?",
     "preview_survey_question_open_text_placeholder": "Tippe deine Antwort hier...",
     "preview_survey_question_open_text_subheader": "Dein Feedback hilft uns, besser zu werden.",
     "preview_survey_welcome_card_headline": "Willkommen!",
@@ -3341,7 +3266,7 @@
   "workflows": {
     "coming_soon_description": "Danke, dass du deine Workflow-Idee mit uns geteilt hast! Wir arbeiten gerade an diesem Feature und dein Feedback hilft uns dabei, genau das zu entwickeln, was du brauchst.",
     "coming_soon_title": "Wir sind fast da!",
-    "follow_up_label": "Möchten Sie noch etwas hinzufügen?",
+    "follow_up_label": "Gibt es noch etwas, das du hinzufügen möchtest?",
     "follow_up_placeholder": "Welche konkreten Aufgaben möchten Sie automatisieren? Gibt es Tools oder Integrationen, die Sie einbinden möchten?",
     "generate_button": "Workflow generieren",
     "heading": "Welchen Workflow möchtest du erstellen?",

apps/web/locales/en-US.json

@@ -167,7 +167,6 @@
     "connect": "Connect",
     "connect_formbricks": "Connect Formbricks",
     "connected": "Connected",
-    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continue",
     "copied": "Copied",
@@ -175,7 +174,6 @@
     "copy": "Copy",
     "copy_code": "Copy code",
     "copy_link": "Copy Link",
-    "copy_to_environment": "Copy to {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribute} other {{count} attributes}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} member} other {{count} members}}",
@@ -215,12 +213,12 @@
     "duplicate_copy_number": "(copy {copyNumber})",
     "e_commerce": "E-Commerce",
     "edit": "Edit",
-    "elements": "Elements",
     "email": "Email",
     "ending_card": "Ending card",
     "enter_url": "Enter URL",
     "enterprise_license": "Enterprise License",
     "environment": "Environment",
+    "environment_not_found": "Environment not found",
     "environment_notice": "You are currently in the {environment} environment.",
     "error": "Error",
     "error_component_description": "This resource does not exist or you do not have the necessary rights to access it.",
@@ -257,16 +255,16 @@
     "inactive_surveys": "Inactive surveys",
     "integration": "integration",
     "integrations": "Integrations",
-    "invalid_date_with_value": "Invalid date: {value}",
+    "invalid_date": "Invalid date",
     "invalid_file_name": "Invalid file name, please rename your file and try again",
     "invalid_file_type": "Invalid file type",
     "invite": "Invite",
     "invite_them": "Invite them",
-    "javascript_required": "JavaScript Required",
-    "javascript_required_description": "Formbricks requires JavaScript to function properly. Please enable JavaScript in your browser settings to continue.",
     "key": "Key",
     "label": "Label",
     "language": "Language",
+    "javascript_required": "JavaScript Required",
+    "javascript_required_description": "Formbricks requires JavaScript to function properly. Please enable JavaScript in your browser settings to continue.",
     "last_name": "Last Name",
     "learn_more": "Learn more",
     "license_expired": "License Expired",
@@ -284,9 +282,7 @@
     "marketing": "Marketing",
     "members": "Members",
     "members_and_teams": "Members & Teams",
-    "membership": "Membership",
     "membership_not_found": "Membership not found",
-    "meta": "Meta",
     "metadata": "Metadata",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks works best on a bigger screen. To manage or build surveys, switch to another device.",
     "mobile_overlay_surveys_look_good": "Do not worry – your surveys look great on every device and screen size!",
@@ -300,7 +296,6 @@
     "new": "New",
     "new_version_available": "Formbricks {version} is here. Upgrade now!",
     "next": "Next",
-    "no_actions_found": "No actions found",
     "no_background_image_found": "No background image found.",
     "no_code": "No code",
     "no_files_uploaded": "No files were uploaded",
@@ -326,9 +321,10 @@
     "or": "or",
     "organization": "Organization",
     "organization_id": "Organization ID",
+    "organization_not_found": "Organization not found",
     "organization_settings": "Organization settings",
+    "organization_teams_not_found": "Organization teams not found",
     "other": "Other",
-    "other_filters": "Other Filters",
     "others": "Others",
     "overlay_color": "Overlay color",
     "overview": "Overview",
@@ -345,7 +341,6 @@
     "please_select_at_least_one_survey": "Please select at least one survey",
     "please_select_at_least_one_trigger": "Please select at least one trigger",
     "please_upgrade_your_plan": "Please upgrade your plan",
-    "powered_by_formbricks": "Powered by Formbricks",
     "preview": "Preview",
     "preview_survey": "Preview Survey",
     "privacy": "Privacy Policy",
@@ -387,7 +382,6 @@
     "select": "Select",
     "select_all": "Select all",
     "select_filter": "Select filter",
-    "select_language": "Select Language",
     "select_survey": "Select Survey",
     "select_teams": "Select teams",
     "selected": "Selected",
@@ -407,7 +401,7 @@
     "something_went_wrong": "Something went wrong",
     "something_went_wrong_please_try_again": "Something went wrong. Please try again.",
     "sort_by": "Sort by",
-    "start_free_trial": "Start free trial",
+    "start_free_trial": "Start Free Trial",
     "status": "Status",
     "step_by_step_manual": "Step by step manual",
     "storage_not_configured": "File storage not set up, uploads will likely fail",
@@ -420,6 +414,7 @@
     "survey_id": "Survey ID",
     "survey_languages": "Survey Languages",
     "survey_live": "Survey live",
+    "survey_not_found": "Survey not found",
     "survey_paused": "Survey paused.",
     "survey_type": "Survey Type",
     "surveys": "Surveys",
@@ -434,15 +429,13 @@
     "team_name": "Team name",
     "team_role": "Team role",
     "teams": "Teams",
+    "teams_not_found": "Teams not found",
     "text": "Text",
     "time": "Time",
     "time_to_finish": "Time to finish",
     "title": "Title",
     "top_left": "Top Left",
     "top_right": "Top Right",
-    "trial_days_remaining": "{count} days left in your trial",
-    "trial_expired": "Your trial has expired",
-    "trial_one_day_remaining": "1 day left in your trial",
     "try_again": "Try again",
     "type": "Type",
     "unknown_survey": "Unknown survey",
@@ -450,13 +443,13 @@
     "update": "Update",
     "updated": "Updated",
     "updated_at": "Updated at",
-    "upgrade_plan": "Upgrade plan",
     "upload": "Upload",
     "upload_failed": "Upload failed. Please try again.",
     "upload_input_description": "Click or drag to upload files.",
     "url": "URL",
     "user": "User",
     "user_id": "User ID",
+    "user_not_found": "User not found",
     "variable": "Variable",
     "variable_ids": "Variable IDs",
     "variables": "Variables",
@@ -472,13 +465,14 @@
     "weeks": "weeks",
     "welcome_card": "Welcome card",
     "workflows": "Workflows",
-    "workspace": "Workspace",
     "workspace_configuration": "Workspace Configuration",
     "workspace_created_successfully": "Workspace created successfully",
     "workspace_creation_description": "Organize surveys in workspaces for better access control.",
     "workspace_id": "Workspace ID",
     "workspace_name": "Workspace Name",
     "workspace_name_placeholder": "e.g. Formbricks",
+    "workspace_not_found": "Workspace not found",
+    "workspace_permission_not_found": "Workspace permission not found",
     "workspaces": "Workspaces",
     "years": "years",
     "you": "You",
@@ -663,6 +657,7 @@
       "attributes_msg_new_attribute_created": "Created new attribute “{key}” with type “{dataType}”",
       "attributes_msg_userid_already_exists": "The user ID already exists for this environment and was not updated.",
       "contact_deleted_successfully": "Contact deleted successfully",
+      "contact_not_found": "No such contact found",
       "contacts_table_refresh": "Refresh contacts",
       "contacts_table_refresh_success": "Contacts refreshed successfully",
       "create_attribute": "Create attribute",
@@ -853,16 +848,9 @@
         "created_by_third_party": "Created by a Third Party",
         "discord_webhook_not_supported": "Discord webhooks are currently not supported.",
         "empty_webhook_message": "Your webhooks will appear here as soon as you add them. ⏲️",
-        "endpoint_bad_gateway_error": "Bad Gateway (502): Proxy/gateway error, service not reachable",
-        "endpoint_gateway_timeout_error": "Gateway Timeout (504): Gateway timeout, service not reachable",
-        "endpoint_internal_server_error": "Internal Server Error (500): The service encountered an unexpected error",
-        "endpoint_method_not_allowed_error": "Method Not Allowed (405): The endpoint exists, but doesn't accept POST requests",
-        "endpoint_not_found_error": "Not Found (404): The endpoint doesn't exist",
         "endpoint_pinged": "Yay! We are able to ping the webhook!",
         "endpoint_pinged_error": "Unable to ping the webhook!",
-        "endpoint_service_unavailable_error": "Service Unavailable (503): Service is temporarily down",
         "learn_to_verify": "Learn how to verify webhook signatures",
-        "no_triggers": "No Triggers",
         "please_check_console": "Please check the console for more details",
         "please_enter_a_url": "Please enter a URL",
         "response_created": "Response Created",
@@ -982,80 +970,44 @@
         "api_keys_description": "Manage API keys to access Formbricks management APIs"
       },
       "billing": {
-        "add_payment_method": "Add payment method",
-        "add_payment_method_to_upgrade_tooltip": "Please add a payment method above to upgrade to a paid plan",
-        "billing_interval_toggle": "Billing interval",
-        "current_plan_badge": "Current",
-        "current_plan_cta": "Current plan",
-        "custom_plan_description": "Your organization is on a custom billing setup. You can still switch to one of the standard plans below.",
-        "custom_plan_title": "Custom plan",
+        "cancelling": "Cancelling",
         "failed_to_start_trial": "Failed to start trial. Please try again.",
-        "keep_current_plan": "Keep current plan",
-        "manage_billing_details": "Manage card details & invoices",
-        "monthly": "Monthly",
-        "most_popular": "Most popular",
-        "pending_change_removed": "Scheduled plan change removed.",
-        "pending_plan_badge": "Scheduled",
-        "pending_plan_change_description": "Your plan will switch to {{plan}} on {{date}}.",
-        "pending_plan_change_title": "Scheduled plan change",
-        "pending_plan_cta": "Scheduled",
-        "per_month": "per month",
-        "per_year": "per year",
-        "plan_change_applied": "Plan updated successfully.",
-        "plan_change_scheduled": "Plan change scheduled successfully.",
+        "manage_subscription": "Manage subscription",
         "plan_custom": "Custom",
-        "plan_feature_everything_in_hobby": "Everything in Hobby",
-        "plan_feature_everything_in_pro": "Everything in Pro",
         "plan_hobby": "Hobby",
-        "plan_hobby_description": "For individuals and small teams getting started with Formbricks Cloud.",
-        "plan_hobby_feature_responses": "250 responses / month",
-        "plan_hobby_feature_workspaces": "1 workspace",
         "plan_pro": "Pro",
-        "plan_pro_description": "For growing teams that need higher limits, automations, and dynamic overages.",
-        "plan_pro_feature_responses": "2,000 responses / month (dynamic overage)",
-        "plan_pro_feature_workspaces": "3 workspaces",
         "plan_scale": "Scale",
-        "plan_scale_description": "For larger teams that need more capacity, stronger governance, and higher response volume.",
-        "plan_scale_feature_responses": "5,000 responses / month (dynamic overage)",
-        "plan_scale_feature_workspaces": "5 workspaces",
-        "plan_selection_description": "Compare Hobby, Pro, and Scale, then switch plans directly from Formbricks.",
-        "plan_selection_title": "Choose your plan",
         "plan_unknown": "Unknown",
         "remove_branding": "Remove Branding",
         "retry_setup": "Retry setup",
+        "scale_banner_description": "Unlock higher limits, team collaboration, and advanced security features with the Scale plan.",
+        "scale_banner_title": "Ready to scale up?",
+        "scale_feature_api": "Full API Access",
+        "scale_feature_quota": "Quota Management",
+        "scale_feature_spam": "Spam Protection",
+        "scale_feature_teams": "Teams & Access Roles",
         "select_plan_header_subtitle": "No credit card required, no strings attached.",
-        "select_plan_header_title": "Seamlessly integrated surveys, 100% your brand.",
+        "select_plan_header_title": "Ship professional, unbranded surveys today!",
         "status_trialing": "Trial",
         "stay_on_hobby_plan": "I want to stay on the Hobby plan",
         "stripe_setup_incomplete": "Billing setup incomplete",
         "stripe_setup_incomplete_description": "Billing setup did not complete successfully. Please retry to activate your subscription.",
         "subscription": "Subscription",
         "subscription_description": "Manage your subscription plan and monitor your usage",
-        "switch_at_period_end": "Switch at period end",
-        "switch_plan_now": "Switch plan now",
-        "this_includes": "This includes",
-        "trial_alert_description": "Add a payment method to keep access to all features.",
         "trial_already_used": "A free trial has already been used for this email address. Please upgrade to a paid plan instead.",
-        "trial_feature_api_access": "API Access",
-        "trial_feature_attribute_segmentation": "Attribute-based Segmentation",
-        "trial_feature_contact_segment_management": "Contact & Segment Management",
-        "trial_feature_email_followups": "Email Follow-ups",
-        "trial_feature_hide_branding": "Hide Formbricks Branding",
-        "trial_feature_mobile_sdks": "iOS & Android SDKs",
-        "trial_feature_respondent_identification": "Respondent Identification",
-        "trial_feature_unlimited_seats": "Unlimited Seats",
-        "trial_feature_webhooks": "Custom Webhooks",
+        "trial_feature_api_access": "Get full API access",
+        "trial_feature_collaboration": "All team & collaboration features",
+        "trial_feature_email_followups": "Setup email follow-ups",
+        "trial_feature_quotas": "Manage quotas",
+        "trial_feature_webhooks": "Setup custom webhooks",
+        "trial_feature_whitelabel": "Fully white-labeled surveys",
         "trial_no_credit_card": "14 days trial, no credit card required",
-        "trial_payment_method_added_description": "You're all set! Your Pro plan will continue automatically after the trial ends.",
-        "trial_title": "Get Formbricks Pro for free!",
+        "trial_title": "Try Pro features for free!",
         "unlimited_responses": "Unlimited Responses",
         "unlimited_workspaces": "Unlimited Workspaces",
         "upgrade": "Upgrade",
-        "upgrade_now": "Upgrade now",
         "usage_cycle": "Usage cycle",
         "used": "used",
-        "yearly": "Yearly",
-        "yearly_checkout_unavailable": "Yearly checkout is not available yet. Add a payment method on a monthly plan first or contact support.",
         "your_plan": "Your plan"
       },
       "domain": {
@@ -1081,32 +1033,11 @@
         "enterprise_features": "Enterprise Features",
         "get_an_enterprise_license_to_get_access_to_all_features": "Get an Enterprise license to get access to all features.",
         "keep_full_control_over_your_data_privacy_and_security": "Keep full control over your data privacy and security.",
-        "license_feature_access_control": "Access control (RBAC)",
-        "license_feature_audit_logs": "Audit logs",
-        "license_feature_contacts": "Contacts & Segments",
-        "license_feature_projects": "Workspaces",
-        "license_feature_quotas": "Quotas",
-        "license_feature_remove_branding": "Remove branding",
-        "license_feature_saml": "SAML SSO",
-        "license_feature_spam_protection": "Spam protection",
-        "license_feature_sso": "OIDC SSO",
-        "license_feature_two_factor_auth": "Two-factor authentication",
-        "license_feature_whitelabel": "White-label emails",
-        "license_features_table_access": "Access",
-        "license_features_table_description": "Enterprise features and limits currently available to this instance.",
-        "license_features_table_disabled": "Disabled",
-        "license_features_table_enabled": "Enabled",
-        "license_features_table_feature": "Feature",
-        "license_features_table_title": "Licensed Features",
-        "license_features_table_unlimited": "Unlimited",
-        "license_features_table_value": "Value",
-        "license_instance_mismatch_description": "This license is currently bound to a different Formbricks instance. If this installation was rebuilt or moved, ask Formbricks support to disconnect the previous instance binding.",
         "license_invalid_description": "The license key in your ENTERPRISE_LICENSE_KEY environment variable is not valid. Please check for typos or request a new key.",
         "license_status": "License Status",
         "license_status_active": "Active",
         "license_status_description": "Status of your enterprise license.",
         "license_status_expired": "Expired",
-        "license_status_instance_mismatch": "Bound to Another Instance",
         "license_status_invalid": "Invalid License",
         "license_status_unreachable": "Unreachable",
         "license_unreachable_grace_period": "License server cannot be reached. Your enterprise features remain active during a 3-day grace period ending {gracePeriodEnd}.",
@@ -1117,7 +1048,6 @@
         "questions_please_reach_out_to": "Questions? Please reach out to",
         "recheck_license": "Recheck license",
         "recheck_license_failed": "License check failed. The license server may be unreachable.",
-        "recheck_license_instance_mismatch": "This license is bound to a different Formbricks instance. Ask Formbricks support to disconnect the previous binding.",
         "recheck_license_invalid": "The license key is invalid. Please verify your ENTERPRISE_LICENSE_KEY.",
         "recheck_license_success": "License check successful",
         "recheck_license_unreachable": "License server is unreachable. Please try again later.",
@@ -1421,6 +1351,7 @@
         "custom_hostname": "Custom hostname",
         "customize_survey_logo": "Customize the survey logo",
         "darken_or_lighten_background_of_your_choice": "Darken or lighten background of your choice.",
+        "date_format": "Date format",
         "days_before_showing_this_survey_again": "or more days to pass between the last shown survey and showing this survey.",
         "delete_anyways": "Delete anyways",
         "delete_block": "Delete block",
@@ -1458,7 +1389,6 @@
         "error_saving_changes": "Error saving changes",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Allow multiple responses; continue showing even after a response (e.g., Feedback Box).",
         "everyone": "Everyone",
-        "expand_preview": "Expand Preview",
         "external_urls_paywall_tooltip": "Please upgrade to a paid plan to customize external URLs. This helps us prevent phishing.",
         "fallback_missing": "Fallback missing",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} is used in logic of question {questionIndex}. Please remove it from logic first.",
@@ -1684,8 +1614,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Response limit needs to exceed number of received responses ({responseCount}).",
         "response_limits_redirections_and_more": "Response limits, redirections and more.",
         "response_options": "Response Options",
-        "reverse_order_occasionally": "Reverse order occasionally",
-        "reverse_order_occasionally_except_last": "Reverse order occasionally except last",
         "roundness": "Roundness",
         "roundness_description": "Controls how rounded corners are.",
         "row_used_in_logic_error": "This row is used in logic of question {questionIndex}. Please remove it from logic first.",
@@ -1714,7 +1642,6 @@
         "show_survey_maximum_of": "Show survey maximum of",
         "show_survey_to_users": "Show survey to % of users",
         "show_to_x_percentage_of_targeted_users": "Show to {percentage}% of targeted users",
-        "shrink_preview": "Shrink Preview",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Smiley",
@@ -1730,12 +1657,10 @@
         "styling_set_to_theme_styles": "Styling set to theme styles",
         "subheading": "Subheading",
         "subtract": "Subtract -",
-        "survey_closed_message_heading_required": "Add a heading to the custom survey closed message.",
         "survey_completed_heading": "Survey Completed",
         "survey_completed_subheading": "This free & open-source survey has been closed",
         "survey_display_settings": "Survey Display Settings",
         "survey_placement": "Survey Placement",
-        "survey_preview": "Survey Preview 👀",
         "survey_styling": "Survey styling",
         "survey_trigger": "Survey Trigger",
         "switch_multi_language_on_to_get_started": "Switch multi-language on to get started 👉",
@@ -3086,7 +3011,7 @@
     "preview_survey_question_2_choice_2_label": "No, thank you!",
     "preview_survey_question_2_headline": "Want to stay in the loop?",
     "preview_survey_question_2_subheader": "This is an example description.",
-    "preview_survey_question_open_text_headline": "Anything else you would like to share?",
+    "preview_survey_question_open_text_headline": "Anything else you'd like to share?",
     "preview_survey_question_open_text_placeholder": "Type your answer here…",
     "preview_survey_question_open_text_subheader": "Your feedback helps us improve.",
     "preview_survey_welcome_card_headline": "Welcome!",
@@ -3341,7 +3266,7 @@
   "workflows": {
     "coming_soon_description": "Thank you for sharing your workflow idea with us! We are currently designing this feature and your feedback will help us build exactly what you need.",
     "coming_soon_title": "We are almost there!",
-    "follow_up_label": "Is there anything else you would like to add?",
+    "follow_up_label": "Is there anything else you'd like to add?",
     "follow_up_placeholder": "What specific tasks would you like to automate? Any tools or integrations you would want included?",
     "generate_button": "Generate workflow",
     "heading": "What workflow do you want to create?",
@@ -3351,4 +3276,4 @@
     "thank_you_description": "Your input helps us build the Workflows feature you actually need. We will keep you posted on our progress.",
     "thank_you_title": "Thank you for your feedback!"
   }
-}
+}

apps/web/locales/es-ES.json

@@ -167,7 +167,6 @@
     "connect": "Conectar",
     "connect_formbricks": "Conectar Formbricks",
     "connected": "Conectado",
-    "contact": "Contacto",
     "contacts": "Contactos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -175,7 +174,6 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar enlace",
-    "copy_to_environment": "Copiar a {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contacto} other {{count} contactos}}",
     "count_members": "{count, plural, one {{count} miembro} other {{count} miembros}}",
@@ -215,12 +213,12 @@
     "duplicate_copy_number": "(copia {copyNumber})",
     "e_commerce": "Comercio electrónico",
     "edit": "Editar",
-    "elements": "Elementos",
     "email": "Email",
     "ending_card": "Tarjeta final",
     "enter_url": "Introducir URL",
     "enterprise_license": "Licencia empresarial",
     "environment": "Entorno",
+    "environment_not_found": "Entorno no encontrado",
     "environment_notice": "Actualmente estás en el entorno {environment}.",
     "error": "Error",
     "error_component_description": "Este recurso no existe o no tienes los derechos necesarios para acceder a él.",
@@ -257,7 +255,7 @@
     "inactive_surveys": "Encuestas inactivas",
     "integration": "integración",
     "integrations": "Integraciones",
-    "invalid_date_with_value": "Fecha no válida: {value}",
+    "invalid_date": "Fecha no válida",
     "invalid_file_name": "Nombre de archivo no válido, por favor renombre su archivo e inténtelo de nuevo",
     "invalid_file_type": "Tipo de archivo no válido",
     "invite": "Invitar",
@@ -284,9 +282,7 @@
     "marketing": "Marketing",
     "members": "Miembros",
     "members_and_teams": "Miembros y equipos",
-    "membership": "Membresía",
     "membership_not_found": "Membresía no encontrada",
-    "meta": "Meta",
     "metadata": "Metadatos",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona mejor en una pantalla más grande. Para gestionar o crear encuestas, cambia a otro dispositivo.",
     "mobile_overlay_surveys_look_good": "No te preocupes – ¡tus encuestas se ven geniales en todos los dispositivos y tamaños de pantalla!",
@@ -300,7 +296,6 @@
     "new": "Nuevo",
     "new_version_available": "Formbricks {version} está aquí. ¡Actualiza ahora!",
     "next": "Siguiente",
-    "no_actions_found": "No se encontraron acciones",
     "no_background_image_found": "No se encontró imagen de fondo.",
     "no_code": "Sin código",
     "no_files_uploaded": "No se subieron archivos",
@@ -326,9 +321,10 @@
     "or": "o",
     "organization": "Organización",
     "organization_id": "ID de organización",
+    "organization_not_found": "Organización no encontrada",
     "organization_settings": "Ajustes de la organización",
+    "organization_teams_not_found": "Equipos de la organización no encontrados",
     "other": "Otro",
-    "other_filters": "Otros Filtros",
     "others": "Otros",
     "overlay_color": "Color de superposición",
     "overview": "Resumen",
@@ -345,7 +341,6 @@
     "please_select_at_least_one_survey": "Por favor, selecciona al menos una encuesta",
     "please_select_at_least_one_trigger": "Por favor, selecciona al menos un disparador",
     "please_upgrade_your_plan": "Por favor, actualiza tu plan",
-    "powered_by_formbricks": "Desarrollado por Formbricks",
     "preview": "Vista previa",
     "preview_survey": "Vista previa de la encuesta",
     "privacy": "Política de privacidad",
@@ -387,7 +382,6 @@
     "select": "Seleccionar",
     "select_all": "Seleccionar todo",
     "select_filter": "Seleccionar filtro",
-    "select_language": "Seleccionar idioma",
     "select_survey": "Seleccionar encuesta",
     "select_teams": "Seleccionar equipos",
     "selected": "Seleccionado",
@@ -420,6 +414,7 @@
     "survey_id": "ID de encuesta",
     "survey_languages": "Idiomas de la encuesta",
     "survey_live": "Encuesta activa",
+    "survey_not_found": "Encuesta no encontrada",
     "survey_paused": "Encuesta pausada.",
     "survey_type": "Tipo de encuesta",
     "surveys": "Encuestas",
@@ -434,15 +429,13 @@
     "team_name": "Nombre del equipo",
     "team_role": "Rol del equipo",
     "teams": "Equipos",
+    "teams_not_found": "Equipos no encontrados",
     "text": "Texto",
     "time": "Hora",
     "time_to_finish": "Tiempo para finalizar",
     "title": "Título",
     "top_left": "Superior izquierda",
     "top_right": "Superior derecha",
-    "trial_days_remaining": "{count} días restantes en tu prueba",
-    "trial_expired": "Tu prueba ha expirado",
-    "trial_one_day_remaining": "1 día restante en tu prueba",
     "try_again": "Intentar de nuevo",
     "type": "Tipo",
     "unknown_survey": "Encuesta desconocida",
@@ -450,13 +443,13 @@
     "update": "Actualizar",
     "updated": "Actualizado",
     "updated_at": "Actualizado el",
-    "upgrade_plan": "Mejorar plan",
     "upload": "Subir",
     "upload_failed": "La subida ha fallado. Por favor, inténtalo de nuevo.",
     "upload_input_description": "Haz clic o arrastra para subir archivos.",
     "url": "URL",
     "user": "Usuario",
     "user_id": "ID de usuario",
+    "user_not_found": "Usuario no encontrado",
     "variable": "Variable",
     "variable_ids": "IDs de variables",
     "variables": "Variables",
@@ -472,13 +465,14 @@
     "weeks": "semanas",
     "welcome_card": "Tarjeta de bienvenida",
     "workflows": "Flujos de trabajo",
-    "workspace": "Espacio de trabajo",
     "workspace_configuration": "Configuración del proyecto",
     "workspace_created_successfully": "Proyecto creado correctamente",
     "workspace_creation_description": "Organiza las encuestas en proyectos para un mejor control de acceso.",
     "workspace_id": "ID del proyecto",
     "workspace_name": "Nombre del proyecto",
     "workspace_name_placeholder": "p. ej. Formbricks",
+    "workspace_not_found": "Proyecto no encontrado",
+    "workspace_permission_not_found": "Permiso del proyecto no encontrado",
     "workspaces": "Proyectos",
     "years": "años",
     "you": "Tú",
@@ -663,6 +657,7 @@
       "attributes_msg_new_attribute_created": "Se creó el atributo nuevo “{key}” con el tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "El ID de usuario ya existe para este entorno y no se actualizó.",
       "contact_deleted_successfully": "Contacto eliminado correctamente",
+      "contact_not_found": "No se ha encontrado dicho contacto",
       "contacts_table_refresh": "Actualizar contactos",
       "contacts_table_refresh_success": "Contactos actualizados correctamente",
       "create_attribute": "Crear atributo",
@@ -853,16 +848,9 @@
         "created_by_third_party": "Creado por un tercero",
         "discord_webhook_not_supported": "Los webhooks de Discord no son compatibles actualmente.",
         "empty_webhook_message": "Tus webhooks aparecerán aquí tan pronto como los añadas. ⏲️",
-        "endpoint_bad_gateway_error": "Puerta de enlace incorrecta (502): Error de proxy o puerta de enlace, servicio no accesible",
-        "endpoint_gateway_timeout_error": "Tiempo de espera de la puerta de enlace agotado (504): Tiempo de espera de la puerta de enlace agotado, servicio no accesible",
-        "endpoint_internal_server_error": "Error interno del servidor (500): El servicio encontró un error inesperado",
-        "endpoint_method_not_allowed_error": "Método no permitido (405): El endpoint existe, pero no acepta solicitudes POST",
-        "endpoint_not_found_error": "No encontrado (404): El endpoint no existe",
         "endpoint_pinged": "¡Genial! ¡Podemos hacer ping al webhook!",
         "endpoint_pinged_error": "¡No se puede hacer ping al webhook!",
-        "endpoint_service_unavailable_error": "Servicio no disponible (503): El servicio está temporalmente caído",
         "learn_to_verify": "Aprende a verificar las firmas de webhook",
-        "no_triggers": "Sin activadores",
         "please_check_console": "Por favor, consulta la consola para más detalles",
         "please_enter_a_url": "Por favor, introduce una URL",
         "response_created": "Respuesta creada",
@@ -982,80 +970,44 @@
         "api_keys_description": "Gestiona las claves API para acceder a las APIs de gestión de Formbricks"
       },
       "billing": {
-        "add_payment_method": "Añadir método de pago",
-        "add_payment_method_to_upgrade_tooltip": "Por favor, añade un método de pago arriba para mejorar a un plan de pago",
-        "billing_interval_toggle": "Intervalo de facturación",
-        "current_plan_badge": "Actual",
-        "current_plan_cta": "Plan actual",
-        "custom_plan_description": "Tu organización tiene una configuración de facturación personalizada. Aún puedes cambiar a uno de los planes estándar a continuación.",
-        "custom_plan_title": "Plan personalizado",
+        "cancelling": "Cancelando",
         "failed_to_start_trial": "No se pudo iniciar la prueba. Por favor, inténtalo de nuevo.",
-        "keep_current_plan": "Mantener plan actual",
-        "manage_billing_details": "Gestionar datos de tarjeta y facturas",
-        "monthly": "Mensual",
-        "most_popular": "Más popular",
-        "pending_change_removed": "Cambio de plan programado eliminado.",
-        "pending_plan_badge": "Programado",
-        "pending_plan_change_description": "Tu plan cambiará a {{plan}} el {{date}}.",
-        "pending_plan_change_title": "Cambio de plan programado",
-        "pending_plan_cta": "Programado",
-        "per_month": "por mes",
-        "per_year": "por año",
-        "plan_change_applied": "Plan actualizado correctamente.",
-        "plan_change_scheduled": "Cambio de plan programado correctamente.",
+        "manage_subscription": "Gestionar suscripción",
         "plan_custom": "Custom",
-        "plan_feature_everything_in_hobby": "Todo lo de Hobby",
-        "plan_feature_everything_in_pro": "Todo lo de Pro",
         "plan_hobby": "Hobby",
-        "plan_hobby_description": "Para individuos y equipos pequeños que comienzan con Formbricks Cloud.",
-        "plan_hobby_feature_responses": "250 respuestas / mes",
-        "plan_hobby_feature_workspaces": "1 espacio de trabajo",
         "plan_pro": "Pro",
-        "plan_pro_description": "Para equipos en crecimiento que necesitan límites más altos, automatizaciones y excesos dinámicos.",
-        "plan_pro_feature_responses": "2.000 respuestas / mes (uso excedente dinámico)",
-        "plan_pro_feature_workspaces": "3 espacios de trabajo",
         "plan_scale": "Scale",
-        "plan_scale_description": "Para equipos más grandes que necesitan mayor capacidad, gobernanza más sólida y mayor volumen de respuestas.",
-        "plan_scale_feature_responses": "5.000 respuestas/mes (excedente dinámico)",
-        "plan_scale_feature_workspaces": "5 espacios de trabajo",
-        "plan_selection_description": "Compara Hobby, Pro y Scale, y cambia de plan directamente desde Formbricks.",
-        "plan_selection_title": "Elige tu plan",
         "plan_unknown": "Desconocido",
         "remove_branding": "Eliminar marca",
         "retry_setup": "Reintentar configuración",
+        "scale_banner_description": "Desbloquea límites superiores, colaboración en equipo y funciones de seguridad avanzadas con el plan Scale.",
+        "scale_banner_title": "¿Listo para crecer?",
+        "scale_feature_api": "Acceso completo a la API",
+        "scale_feature_quota": "Gestión de cuota",
+        "scale_feature_spam": "Protección contra spam",
+        "scale_feature_teams": "Equipos y roles de acceso",
         "select_plan_header_subtitle": "Sin tarjeta de crédito, sin compromisos.",
-        "select_plan_header_title": "Encuestas perfectamente integradas, 100% tu marca.",
+        "select_plan_header_title": "¡Lanza encuestas profesionales sin marca hoy mismo!",
         "status_trialing": "Prueba",
         "stay_on_hobby_plan": "Quiero quedarme en el plan Hobby",
         "stripe_setup_incomplete": "Configuración de facturación incompleta",
         "stripe_setup_incomplete_description": "La configuración de facturación no se completó correctamente. Por favor, vuelve a intentarlo para activar tu suscripción.",
         "subscription": "Suscripción",
         "subscription_description": "Gestiona tu plan de suscripción y monitorea tu uso",
-        "switch_at_period_end": "Cambiar al final del período",
-        "switch_plan_now": "Cambiar de plan ahora",
-        "this_includes": "Esto incluye",
-        "trial_alert_description": "Añade un método de pago para mantener el acceso a todas las funciones.",
         "trial_already_used": "Ya se ha utilizado una prueba gratuita para esta dirección de correo electrónico. Por favor, actualiza a un plan de pago.",
-        "trial_feature_api_access": "Acceso a la API",
-        "trial_feature_attribute_segmentation": "Segmentación basada en atributos",
-        "trial_feature_contact_segment_management": "Gestión de contactos y segmentos",
-        "trial_feature_email_followups": "Seguimientos por correo electrónico",
-        "trial_feature_hide_branding": "Ocultar la marca Formbricks",
-        "trial_feature_mobile_sdks": "SDKs para iOS y Android",
-        "trial_feature_respondent_identification": "Identificación de encuestados",
-        "trial_feature_unlimited_seats": "Asientos ilimitados",
-        "trial_feature_webhooks": "Webhooks personalizados",
+        "trial_feature_api_access": "Acceso completo a la API",
+        "trial_feature_collaboration": "Todas las funciones de equipo y colaboración",
+        "trial_feature_email_followups": "Configurar seguimientos por correo electrónico",
+        "trial_feature_quotas": "Gestionar cuotas",
+        "trial_feature_webhooks": "Configurar webhooks personalizados",
+        "trial_feature_whitelabel": "Encuestas totalmente personalizadas",
         "trial_no_credit_card": "Prueba de 14 días, sin tarjeta de crédito",
-        "trial_payment_method_added_description": "¡Todo listo! Tu plan Pro continuará automáticamente cuando termine el periodo de prueba.",
-        "trial_title": "¡Consigue Formbricks Pro gratis!",
+        "trial_title": "¡Prueba las funciones Pro gratis!",
         "unlimited_responses": "Respuestas ilimitadas",
         "unlimited_workspaces": "Proyectos ilimitados",
         "upgrade": "Actualizar",
-        "upgrade_now": "Actualizar ahora",
         "usage_cycle": "Usage cycle",
         "used": "usados",
-        "yearly": "Anual",
-        "yearly_checkout_unavailable": "El pago anual aún no está disponible. Primero añade un método de pago en un plan mensual o contacta con soporte.",
         "your_plan": "Tu plan"
       },
       "domain": {
@@ -1081,32 +1033,11 @@
         "enterprise_features": "Características empresariales",
         "get_an_enterprise_license_to_get_access_to_all_features": "Obtén una licencia empresarial para acceder a todas las características.",
         "keep_full_control_over_your_data_privacy_and_security": "Mantén el control total sobre la privacidad y seguridad de tus datos.",
-        "license_feature_access_control": "Control de acceso (RBAC)",
-        "license_feature_audit_logs": "Registros de auditoría",
-        "license_feature_contacts": "Contactos y segmentos",
-        "license_feature_projects": "Espacios de trabajo",
-        "license_feature_quotas": "Cuotas",
-        "license_feature_remove_branding": "Eliminar marca",
-        "license_feature_saml": "SAML SSO",
-        "license_feature_spam_protection": "Protección contra spam",
-        "license_feature_sso": "OIDC SSO",
-        "license_feature_two_factor_auth": "Autenticación de dos factores",
-        "license_feature_whitelabel": "Correos sin marca",
-        "license_features_table_access": "Acceso",
-        "license_features_table_description": "Funciones y límites empresariales disponibles actualmente para esta instancia.",
-        "license_features_table_disabled": "Desactivado",
-        "license_features_table_enabled": "Activado",
-        "license_features_table_feature": "Función",
-        "license_features_table_title": "Funciones con licencia",
-        "license_features_table_unlimited": "Ilimitado",
-        "license_features_table_value": "Valor",
-        "license_instance_mismatch_description": "Esta licencia está actualmente vinculada a una instancia diferente de Formbricks. Si esta instalación fue reconstruida o migrada, solicita al soporte de Formbricks que desconecte la vinculación de la instancia anterior.",
         "license_invalid_description": "La clave de licencia en tu variable de entorno ENTERPRISE_LICENSE_KEY no es válida. Por favor, comprueba si hay errores tipográficos o solicita una clave nueva.",
         "license_status": "Estado de la licencia",
         "license_status_active": "Activa",
         "license_status_description": "Estado de tu licencia enterprise.",
         "license_status_expired": "Caducada",
-        "license_status_instance_mismatch": "Vinculada a Otra Instancia",
         "license_status_invalid": "Licencia no válida",
         "license_status_unreachable": "Inaccesible",
         "license_unreachable_grace_period": "No se puede acceder al servidor de licencias. Tus funciones empresariales permanecen activas durante un período de gracia de 3 días que finaliza el {gracePeriodEnd}.",
@@ -1117,7 +1048,6 @@
         "questions_please_reach_out_to": "¿Preguntas? Por favor, contacta con",
         "recheck_license": "Volver a comprobar licencia",
         "recheck_license_failed": "Error al comprobar la licencia. Es posible que el servidor de licencias no esté disponible.",
-        "recheck_license_instance_mismatch": "Esta licencia está vinculada a una instancia diferente de Formbricks. Solicita al soporte de Formbricks que desconecte la vinculación anterior.",
         "recheck_license_invalid": "La clave de licencia no es válida. Por favor, verifica tu ENTERPRISE_LICENSE_KEY.",
         "recheck_license_success": "Comprobación de licencia correcta",
         "recheck_license_unreachable": "El servidor de licencias no está disponible. Inténtalo de nuevo más tarde.",
@@ -1421,6 +1351,7 @@
         "custom_hostname": "Nombre de host personalizado",
         "customize_survey_logo": "Personalizar el logotipo de la encuesta",
         "darken_or_lighten_background_of_your_choice": "Oscurece o aclara el fondo de tu elección.",
+        "date_format": "Formato de fecha",
         "days_before_showing_this_survey_again": "o más días deben transcurrir entre la última encuesta mostrada y la visualización de esta encuesta.",
         "delete_anyways": "Eliminar de todos modos",
         "delete_block": "Eliminar bloque",
@@ -1458,7 +1389,6 @@
         "error_saving_changes": "Error al guardar los cambios",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir respuestas múltiples; seguir mostrando incluso después de una respuesta (p. ej., cuadro de comentarios).",
         "everyone": "Todos",
-        "expand_preview": "Expandir vista previa",
         "external_urls_paywall_tooltip": "Por favor, actualiza a un plan de pago para personalizar URLs externas. Esto nos ayuda a prevenir el phishing.",
         "fallback_missing": "Falta respaldo",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} se usa en la lógica de la pregunta {questionIndex}. Por favor, elimínalo primero de la lógica.",
@@ -1684,8 +1614,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "El límite de respuestas debe superar el número de respuestas recibidas ({responseCount}).",
         "response_limits_redirections_and_more": "Límites de respuestas, redirecciones y más.",
         "response_options": "Opciones de respuesta",
-        "reverse_order_occasionally": "Invertir orden ocasionalmente",
-        "reverse_order_occasionally_except_last": "Invertir orden ocasionalmente excepto el último",
         "roundness": "Redondez",
         "roundness_description": "Controla qué tan redondeadas están las esquinas.",
         "row_used_in_logic_error": "Esta fila se utiliza en la lógica de la pregunta {questionIndex}. Por favor, elimínala de la lógica primero.",
@@ -1714,7 +1642,6 @@
         "show_survey_maximum_of": "Mostrar encuesta un máximo de",
         "show_survey_to_users": "Mostrar encuesta al % de usuarios",
         "show_to_x_percentage_of_targeted_users": "Mostrar al {percentage} % de usuarios objetivo",
-        "shrink_preview": "Contraer vista previa",
         "simple": "Simple",
         "six_points": "6 puntos",
         "smiley": "Emoticono",
@@ -1730,12 +1657,10 @@
         "styling_set_to_theme_styles": "Estilo configurado según los estilos del tema",
         "subheading": "Subtítulo",
         "subtract": "Restar -",
-        "survey_closed_message_heading_required": "Añade un encabezado al mensaje personalizado de encuesta cerrada.",
         "survey_completed_heading": "Encuesta completada",
         "survey_completed_subheading": "Esta encuesta gratuita y de código abierto ha sido cerrada",
         "survey_display_settings": "Ajustes de visualización de la encuesta",
         "survey_placement": "Ubicación de la encuesta",
-        "survey_preview": "Vista previa de la encuesta 👀",
         "survey_styling": "Estilo del formulario",
         "survey_trigger": "Activador de la encuesta",
         "switch_multi_language_on_to_get_started": "Activa el modo multiidioma para comenzar 👉",

apps/web/locales/fr-FR.json

@@ -167,7 +167,6 @@
     "connect": "Connecter",
     "connect_formbricks": "Connecter Formbricks",
     "connected": "Connecté",
-    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continuer",
     "copied": "Copié",
@@ -175,7 +174,6 @@
     "copy": "Copier",
     "copy_code": "Copier le code",
     "copy_link": "Copier le lien",
-    "copy_to_environment": "Copier vers {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribut} other {{count} attributs}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} membre} other {{count} membres}}",
@@ -215,12 +213,12 @@
     "duplicate_copy_number": "(copie {copyNumber})",
     "e_commerce": "E-commerce",
     "edit": "Modifier",
-    "elements": "Éléments",
     "email": "Email",
     "ending_card": "Carte de fin",
     "enter_url": "Saisir l'URL",
     "enterprise_license": "Licence d'entreprise",
     "environment": "Environnement",
+    "environment_not_found": "Environnement non trouvé",
     "environment_notice": "Vous êtes actuellement dans l'environnement {environment}.",
     "error": "Erreur",
     "error_component_description": "Cette ressource n'existe pas ou vous n'avez pas les droits nécessaires pour y accéder.",
@@ -257,7 +255,7 @@
     "inactive_surveys": "Sondages inactifs",
     "integration": "intégration",
     "integrations": "Intégrations",
-    "invalid_date_with_value": "Date invalide: {value}",
+    "invalid_date": "Date invalide",
     "invalid_file_name": "Nom de fichier invalide, veuillez renommer votre fichier et réessayer",
     "invalid_file_type": "Type de fichier invalide",
     "invite": "Inviter",
@@ -284,9 +282,7 @@
     "marketing": "Marketing",
     "members": "Membres",
     "members_and_teams": "Membres & Équipes",
-    "membership": "Adhésion",
     "membership_not_found": "Abonnement non trouvé",
-    "meta": "Méta",
     "metadata": "Métadonnées",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks fonctionne mieux sur un écran plus grand. Pour gérer ou créer des sondages, passez à un autre appareil.",
     "mobile_overlay_surveys_look_good": "Ne t'inquiète pas – tes enquêtes sont superbes sur tous les appareils et tailles d'écran!",
@@ -300,7 +296,6 @@
     "new": "Nouveau",
     "new_version_available": "Formbricks {version} est là. Mettez à jour maintenant !",
     "next": "Suivant",
-    "no_actions_found": "Aucune action trouvée",
     "no_background_image_found": "Aucune image de fond trouvée.",
     "no_code": "Sans code",
     "no_files_uploaded": "Aucun fichier n'a été téléchargé.",
@@ -326,9 +321,10 @@
     "or": "ou",
     "organization": "Organisation",
     "organization_id": "Identifiant de l'organisation",
+    "organization_not_found": "Organisation non trouvée",
     "organization_settings": "Paramètres de l'organisation",
+    "organization_teams_not_found": "Équipes d'organisation non trouvées",
     "other": "Autre",
-    "other_filters": "Autres filtres",
     "others": "Autres",
     "overlay_color": "Couleur de superposition",
     "overview": "Aperçu",
@@ -345,7 +341,6 @@
     "please_select_at_least_one_survey": "Veuillez sélectionner au moins une enquête.",
     "please_select_at_least_one_trigger": "Veuillez sélectionner au moins un déclencheur.",
     "please_upgrade_your_plan": "Veuillez mettre à niveau votre plan",
-    "powered_by_formbricks": "Propulsé par Formbricks",
     "preview": "Aperçu",
     "preview_survey": "Aperçu de l'enquête",
     "privacy": "Politique de confidentialité",
@@ -387,7 +382,6 @@
     "select": "Sélectionner",
     "select_all": "Sélectionner tout",
     "select_filter": "Sélectionner un filtre",
-    "select_language": "Sélectionner la langue",
     "select_survey": "Sélectionner l'enquête",
     "select_teams": "Sélectionner les équipes",
     "selected": "Sélectionné",
@@ -407,7 +401,7 @@
     "something_went_wrong": "Quelque chose s'est mal passé.",
     "something_went_wrong_please_try_again": "Une erreur s'est produite. Veuillez réessayer.",
     "sort_by": "Trier par",
-    "start_free_trial": "Commencer l'essai gratuit",
+    "start_free_trial": "Essayer gratuitement",
     "status": "Statut",
     "step_by_step_manual": "Manuel étape par étape",
     "storage_not_configured": "Stockage de fichiers non configuré, les téléchargements risquent d'échouer",
@@ -420,6 +414,7 @@
     "survey_id": "ID de l'enquête",
     "survey_languages": "Langues de l'enquête",
     "survey_live": "Sondage en direct",
+    "survey_not_found": "Sondage non trouvé",
     "survey_paused": "Sondage en pause.",
     "survey_type": "Type de sondage",
     "surveys": "Enquêtes",
@@ -434,15 +429,13 @@
     "team_name": "Nom de l'équipe",
     "team_role": "Rôle dans l'équipe",
     "teams": "Équipes",
+    "teams_not_found": "Équipes non trouvées",
     "text": "Texte",
     "time": "Temps",
     "time_to_finish": "Temps de finir",
     "title": "Titre",
     "top_left": "En haut à gauche",
     "top_right": "En haut à droite",
-    "trial_days_remaining": "{count} jours restants dans votre période d'essai",
-    "trial_expired": "Votre période d'essai a expiré",
-    "trial_one_day_remaining": "1 jour restant dans votre période d'essai",
     "try_again": "Réessayer",
     "type": "Type",
     "unknown_survey": "Enquête inconnue",
@@ -450,13 +443,13 @@
     "update": "Mise à jour",
     "updated": "Mise à jour",
     "updated_at": "Mis à jour à",
-    "upgrade_plan": "Améliorer le forfait",
     "upload": "Télécharger",
     "upload_failed": "Échec du téléchargement. Veuillez réessayer.",
     "upload_input_description": "Cliquez ou faites glisser pour charger un fichier.",
     "url": "URL",
     "user": "Utilisateur",
     "user_id": "Identifiant d'utilisateur",
+    "user_not_found": "Utilisateur non trouvé",
     "variable": "Variable",
     "variable_ids": "Identifiants variables",
     "variables": "Variables",
@@ -472,13 +465,14 @@
     "weeks": "semaines",
     "welcome_card": "Carte de bienvenue",
     "workflows": "Workflows",
-    "workspace": "Espace de travail",
     "workspace_configuration": "Configuration du projet",
     "workspace_created_successfully": "Projet créé avec succès",
     "workspace_creation_description": "Organisez les enquêtes dans des projets pour un meilleur contrôle d'accès.",
     "workspace_id": "ID du projet",
     "workspace_name": "Nom du projet",
     "workspace_name_placeholder": "par ex. Formbricks",
+    "workspace_not_found": "Projet introuvable",
+    "workspace_permission_not_found": "Permission du projet introuvable",
     "workspaces": "Projets",
     "years": "années",
     "you": "Vous",
@@ -663,6 +657,7 @@
       "attributes_msg_new_attribute_created": "Nouvel attribut “{key}” créé avec le type “{dataType}”",
       "attributes_msg_userid_already_exists": "L'identifiant utilisateur existe déjà pour cet environnement et n'a pas été mis à jour.",
       "contact_deleted_successfully": "Contact supprimé avec succès",
+      "contact_not_found": "Aucun contact trouvé",
       "contacts_table_refresh": "Actualiser les contacts",
       "contacts_table_refresh_success": "Contacts rafraîchis avec succès",
       "create_attribute": "Créer un attribut",
@@ -853,16 +848,9 @@
         "created_by_third_party": "Créé par un tiers",
         "discord_webhook_not_supported": "Les webhooks Discord ne sont actuellement pas pris en charge.",
         "empty_webhook_message": "Vos webhooks apparaîtront ici dès que vous les ajouterez. ⏲️",
-        "endpoint_bad_gateway_error": "Mauvaise passerelle (502) : Erreur de proxy/passerelle, service inaccessible",
-        "endpoint_gateway_timeout_error": "Délai d'attente de la passerelle dépassé (504) : Le délai d'attente de la passerelle a expiré, service inaccessible",
-        "endpoint_internal_server_error": "Erreur interne du serveur (500) : Le service a rencontré une erreur inattendue",
-        "endpoint_method_not_allowed_error": "Méthode non autorisée (405) : Le point de terminaison existe, mais n'accepte pas les requêtes POST",
-        "endpoint_not_found_error": "Introuvable (404) : Le point de terminaison n'existe pas",
         "endpoint_pinged": "Yay ! Nous pouvons pinger le webhook !",
         "endpoint_pinged_error": "Impossible de pinger le webhook !",
-        "endpoint_service_unavailable_error": "Service indisponible (503) : Le service est temporairement indisponible",
         "learn_to_verify": "Découvrez comment vérifier les signatures de webhook",
-        "no_triggers": "Aucun déclencheur",
         "please_check_console": "Veuillez vérifier la console pour plus de détails.",
         "please_enter_a_url": "Veuillez entrer une URL.",
         "response_created": "Réponse créée",
@@ -982,80 +970,44 @@
         "api_keys_description": "Les clés d'API permettent d'accéder aux API de gestion de Formbricks."
       },
       "billing": {
-        "add_payment_method": "Ajouter un moyen de paiement",
-        "add_payment_method_to_upgrade_tooltip": "Veuillez ajouter un moyen de paiement ci-dessus pour passer à un forfait payant",
-        "billing_interval_toggle": "Intervalle de facturation",
-        "current_plan_badge": "Actuel",
-        "current_plan_cta": "Formule actuelle",
-        "custom_plan_description": "Votre organisation dispose d'une configuration de facturation personnalisée. Tu peux toujours basculer vers l'une des formules standard ci-dessous.",
-        "custom_plan_title": "Formule personnalisée",
+        "cancelling": "Annulation en cours",
         "failed_to_start_trial": "Échec du démarrage de l'essai. Réessaye.",
-        "keep_current_plan": "Conserver la formule actuelle",
-        "manage_billing_details": "Gérer les détails de la carte et les factures",
-        "monthly": "Mensuel",
-        "most_popular": "Le plus populaire",
-        "pending_change_removed": "Changement de formule programmé supprimé.",
-        "pending_plan_badge": "Programmé",
-        "pending_plan_change_description": "Ta formule passera à {{plan}} le {{date}}.",
-        "pending_plan_change_title": "Changement de formule programmé",
-        "pending_plan_cta": "Programmé",
-        "per_month": "par mois",
-        "per_year": "par an",
-        "plan_change_applied": "Formule mise à jour avec succès.",
-        "plan_change_scheduled": "Changement de formule programmé avec succès.",
+        "manage_subscription": "Gérer l'abonnement",
         "plan_custom": "Custom",
-        "plan_feature_everything_in_hobby": "Tout ce qui est inclus dans Hobby",
-        "plan_feature_everything_in_pro": "Tout ce qui est inclus dans Pro",
         "plan_hobby": "Hobby",
-        "plan_hobby_description": "Pour les particuliers et les petites équipes qui débutent avec Formbricks Cloud.",
-        "plan_hobby_feature_responses": "250 réponses / mois",
-        "plan_hobby_feature_workspaces": "1 espace de travail",
         "plan_pro": "Pro",
-        "plan_pro_description": "Pour les équipes en croissance qui ont besoin de limites plus élevées, d'automatisations et de dépassements dynamiques.",
-        "plan_pro_feature_responses": "2 000 réponses / mois (dépassement dynamique)",
-        "plan_pro_feature_workspaces": "3 espaces de travail",
         "plan_scale": "Scale",
-        "plan_scale_description": "Pour les grandes équipes qui ont besoin de plus de capacité, d'une meilleure gouvernance et d'un volume de réponses plus élevé.",
-        "plan_scale_feature_responses": "5 000 réponses / mois (dépassement dynamique)",
-        "plan_scale_feature_workspaces": "5 espaces de travail",
-        "plan_selection_description": "Compare les formules Hobby, Pro et Scale, puis change de formule directement depuis Formbricks.",
-        "plan_selection_title": "Choisis ta formule",
         "plan_unknown": "Inconnu",
         "remove_branding": "Suppression du logo",
         "retry_setup": "Réessayer la configuration",
+        "scale_banner_description": "Débloque des limites plus élevées, la collaboration en équipe et des fonctionnalités de sécurité avancées avec l’offre Scale.",
+        "scale_banner_title": "Prêt à passer à la vitesse supérieure ?",
+        "scale_feature_api": "Accès API complet",
+        "scale_feature_quota": "Gestion des quotas",
+        "scale_feature_spam": "Protection contre le spam",
+        "scale_feature_teams": "Équipes & rôles d’accès",
         "select_plan_header_subtitle": "Aucune carte bancaire requise, aucun engagement.",
-        "select_plan_header_title": "Sondages parfaitement intégrés, 100 % à ton image.",
+        "select_plan_header_title": "Envoyez des sondages professionnels et personnalisés dès aujourd'hui !",
         "status_trialing": "Essai",
         "stay_on_hobby_plan": "Je veux rester sur le plan Hobby",
         "stripe_setup_incomplete": "Configuration de la facturation incomplète",
         "stripe_setup_incomplete_description": "La configuration de la facturation n’a pas abouti. Merci de réessayer pour activer ton abonnement.",
         "subscription": "Abonnement",
         "subscription_description": "Gère ton abonnement et surveille ta consommation",
-        "switch_at_period_end": "Changer à la fin de la période",
-        "switch_plan_now": "Changer de formule maintenant",
-        "this_includes": "Cela inclut",
-        "trial_alert_description": "Ajoute un moyen de paiement pour conserver l'accès à toutes les fonctionnalités.",
         "trial_already_used": "Un essai gratuit a déjà été utilisé pour cette adresse e-mail. Passe plutôt à un plan payant.",
-        "trial_feature_api_access": "Accès API",
-        "trial_feature_attribute_segmentation": "Segmentation basée sur les attributs",
-        "trial_feature_contact_segment_management": "Gestion des contacts et segments",
-        "trial_feature_email_followups": "Relances par e-mail",
-        "trial_feature_hide_branding": "Masquer l'image de marque Formbricks",
-        "trial_feature_mobile_sdks": "SDKs iOS et Android",
-        "trial_feature_respondent_identification": "Identification des répondants",
-        "trial_feature_unlimited_seats": "Places illimitées",
-        "trial_feature_webhooks": "Webhooks personnalisés",
+        "trial_feature_api_access": "Accès complet à l'API",
+        "trial_feature_collaboration": "Toutes les fonctionnalités d'équipe et de collaboration",
+        "trial_feature_email_followups": "Configure des relances par e-mail",
+        "trial_feature_quotas": "Gère les quotas",
+        "trial_feature_webhooks": "Configure des webhooks personnalisés",
+        "trial_feature_whitelabel": "Enquêtes entièrement en marque blanche",
         "trial_no_credit_card": "Essai de 14 jours, aucune carte bancaire requise",
-        "trial_payment_method_added_description": "Tout est prêt ! Votre abonnement Pro se poursuivra automatiquement après la fin de la période d'essai.",
-        "trial_title": "Obtenez Formbricks Pro gratuitement !",
+        "trial_title": "Essaie les fonctionnalités Pro gratuitement !",
         "unlimited_responses": "Réponses illimitées",
         "unlimited_workspaces": "Projets illimités",
         "upgrade": "Mise à niveau",
-        "upgrade_now": "Passer à la formule supérieure maintenant",
         "usage_cycle": "Usage cycle",
         "used": "utilisé(s)",
-        "yearly": "Annuel",
-        "yearly_checkout_unavailable": "Le paiement annuel n'est pas encore disponible. Ajoute d'abord un moyen de paiement sur un forfait mensuel ou contacte le support.",
         "your_plan": "Ton offre"
       },
       "domain": {
@@ -1081,32 +1033,11 @@
         "enterprise_features": "Fonctionnalités d'entreprise",
         "get_an_enterprise_license_to_get_access_to_all_features": "Obtenez une licence Entreprise pour accéder à toutes les fonctionnalités.",
         "keep_full_control_over_your_data_privacy_and_security": "Gardez un contrôle total sur la confidentialité et la sécurité de vos données.",
-        "license_feature_access_control": "Contrôle d'accès (RBAC)",
-        "license_feature_audit_logs": "Journaux d'audit",
-        "license_feature_contacts": "Contacts et segments",
-        "license_feature_projects": "Espaces de travail",
-        "license_feature_quotas": "Quotas",
-        "license_feature_remove_branding": "Retirer l'image de marque",
-        "license_feature_saml": "SSO SAML",
-        "license_feature_spam_protection": "Protection anti-spam",
-        "license_feature_sso": "SSO OIDC",
-        "license_feature_two_factor_auth": "Authentification à deux facteurs",
-        "license_feature_whitelabel": "E-mails en marque blanche",
-        "license_features_table_access": "Accès",
-        "license_features_table_description": "Fonctionnalités Enterprise et limites actuellement disponibles pour cette instance.",
-        "license_features_table_disabled": "Désactivé",
-        "license_features_table_enabled": "Activé",
-        "license_features_table_feature": "Fonctionnalité",
-        "license_features_table_title": "Fonctionnalités sous licence",
-        "license_features_table_unlimited": "Illimité",
-        "license_features_table_value": "Valeur",
-        "license_instance_mismatch_description": "Cette licence est actuellement liée à une autre instance Formbricks. Si cette installation a été reconstruite ou déplacée, demande au support Formbricks de déconnecter la liaison de l'instance précédente.",
         "license_invalid_description": "La clé de licence dans votre variable d'environnement ENTERPRISE_LICENSE_KEY n'est pas valide. Veuillez vérifier les fautes de frappe ou demander une nouvelle clé.",
         "license_status": "Statut de la licence",
         "license_status_active": "Active",
         "license_status_description": "Statut de votre licence entreprise.",
         "license_status_expired": "Expirée",
-        "license_status_instance_mismatch": "Liée à une autre instance",
         "license_status_invalid": "Licence invalide",
         "license_status_unreachable": "Inaccessible",
         "license_unreachable_grace_period": "Le serveur de licence est injoignable. Vos fonctionnalités entreprise restent actives pendant une période de grâce de 3 jours se terminant le {gracePeriodEnd}.",
@@ -1117,7 +1048,6 @@
         "questions_please_reach_out_to": "Des questions ? Veuillez contacter",
         "recheck_license": "Revérifier la licence",
         "recheck_license_failed": "La vérification de la licence a échoué. Le serveur de licences est peut-être inaccessible.",
-        "recheck_license_instance_mismatch": "Cette licence est liée à une autre instance Formbricks. Demande au support Formbricks de déconnecter la liaison précédente.",
         "recheck_license_invalid": "La clé de licence est invalide. Veuillez vérifier votre ENTERPRISE_LICENSE_KEY.",
         "recheck_license_success": "Vérification de la licence réussie",
         "recheck_license_unreachable": "Le serveur de licences est inaccessible. Veuillez réessayer plus tard.",
@@ -1421,6 +1351,7 @@
         "custom_hostname": "Nom d'hôte personnalisé",
         "customize_survey_logo": "Personnaliser le logo de l'enquête",
         "darken_or_lighten_background_of_your_choice": "Assombrir ou éclaircir l'arrière-plan de votre choix.",
+        "date_format": "Format de date",
         "days_before_showing_this_survey_again": "ou plus de jours doivent s'écouler entre le dernier sondage affiché et l'affichage de ce sondage.",
         "delete_anyways": "Supprimer quand même",
         "delete_block": "Supprimer le bloc",
@@ -1458,7 +1389,6 @@
         "error_saving_changes": "Erreur lors de l'enregistrement des modifications",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Autoriser plusieurs réponses ; continuer à afficher même après une réponse (par exemple, boîte de commentaires).",
         "everyone": "Tout le monde",
-        "expand_preview": "Agrandir l'aperçu",
         "external_urls_paywall_tooltip": "Merci de passer à une offre payante pour personnaliser les URLs externes. Cela nous aide à empêcher l’hameçonnage.",
         "fallback_missing": "Fallback manquant",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} est utilisé dans la logique de la question {questionIndex}. Veuillez d'abord le supprimer de la logique.",
@@ -1684,8 +1614,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "La limite de réponses doit dépasser le nombre de réponses reçues ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de réponse, redirections et plus.",
         "response_options": "Options de réponse",
-        "reverse_order_occasionally": "Inverser l'ordre occasionnellement",
-        "reverse_order_occasionally_except_last": "Inverser l'ordre occasionnellement sauf le dernier",
         "roundness": "Rondeur",
         "roundness_description": "Contrôle l'arrondi des coins.",
         "row_used_in_logic_error": "Cette ligne est utilisée dans la logique de la question {questionIndex}. Veuillez d'abord la supprimer de la logique.",
@@ -1714,7 +1642,6 @@
         "show_survey_maximum_of": "Afficher le maximum du sondage de",
         "show_survey_to_users": "Afficher l'enquête à % des utilisateurs",
         "show_to_x_percentage_of_targeted_users": "Afficher à {percentage}% des utilisateurs ciblés",
-        "shrink_preview": "Réduire l'aperçu",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Sourire",
@@ -1730,12 +1657,10 @@
         "styling_set_to_theme_styles": "Style défini sur les styles du thème",
         "subheading": "Sous-titre",
         "subtract": "Soustraire -",
-        "survey_closed_message_heading_required": "Ajoute un titre au message personnalisé de sondage fermé.",
         "survey_completed_heading": "Enquête terminée",
         "survey_completed_subheading": "Cette enquête gratuite et open-source a été fermée",
         "survey_display_settings": "Paramètres d'affichage de l'enquête",
         "survey_placement": "Placement de l'enquête",
-        "survey_preview": "Aperçu du sondage 👀",
         "survey_styling": "Style de formulaire",
         "survey_trigger": "Déclencheur d'enquête",
         "switch_multi_language_on_to_get_started": "Activez le mode multilingue pour commencer 👉",
@@ -3086,7 +3011,7 @@
     "preview_survey_question_2_choice_2_label": "Non, merci !",
     "preview_survey_question_2_headline": "Souhaitez-vous être informé ?",
     "preview_survey_question_2_subheader": "Ceci est un exemple de description.",
-    "preview_survey_question_open_text_headline": "Souhaitez-vous partager autre chose ?",
+    "preview_survey_question_open_text_headline": "Autre chose que vous aimeriez partager ?",
     "preview_survey_question_open_text_placeholder": "Entrez votre réponse ici...",
     "preview_survey_question_open_text_subheader": "Vos commentaires nous aident à nous améliorer.",
     "preview_survey_welcome_card_headline": "Bienvenue !",
@@ -3341,7 +3266,7 @@
   "workflows": {
     "coming_soon_description": "Merci d'avoir partagé votre idée de workflow avec nous ! Nous concevons actuellement cette fonctionnalité et vos retours nous aideront à créer exactement ce dont vous avez besoin.",
     "coming_soon_title": "Nous y sommes presque !",
-    "follow_up_label": "Souhaitez-vous ajouter quelque chose ?",
+    "follow_up_label": "Y a-t-il autre chose que vous aimeriez ajouter ?",
     "follow_up_placeholder": "Quelles tâches spécifiques souhaitez-vous automatiser ? Y a-t-il des outils ou intégrations que vous aimeriez inclure ?",
     "generate_button": "Générer le workflow",
     "heading": "Quel workflow souhaitez-vous créer ?",