fix: improve client api by minimizing data output (#1674)

Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>

.github/workflows/release-docker-github.yml

@@ -16,10 +16,8 @@ env:
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -38,7 +36,7 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1
         with:
-          cosign-release: 'v2.1.1'
+          cosign-release: "v2.1.1"
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
@@ -71,11 +69,16 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: .
+          file: ./apps/web/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }}
+            DATABASE_URL=${{ env.DATABASE_URL }}
+            ENCRYPTION_KEY=${{ env.ENCRYPTION_KEY }}
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker

README.md

@@ -1,7 +1,4 @@
 <div id="top"></div>
-
-[<img src="ph.png">](https://www.producthunt.com/posts/formbricks)
-
 <p align="center">
 <a href="https://formbricks.com">
     <img width="120" alt="Open Source Experience Management Solution Qualtrics Alternative Logo" src="https://github.com/formbricks/formbricks/assets/72809645/0086704f-bee7-4d38-9cc8-fa42ee59e004">
@@ -18,7 +15,7 @@
 <p align="center">
 <a href="https://github.com/formbricks/formbricks/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-AGPL-purple" alt="License"></a> <a href="https://formbricks.com/discord"><img src="https://img.shields.io/discord/979077669410979880?label=Discord&logo=discord&logoColor=%23fff" alt="Join Formbricks Discord"></a> <a href="https://github.com/formbricks/formbricks/stargazers"><img src="https://img.shields.io/github/stars/formbricks/formbricks?logo=github" alt="Github Stars"></a>
    <a href="https://news.ycombinator.com/item?id=32303986"><img src="https://img.shields.io/badge/Hacker%20News-122-%23FF6600" alt="Hacker News"></a>
-   <a href="https://www.producthunt.com/products/snoopforms"><img src="https://img.shields.io/badge/Product%20Hunt-%232%20Product%20of%20the%20Day-orange?logo=producthunt&logoColor=%23fff" alt="Product Hunt"></a>
+   <a href="[https://www.producthunt.com/products/formbricks](https://www.producthunt.com/posts/formbricks)"><img src="https://img.shields.io/badge/Product%20Hunt-455-orange?logo=producthunt&logoColor=%23fff" alt="Product Hunt"></a>
    <a href="https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next/"><img src="https://img.shields.io/badge/2023-blue?logo=github&label=Github%20Accelerator" alt="Github Accelerator"></a>
 <a href="https://github.com/formbricks/formbricks/issues?q=is:issue+is:open+label:%22%F0%9F%99%8B%F0%9F%8F%BB%E2%80%8D%E2%99%82%EF%B8%8Fhelp+wanted%22"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
 </p>

apps/demo/pages/signin/index.tsx

@@ -1,152 +0,0 @@
-import formbricks from "@formbricks/js";
-import { useRouter } from "next/router";
-import { FormEvent } from "react";
-
-export default function SiginPage() {
-  const router = useRouter();
-
-  const submitAction = (e: FormEvent) => {
-    e.preventDefault();
-    if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-      formbricks.setEmail("matti@example.com");
-      formbricks.setUserId("123456");
-      formbricks.setAttribute("Plan", "Premium");
-    }
-    router.push("/app");
-  };
-  return (
-    <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
-      <div className="sm:mx-auto sm:w-full sm:max-w-md">
-        <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
-          Sign in to your account
-        </h2>
-        <p className="mt-2 text-center text-sm text-gray-600">
-          Or{" "}
-          <a href="#" className="font-medium text-indigo-600 hover:text-indigo-500">
-            start your 14-day free trial
-          </a>
-        </p>
-      </div>
-
-      <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-        <div className="bg-white px-4 py-8 shadow sm:rounded-lg sm:px-10">
-          <form className="space-y-6" onSubmit={submitAction}>
-            <div>
-              <label htmlFor="email" className="block text-sm font-medium leading-6 text-gray-900">
-                Email address
-              </label>
-              <div className="mt-2">
-                <input
-                  id="email"
-                  name="email"
-                  type="email"
-                  autoComplete="email"
-                  required
-                  className="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
-                />
-              </div>
-            </div>
-
-            <div>
-              <label htmlFor="password" className="block text-sm font-medium leading-6 text-gray-900">
-                Password
-              </label>
-              <div className="mt-2">
-                <input
-                  id="password"
-                  name="password"
-                  type="password"
-                  autoComplete="current-password"
-                  required
-                  className="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
-                />
-              </div>
-            </div>
-
-            <div className="flex items-center justify-between">
-              <div className="flex items-center">
-                <input
-                  id="remember-me"
-                  name="remember-me"
-                  type="checkbox"
-                  className="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600"
-                />
-                <label htmlFor="remember-me" className="ml-2 block text-sm text-gray-900">
-                  Remember me
-                </label>
-              </div>
-
-              <div className="text-sm">
-                <a href="#" className="font-medium text-indigo-600 hover:text-indigo-500">
-                  Forgot your password?
-                </a>
-              </div>
-            </div>
-
-            <div>
-              <button
-                type="submit"
-                className="flex w-full justify-center rounded-md bg-indigo-500 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">
-                Sign in
-              </button>
-            </div>
-          </form>
-
-          <div className="mt-6">
-            <div className="relative">
-              <div className="absolute inset-0 flex items-center">
-                <div className="w-full border-t border-gray-300" />
-              </div>
-              <div className="relative flex justify-center text-sm">
-                <span className="bg-white px-2 text-gray-500">Or continue with</span>
-              </div>
-            </div>
-
-            <div className="mt-6 grid grid-cols-3 gap-3">
-              <div>
-                <a
-                  href="#"
-                  className="inline-flex w-full justify-center rounded-md bg-white px-4 py-2 text-gray-500 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0">
-                  <span className="sr-only">Sign in with Facebook</span>
-                  <svg className="h-5 w-5" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20">
-                    <path
-                      fillRule="evenodd"
-                      d="M20 10c0-5.523-4.477-10-10-10S0 4.477 0 10c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V10h2.54V7.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V10h2.773l-.443 2.89h-2.33v6.988C16.343 19.128 20 14.991 20 10z"
-                      clipRule="evenodd"
-                    />
-                  </svg>
-                </a>
-              </div>
-
-              <div>
-                <a
-                  href="#"
-                  className="inline-flex w-full justify-center rounded-md bg-white px-4 py-2 text-gray-500 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0">
-                  <span className="sr-only">Sign in with Twitter</span>
-                  <svg className="h-5 w-5" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20">
-                    <path d="M6.29 18.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0020 3.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.073 4.073 0 01.8 7.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 010 16.407a11.616 11.616 0 006.29 1.84" />
-                  </svg>
-                </a>
-              </div>
-
-              <div>
-                <a
-                  href="#"
-                  className="inline-flex w-full justify-center rounded-md bg-white px-4 py-2 text-gray-500 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0">
-                  <span className="sr-only">Sign in with GitHub</span>
-                  <svg className="h-5 w-5" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20">
-                    <path
-                      fillRule="evenodd"
-                      d="M10 0C4.477 0 0 4.484 0 10.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0110 4.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.203 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.942.359.31.678.921.678 1.856 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0020 10.017C20 4.484 15.522 0 10 0z"
-                      clipRule="evenodd"
-                    />
-                  </svg>
-                </a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/demo/pages/test-nocode-app/index.tsx

@@ -1,202 +0,0 @@
-import formbricks from "@formbricks/js";
-import Image from "next/image";
-import { useEffect, useState } from "react";
-import fbsetup from "../../public/fb-setup.png";
-
-export default function AppPage({}) {
-  const [darkMode, setDarkMode] = useState(false);
-
-  useEffect(() => {
-    if (darkMode) {
-      document.body.classList.add("dark");
-    } else {
-      document.body.classList.remove("dark");
-    }
-  }, [darkMode]);
-
-  return (
-    <div className="h-full bg-white px-12 py-6 dark:bg-slate-800">
-      <div className="flex flex-col justify-between md:flex-row">
-        <div>
-          <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
-            Formbricks In-product Survey Demo App
-          </h1>
-          <p className="text-slate-700 dark:text-slate-300">
-            This app helps you test your in-app surveys. You can create and test user actions, create and
-            update user attributes, etc.
-          </p>
-        </div>
-        <button
-          className="mt-2 rounded-lg bg-slate-200 px-6 py-1 dark:bg-slate-700 dark:text-slate-100"
-          onClick={() => setDarkMode(!darkMode)}>
-          {darkMode ? "Toggle Light Mode" : "Toggle Dark Mode"}
-        </button>
-      </div>
-
-      <div className="my-4 grid grid-cols-1 gap-6 md:grid-cols-2">
-        <div>
-          <div className="rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">1. Setup .env</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Copy the environment ID of your Formbricks app to the env variable in demo/.env
-            </p>
-            <Image src={fbsetup} alt="fb setup" className="mt-4 rounded" priority />
-
-            <div className="mt-4 flex-col items-start text-sm text-slate-700 dark:text-slate-300 sm:flex sm:items-center sm:text-base">
-              <p className="mb-1 sm:mb-0 sm:mr-2">You&apos;re connected with env:</p>
-              <div className="flex items-center">
-                <strong className="w-32 truncate sm:w-auto">
-                  {process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID}
-                </strong>
-                <span className="relative ml-2 flex h-3 w-3">
-                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
-                  <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
-                </span>
-              </div>
-            </div>
-          </div>
-          <div className="mt-4 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">2. Widget Logs</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Look at the logs to understand how the widget works.{" "}
-              <strong className="dark:text-white">Open your browser console</strong> to see the logs.
-            </p>
-            {/* <div className="max-h-[40vh] overflow-y-auto py-4">
-              <LogsContainer />
-            </div> */}
-          </div>
-        </div>
-
-        <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-gray-600 dark:bg-gray-800">
-            <h3 className="text-lg font-semibold dark:text-white">
-              Reset person / pull data from Formbricks app
-            </h3>
-            <p className="text-slate-700 dark:text-gray-300">
-              On formbricks.reset() a few things happen: <strong>New person is created</strong> and{" "}
-              <strong>surveys & no-code actions are pulled from Formbricks:</strong>.
-            </p>
-            <button
-              className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-              onClick={() => {
-                formbricks.reset();
-              }}>
-              Reset
-            </button>
-            <p className="text-xs text-slate-700 dark:text-gray-300">
-              If you made a change in Formbricks app and it does not seem to work, hit &apos;Reset&apos; and
-              try again.
-            </p>
-          </div>
-          <div className="p-6">
-            <div>
-              <button
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("Inner Text");
-                }}>
-                Inner Text
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">Inner Text only</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                id="css-id"
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("Inner Text + CSS ID");
-                }}>
-                Inner Text
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">Inner Text + Css ID</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                className="css-class mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("Inner Text + CSS Class");
-                }}>
-                Inner Text
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">Inner Text + CSS Class</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                id="css-id"
-                className="css-class mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("ID + Class");
-                }}>
-                ID and Class
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">ID + Class</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                id="css-id"
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("ID + Class");
-                }}>
-                ID only
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">ID only</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                className="css-class mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("Class only");
-                }}>
-                Class only
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">Class only</p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                className="css-1 css-2 mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
-                onClick={() => {
-                  console.log("Class + Class");
-                }}>
-                Class + Class
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-gray-300">Class + Class</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/demo/styles/globals.css

@@ -1,3 +1,26 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+/* Example on overriding packages/js colors */
+.dark {
+  --fb-brand-color: red;
+  --fb-brand-text-color: white;
+  --fb-border-color: green;
+  --fb-border-color-highlight: var(--slate-500);
+  --fb-focus-color: red;
+  --fb-heading-color: yellow;
+  --fb-subheading-color: green;
+  --fb-info-text-color: orange;
+  --fb-signature-text-color: blue;
+  --fb-survey-background-color: black;
+  --fb-accent-background-color: rgb(13, 13, 12);
+  --fb-accent-background-color-selected: red;
+  --fb-placeholder-color: white;
+  --fb-shadow-color: yellow;
+  --fb-rating-fill: var(--yellow-300);
+  --fb-rating-hover: var(--yellow-500);
+  --fb-back-btn-border: currentColor;
+  --fb-submit-btn-border: transparent;
+  --fb-rating-selected: black;
+}

apps/formbricks-com/app/docs/api/client/actions/page.mdx

@@ -0,0 +1,85 @@
+import { Fence } from "@/components/shared/Fence";
+
+export const metadata = {
+  title: "Formbricks Responses API Documentation - Manage Your Survey Data Seamlessly",
+  description:
+    "Unlock the full potential of Formbricks' Client Actions API. Create Actions right from the API.",
+};
+
+#### Client API
+
+# Actions API
+
+The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
+
+This API can be used to:
+- [Add Action for User](#add-action-for-user)
+
+
+---
+
+## Add Action for User {{ tag: 'POST', label: '/api/v1/client/<environment-id>/actions' }}
+
+Adds an Actions for a given User by their User ID
+
+<Row>
+  <Col>
+
+    ### Mandatory Body Fields
+
+    <Properties>
+      <Property name="userId" type="string">
+        The id of the user for whom the action is being created.
+      </Property>
+      <Property name="name" type="string">
+        The name of the Action being created.
+      </Property>
+    </Properties>
+
+  </Col>
+  <Col sticky>
+
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/actions">
+
+    ```bash {{ title: 'cURL' }}
+    curl --location --request POST 'https://app.formbricks.com/api/v1/client/<environment-id>/actions' \
+    --data-raw '{
+        "userId": "1",
+        "name": "new_action_v2"
+    }'
+    ```
+
+    ```json {{ title: 'Example Request Body' }}
+    {
+        "userId": "1",
+        "name": "new_action_v2"
+    }
+    ```
+
+    </CodeGroup>
+
+    <CodeGroup title="Response">
+
+    ```json {{ title: '200 Success' }}
+    {
+    "data": {}
+    }
+    ```
+
+    ```json {{ title: '400 Bad Request' }}
+    {
+        "code": "bad_request",
+        "message": "Fields are missing or incorrectly formatted",
+        "details": {
+            "name": "Required"
+        }
+    }
+    ```
+
+    </CodeGroup>
+
+  </Col>
+</Row>
+
+---
+

apps/formbricks-com/app/docs/api/client/displays/page.mdx

@@ -3,7 +3,7 @@ import { Fence } from "@/components/shared/Fence";
 export const metadata = {
   title: "Formbricks Public Client API Guide: Manage Survey Displays & Responses",
   description:
-    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on how to mark surveys as displayed as well as responded for individual persons, ensuring seamless client-side interactions without compromising data security.",
+    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on how to mark create and update survey displays for users.",
 };
 
 #### Client API
@@ -13,17 +13,17 @@ export const metadata = {
 The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
 
 This set of API can be used to
-- [Mark Survey as Displayed](#mark-survey-as-displayed-for-person)
-- [Mark Survey as Responded](#mark-survey-as-responded-for-person)
+- [Create Display](#create-display)
+- [Update Display](#update-display)
 
 ---
 
-## Mark Survey as Displayed for Person {{ tag: 'POST', label: '/api/v1/client/diplays' }}
+## Create Display {{ tag: 'POST', label: '/api/v1/client/<environment-id>/diplays' }}
 
 <Row>
   <Col>
 
-    Mark a Survey as seen for a Person provided valid SurveyId and PersonId.
+    Create Display of survey for a user
 
     ### Mandatory Request Body JSON Keys
     <Properties>
@@ -32,25 +32,30 @@ This set of API can be used to
       </Property>
     </Properties>
 
+    ### Optional Request Body JSON Keys
     <Properties>
-      <Property name="personId" type="string">
-        Person ID for whom mark a survey as viewed
+      <Property name="userId" type="string">
+        Already existing user's ID to mark as viewed for a survey
+      </Property>
+      <Property name="responseId" type="string">
+        Already existing response's ID to link with this new Display
       </Property>
     </Properties>
 
+
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/displays">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/displays">
 
     ```bash {{ title: 'cURL' }}
     curl -X POST \
     'https://app.formbricks.com/api/v1/client/displays' \
     -H 'Content-Type: application/json' \
     -d '{
-        "surveyId": "<survey-id>",
-        "personId": "<person-id>"
-    }'
+        "surveyId":"<survey-id>",
+        "userId":"<user-id>"
+      }'
     ```
 
     </CodeGroup>
@@ -60,29 +65,13 @@ This set of API can be used to
     ```json {{title:'200 Success'}}
     {
       "data": {
-        "id": "clm4qiygr00uqs60h5f5ola5h",
-        "createdAt": "2023-09-04T10:24:36.603Z",
-        "updatedAt": "2023-09-04T10:24:36.603Z",
-        "surveyId": "<survey-id>",
-        "person": {
-            "id": "<person-id>",
-            "attributes": {
-                "userId": "CYO600",
-                "email": "wei@google.com",
-                "Name": "Wei Zhu",
-                "Role": "Manager",
-                "Company": "Google",
-                "Experience": "2 years",
-                "Usage Frequency": "Daily",
-                "Company Size": "2401 employees",
-                "Product Satisfaction Score": "4",
-                "Recommendation Likelihood": "3"
-                },
-            "createdAt": "2023-08-08T18:05:01.483Z",
-            "updatedAt": "2023-08-08T18:05:01.483Z"
-            },
-        "status": "seen"
-        }
+        "id": "clp83r8uy000ceyqcbld2ebwj",
+        "createdAt": "2023-11-21T08:57:23.866Z",
+        "updatedAt": "2023-11-21T08:57:23.866Z",
+        "surveyId": "cloqzeuu70000z8khcirufo60",
+        "responseId": null,
+        "personId": "cloo25v3e0000z8ptskh030jd"
+      }
     }
     ```
 
@@ -102,22 +91,36 @@ This set of API can be used to
 
 ---
 
-## Mark Survey as Responded for Person {{ tag: 'POST', label: '/api/v1/client/diplays/[displayId]/responded' }}
+## Update Display {{ tag: 'PUT', label: '/api/v1/client/<environment-id>/diplays/<display-id>' }}
 
 <Row>
   <Col>
 
-    Mark a Displayed Survey as responded for a Person.
+    Update a display by it's ID
+
+    ### Optional Request Body JSON Keys
+    <Properties>
+      <Property name="userId" type="string">
+        Already existing user's ID to mark as viewed for a survey
+      </Property>
+      <Property name="responseId" type="string">
+        Already existing response's ID to link with this new Display
+      </Property>
+    </Properties>
+
 
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/diplays/[displayId]/responded">
+    <CodeGroup title="Request" tag="PUT" label="/api/v1/client/<environment-id>/displays/<display-id>">
 
     ```bash {{ title: 'cURL' }}
     curl -X POST \
-    --location \
-    'https://app.formbricks.com/api/v1/client/displays/<displayId>/responded'
+    'https://app.formbricks.com/api/v1/client/<environment-id>/displays/<display-id>' \
+    -H 'Content-Type: application/json' \
+    -d '{
+        "userId":"<user-id>"
+      }'
     ```
 
     </CodeGroup>
@@ -127,37 +130,23 @@ This set of API can be used to
     ```json {{title:'200 Success'}}
     {
       "data": {
-        "id": "<displayId>",
-        "createdAt": "2023-09-04T10:24:36.603Z",
-        "updatedAt": "2023-09-04T10:33:56.978Z",
-        "surveyId": "<surveyId>",
-        "person": {
-            "id": "<personId>",
-            "attributes": {
-                "userId": "CYO600",
-                "email": "wei@google.com",
-                "Name": "Wei Zhu",
-                "Role": "Manager",
-                "Company": "Google",
-                "Experience": "2 years",
-                "Usage Frequency": "Daily",
-                "Company Size": "2401 employees",
-                "Product Satisfaction Score": "4",
-                "Recommendation Likelihood": "3"
-            },
-            "createdAt": "2023-08-08T18:05:01.483Z",
-            "updatedAt": "2023-08-08T18:05:01.483Z"
-        },
-        "status": "responded"
+        "id": "clp83r8uy000ceyqcbld2ebwj",
+        "createdAt": "2023-11-21T08:57:23.866Z",
+        "updatedAt": "2023-11-21T09:05:27.285Z",
+        "surveyId": "cloqzeuu70000z8khcirufo60",
+        "responseId": null,
+        "personId": "cloo25v3e0000z8ptskh030jd"
       }
     }
     ```
 
-    ```json {{ title: '500 Internal Server Error' }}
+    ```json {{ title: '400 Bad Request' }}
     {
-      "code": "internal_server_error",
-      "message": "Database operation failed",
-      "details": {}
+      "code": "bad_request",
+      "message": "Fields are missing or incorrectly formatted",
+      "details": {
+        "surveyId": "Required"
+      }
     }
     ```
     </CodeGroup>

apps/formbricks-com/app/docs/api/client/overview/page.mdx

@@ -10,7 +10,7 @@ export const metadata = {
 
 Formbricks offers two types of APIs: the **Public Client API** and the **Management API**. Each API serves a different purpose, has different authentication requirements, and provides access to different data and settings.
 
-Checkout the [API Key Setup](/docs/api/api-key-setup) - to generate, store, or delete API Keys.
+Checkout the [API Key Setup](/docs/api/management/api-key-setup) - to generate, store, or delete API Keys.
 
 ## Public Client API
 
@@ -27,7 +27,7 @@ The Management API provides access to all data and settings that are visible in
 
 API requests made to the Management API are authorized using a personal API key. This key grants the same rights and access as if you were logged in at formbricks.com. It's essential to keep your API key secure and not share it with others.
 
-To generate, store, or delete an API key, follow the instructions provided on the following page [API Key](/docs/api/api-key-setup).
+To generate, store, or delete an API key, follow the instructions provided on the following page [API Key](/docs/api/management/api-key-setup).
 
 - [Action Class API](/docs/api/management/action-classes) - Create, Update, and Delete Action Classes
 - [Attribute Class API](/docs/api/management/attribute-classes) - Create, Update, and Delete Attribute Classes

apps/formbricks-com/app/docs/api/client/people/page.mdx

@@ -0,0 +1,154 @@
+import { Fence } from "@/components/shared/Fence";
+
+export const metadata = {
+  title: "Formbricks Public Client API Guide: Manage Users",
+  description:
+    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on creating and updating users to help in user identification.",
+};
+
+#### Client API
+
+# People API
+
+The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
+
+This set of API can be used to
+- [Create Person](#create-person)
+- [Update Person](#update-person)
+
+---
+
+## Create Person {{ tag: 'POST', label: '/api/v1/client/<environment-id>/people' }}
+
+<Row>
+  <Col>
+
+    Create User with your own User ID
+
+    ### Mandatory Request Body JSON Keys
+    <Properties>
+      <Property name="environmentId" type="string">
+        Environment to create a person in
+      </Property>
+    </Properties>
+
+    <Properties>
+      <Property name="userId" type="string">
+        User ID which you would like to identify the person with
+      </Property>
+    </Properties>
+
+  </Col>
+  <Col sticky>
+
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/people">
+
+    ```bash {{ title: 'cURL' }}
+    curl -X POST \
+    'https://app.formbricks.com/api/v1/client/<environment-id>/people' \
+    -H 'Content-Type: application/json' \
+    -d '{
+        "environmentId":"clonzr6vc0009z8md7y06hipl",
+        "userId":"docs_user"
+    }'
+    ```
+
+    </CodeGroup>
+
+    <CodeGroup title="Response">
+
+    ```json {{title:'200 Success'}}
+    {
+      "data": {
+        "status": "success",
+        "person": {
+            "id": "clp861gvu0000v7wzr950fqad",
+            "userId": "docs_user",
+            "attributes": {},
+            "environmentId": "clonzr6vc0009z8md7y06hipl",
+            "createdAt": "2023-11-21T10:01:20.058Z",
+            "updatedAt": "2023-11-21T10:01:20.058Z"
+            }
+        }
+    }
+    ```
+
+    ```json {{ title: '400 Bad Request' }}
+    {
+      "code": "bad_request",
+      "message": "Fields are missing or incorrectly formatted",
+      "details": {
+        "surveyId": "Required"
+      }
+    }
+    ```
+    </CodeGroup>
+
+  </Col>
+</Row>
+
+---
+
+## Update Person {{ tag: 'POST', label: '/api/v1/client/<environment-id>/people/<user-id>' }}
+
+<Row>
+  <Col>
+
+    Update Person by their User ID
+
+    ### Mandatory Request Body JSON Keys
+    <Properties>
+      <Property name="attributes" type="JSON">
+        Key Value pairs of attributes to add to the user
+      </Property>
+    </Properties>
+
+  </Col>
+  <Col sticky>
+
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/people/<user-id>">
+
+    ```bash {{ title: 'cURL' }}
+    curl -X POST \
+    --location \
+    'https://app.formbricks.com/api/v1/client/<environment-id>/people/<user-id>'
+    -H 'Content-Type: application/json' \
+    -d '{
+        "attributes":{
+            "welcome_to":"formbricks"
+        }
+    }'
+    ```
+
+    </CodeGroup>
+
+    <CodeGroup title="Response">
+
+    ```json {{title:'200 Success'}}
+    {
+      "data": {
+        "id": "clp868htl0003v7wzmy977m15",
+        "userId": "new_docs_user",
+        "attributes": {
+            "welcome_to": "formbricks"
+        },
+        "environmentId": "clonzr6vc0009z8md7y06hipl",
+        "createdAt": "2023-11-21T10:06:47.865Z",
+        "updatedAt": "2023-11-21T10:06:47.865Z"
+      }
+    }
+    ```
+
+    ```json {{ title: '500 Internal Server Error' }}
+    {
+      "code": "internal_server_error",
+      "message": "Database operation failed",
+      "details": {}
+    }
+    ```
+    </CodeGroup>
+
+  </Col>
+</Row>
+
+---

apps/formbricks-com/app/docs/api/client/responses/page.mdx

@@ -6,15 +6,19 @@ export const metadata = {
     "Unlock the full potential of Formbricks' Responses API. From fetching to updating survey responses, our comprehensive guide helps you integrate and manage survey data efficiently without compromising security. Ideal for client-side interactions.",
 };
 
-#### Management API
+#### Client API
 
 # Responses API
 
 The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
 
+This set of API can be used to
+- [Create Response](#create-response)
+- [Update Response](#update-response)
+
 ---
 
-## Create a response {{ tag: 'POST', label: '/api/v1/client/responses' }}
+## Create Response {{ tag: 'POST', label: '/api/v1/client/<environment-id>/responses' }}
 
 Add a new response to a survey.
 
@@ -39,8 +43,8 @@ Add a new response to a survey.
     ### Optional Body Fields
 
     <Properties>
-      <Property name="personId" type="string" required>
-        Internal Formbricks id to identify the user sending the response
+      <Property name="userId" type="string" required>
+        Pre-existing User ID to identify the user sending the response
       </Property>
     </Properties>
 
@@ -49,20 +53,20 @@ Add a new response to a survey.
 | field name | required | default | description                                                                                                                                    |
 | ---------- | -------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
 | data       | yes      | -       | The response data object (answers to the survey). In this object the key is the questionId, the value the answer of the user to this question. |
-| personId   | no       | -       | The person this response is connected to.                                                                                                      |
+| userId     | no       | -       | The person this response is connected to.                                                                                                      |
 | surveyId   | yes      | -       | The survey this response is connected to.                                                                                                      |
 | finished   | yes      | false   | Mark a response as complete to be able to filter accordingly.                                                                                  |
 
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/responses">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/responses">
 
     ```bash {{ title: 'cURL' }}
-    curl --location --request POST 'https://app.formbricks.com/api/v1/client/responses' \
+    curl --location --request POST 'https://app.formbricks.com/api/v1/client/<environment-id>/responses' \
     --data-raw '{
-      "surveyId":"clfqz1esd0000yzah51trddn8",
-      "personId": "clfqjny0v000ayzgsycx54a2c",
+      "surveyId":"cloqzeuu70000z8khcirufo60",
+      "userId": "1",
       "finished": true,
       "data": {
           "clfqjny0v0003yzgscnog1j9i": 10,
@@ -73,8 +77,8 @@ Add a new response to a survey.
 
     ```json {{ title: 'Example Request Body' }}
     {
-      "personId": "clfqjny0v000ayzgsycx54a2c",
-      "surveyId": "clfqz1esd0000yzah51trddn8",
+      "userId": "1",
+      "surveyId": "cloqzeuu70000z8khcirufo60",
       "finished": true,
       "data": {
           "clfqjny0v0003yzgscnog1j9i": 10,
@@ -90,19 +94,30 @@ Add a new response to a survey.
     ```json {{ title: '200 Success' }}
     {
     "data": {
-      "id": "clisyqeoi000219t52m5gopke",
-      "surveyId": "clfqz1esd0000yzah51trddn8",
-      "finished": true,
-      "person": {
-        "id": "clfqjny0v000ayzgsycx54a2c",
-        "attributes": {
-          "email": "me@johndoe.com"
-        }
-      },
-      "data": {
-          "clfqjny0v0003yzgscnog1j9i": 10,
-          "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
-        }
+        "id": "clp84xdld0002px36fkgue5ka",
+        "createdAt": "2023-11-21T09:30:09.553Z",
+        "updatedAt": "2023-11-21T09:30:09.553Z",
+        "surveyId": "cloqzeuu70000z8khcirufo60",
+        "finished": true,
+        "data": {
+            "clfqjny0v0003yzgscnog1j9i": 10,
+            "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
+        },
+        "meta": {
+            "userAgent": {}
+        },
+        "personAttributes": {},
+        "singleUseId": null,
+        "person": {
+            "id": "cloo25v3e0000z8ptskh030jd",
+            "userId": "1",
+            "attributes": {},
+            "environmentId": "clonzr6vc0009z8md7y06hipl",
+            "createdAt": "2023-11-07T08:17:23.114Z",
+            "updatedAt": "2023-11-07T08:17:23.114Z"
+        },
+        "tags": [],
+        "notes": []
       }
     }
     ```
@@ -124,7 +139,7 @@ Add a new response to a survey.
 
 ---
 
-## Update a response {{ tag: 'POST', label: '/api/v1/client/responses/<response-id>' }}
+## Update Response {{ tag: 'PUT', label: '/api/v1/client/<environment-id>/responses/<response-id>' }}
 
 Update an existing response in a survey.
 
@@ -134,6 +149,9 @@ Update an existing response in a survey.
     ### Mandatory Body Fields
 
     <Properties>
+      <Property name="finished" type="boolean">
+        Marks whether the response is complete or not.
+      </Property>
       <Property name="data" type="string">
         The data of the response as JSON object (key: questionId, value: answer).
       </Property>
@@ -149,27 +167,25 @@ Update an existing response in a survey.
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/responses/<response-id>">
+    <CodeGroup title="Request" tag="PUT" label="/api/v1/client/<environment-id>/responses/<response-id>">
 
     ```bash {{ title: 'cURL' }}
-    curl --location --request POST 'https://app.formbricks.com/api/v1/client/responses/<response-id>' \
+    curl --location --request PUT 'https://app.formbricks.com/api/v1/client/<environment-id>/responses/<response-id>' \
     --data-raw '{
-      "personId": "clfqjny0v000ayzgsycx54a2c",
-      "surveyId": "clfqz1esd0000yzah51trddn8",
-      "finished": true,
-      "data": {
-          "clggpvpvu0009n40g8ikawby8": 5,
+      "finished":false,
+        "data": {
+        "clfqjny0v0003yzgscnog1j9i": 10,
+        "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
       }
     }'
     ```
 
     ```json {{ title: 'Example Request Body' }}
     {
-      "personId": "clfqjny0v000ayzgsycx54a2c",
-      "surveyId": "clfqz1esd0000yzah51trddn8",
-      "finished": true,
-      "data": {
-          "clggpvpvu0009n40g8ikawby8": 5,
+      "finished":false,
+        "data": {
+        "clfqjny0v0003yzgscnog1j9i": 10,
+        "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
       }
     }
     ```
@@ -181,20 +197,30 @@ Update an existing response in a survey.
     ```json {{ title: '200 Success' }}
     {
       "data": {
-        "id": "clisyqeoi000219t52m5gopke",
-        "surveyId": "clfqz1esd0000yzah51trddn8",
-        "finished": true,
-        "person": {
-          "id": "clfqjny0v000ayzgsycx54a2c",
-          "attributes": {
-            "email": "me@johndoe.com"
-          }
-        },
+        "id": "clp84xdld0002px36fkgue5ka",
+        "createdAt": "2023-11-21T09:30:09.553Z",
+        "updatedAt": "2023-11-21T09:35:38.357Z",
+        "surveyId": "cloqzeuu70000z8khcirufo60",
+        "finished": false,
         "data": {
-          "clfqjny0v0003yzgscnog1j9i": 10,
-          "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks",
-          "clggpvpvu0009n40g8ikawby8": 5
-        }
+            "clfqjny0v0003yzgscnog1j9i": 10,
+            "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
+        },
+        "meta": {
+            "userAgent": {}
+        },
+        "personAttributes": {},
+        "singleUseId": null,
+        "person": {
+            "id": "cloo25v3e0000z8ptskh030jd",
+            "userId": "1",
+            "attributes": {},
+            "environmentId": "clonzr6vc0009z8md7y06hipl",
+            "createdAt": "2023-11-07T08:17:23.114Z",
+            "updatedAt": "2023-11-07T08:17:23.114Z"
+        },
+        "tags": [],
+        "notes": []
       }
     }
     ```

apps/formbricks-com/app/docs/api/management/surveys/page.mdx

@@ -14,6 +14,7 @@ This set of API can be used to
 - [List All Surveys](#list-all-surveys)
 - [Get Survey](#get-survey-by-id)
 - [Create Survey](#create-survey)
+- [Update Survey](#update-survey-by-id)
 - [Delete Survey](#delete-survey-by-id)
 
 <Note>You will need an API Key to interact with these APIs.</Note>
@@ -146,7 +147,7 @@ This set of API can be used to
                     {
                         "id": "lkjaxb73ulydzeumhd51sx9g",
                         "type": "openText",
-                        "headline": "What is the main benefit your receive from My Product?",
+                        "headline": "What is the main benefit you receive from My Product?",
                         "required": true
                     },
                     {
@@ -472,6 +473,121 @@ This set of API can be used to
 
 ---
 
+## Update Survey by ID {{ tag: 'PUT', label: '/api/v1/management/surveys/<survey-id>' }}
+
+<Row>
+  <Col>
+
+    Update a survey by its ID
+
+    ### Mandatory Headers
+
+    <Properties>
+      <Property name="x-Api-Key" type="string">
+        Your Formbricks API key.
+      </Property>
+    </Properties>
+
+    ### Body
+
+    <CodeGroup title="Request Body">
+    ```json {{ title: 'cURL' }}
+    {
+        "name": "My renamed Survey",
+        "redirectUrl":"https://formbricks.com",
+        "type":"web"
+    }
+    ```
+    </CodeGroup>
+
+
+  </Col>
+  <Col sticky>
+
+    <CodeGroup title="Request" tag="PUT" label="/api/v1/management/surveys/<survey-id>">
+
+    ```bash {{ title: 'cURL' }}
+    curl -X POST https://app.formbricks.com/api/v1/management/surveys/<survey-id> \
+     --header 'Content-Type: application/json' \
+     --header 'x-api-key: <your-api-key>' \
+     -d '{"name": "My renamed Survey"}'
+    ```
+
+    </CodeGroup>
+
+    <CodeGroup title="Response">
+
+    ```json {{title:'200 Success'}}
+    {
+        "data": {
+            "id": "cloqzeuu70000z8khcirufo60",
+            "createdAt": "2023-11-09T09:23:42.367Z",
+            "updatedAt": "2023-11-09T09:23:42.367Z",
+            "name": "My renamed Survey",
+            "redirectUrl": null,
+            "type": "link",
+            "environmentId": "clonzr6vc0009z8md7y06hipl",
+            "status": "inProgress",
+            "welcomeCard": {
+                "html": "Thanks for providing your feedback - let's go!",
+                "enabled": false,
+                "headline": "Welcome!",
+                "timeToFinish": false
+            },
+            "questions": [
+                {
+                    "id": "l9rwn5nbk48y44tvnyyjcvca",
+                    "type": "openText",
+                    "headline": "Why did you leave the platform?",
+                    "required": true,
+                    "inputType": "text"
+                }
+            ],
+            "thankYouCard": {
+                "enabled": true,
+                "headline": "Thank you!",
+                "subheader": "We appreciate your feedback."
+            },
+            "hiddenFields": {
+                "enabled": true,
+                "fieldIds": []
+            },
+            "displayOption": "displayOnce",
+            "recontactDays": null,
+            "autoClose": null,
+            "delay": 0,
+            "autoComplete": 50,
+            "closeOnDate": null,
+            "surveyClosedMessage": null,
+            "productOverwrites": null,
+            "singleUse": {
+                "enabled": false,
+                "isEncrypted": true
+            },
+            "verifyEmail": null,
+            "pin": null,
+            "triggers": [],
+            "attributeFilters": []
+        }
+    }
+    ```
+    
+    ```json {{ title: '401 Not Authenticated' }}
+    {
+      "code": "not_authenticated",
+      "message": "Not authenticated",
+      "details": {
+        "x-Api-Key": "Header not provided or API Key invalid"
+        }
+    }
+    ```
+    </CodeGroup>
+
+  </Col>
+</Row>
+
+---
+
 
 ## Delete Survey by ID {{ tag: 'DELETE', label: '/api/v1/management/surveys/<survey-id>' }}
 

apps/formbricks-com/app/docs/attributes/identify-users/page.mdx

@@ -23,7 +23,7 @@ To enable the User identification feature you need to set the `userId` in the in
 formbricks.init({
   environmentId: "<environment-id>",
   apiHost: "<api-host>",
-  userID: "<user_id>",
+  userId: "<user_id>",
 });
 ```
 

apps/formbricks-com/app/docs/best-practices/docs-feedback/page.mdx

@@ -40,7 +40,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 3. Connect to API
 4. Test
 
-### 1. Setting up Formbricks Cloud
+## 1. Setting up Formbricks Cloud
 
 1. To get started, create an account for the [Formbricks Cloud](https://app.formbricks.com/auth/signup).
 
@@ -74,7 +74,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 5. In the same way, you can change the Internal Question ID of the _Please elaborate_ question to **“additionalFeedback”** and the one of the _Page URL_ question to **“pageUrl”**.
 
 <Note>
-  ## Answers need to be identical If you want different answers than “Yes 👍” and “No 👎” you need to update the
+  Answers need to be identical If you want different answers than “Yes 👍” and “No 👎” you need to update the
   choices accordingly. They have to be identical to the frontend we're building in the next step.
 </Note>
 
@@ -108,10 +108,10 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 **You’re all setup in Formbricks Cloud for now 👍**
 
-### 2. Build the frontend
+## 2. Build the frontend
 
 <Note>
-  ## Your frontend might work differently Your frontend likely looks and works differently. This is an example
+  Your frontend might work differently Your frontend likely looks and works differently. This is an example
   specific to our tech stack. We want to illustrate what you should consider building yours 😊
 </Note>
 
@@ -311,7 +311,7 @@ return (
 </Col>
 ## 3. Connecting to the Formbricks API
 
-The last step is to hook up your sparkling new frontend to the Formbricks API. To do so, we followed the “[Create Response](/docs/client-api/create-response)” and “[Update Response](/docs/client-api/update-response)” pages in our docs.
+The last step is to hook up your sparkling new frontend to the Formbricks API. To do so, we followed the “[Create Response](/docs/api/client/responses#create-a-response)” and “[Update Response](/docs/api/client/responses#update-a-response)” pages in our docs.
 
 Here is the code for the `handleFeedbackSubmit` function with comments:
 <Col>

apps/formbricks-com/app/docs/contributing/gitpod/page.mdx

@@ -1,141 +0,0 @@
-import Image from "next/image";
-import GitpodPorts from "./gitpod-ports.webp";
-import GitpodAuth from "./gitpod-auth.webp";
-import GitpodNewWorkspace from "./gitpod-new-workspace.webp";
-import GitpodPreparing from "./gitpod-preparing.webp";
-import GitpodRunning from "./gitpod-running.webp";
-
-export const metadata = {
-  title: "Gitpod Setup",
-  description:
-    "With one click, you can setup the Formbricks developer environment in your browser using Gitpod",
-};
-
-#### Contributing
-
-# Gitpod
-
-### One Click Setup
-
-- This will open a fully configured workspace in your browser with all the necessary dependencies already installed.
-
-- Click the button below to open this project in Gitpod.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/formbricks/formbricks)
- 
-## Gitpod Setup Overview
-
-    **Building custom image for the workspace:**
-    - This includes : Installing `yq` and `turbo` globally before the workspace starts. This is accomplished within the `.gitpod.Dockerfile` along with starting upon a base custom image building on [workspace-full](https://hub.docker.com/r/gitpod/workspace-full/dockerfile).
-
-    **Initialization of Formbricks:** 
-     - During the prebuilds phase, we initialize Formbricks by performing the following tasks:
-        1. Setting up environment variables.
-        2. Installing monorepo dependencies.
-        3. Installing Docker images by extracting them from the `packages/database/docker-compose.yml` file.
-        4. Building the @formbricks/js component.
-     - When the workspace starts:
-        1. Wait for the web and demo apps to launch on Gitpod. This automatically opens the `apps/demo/.env` file. Utilize dynamic localhost URLs (e.g., `localhost:3000` for signup and `localhost:8025` for email confirmation) to configure `NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID`. After creating your account and finding the `ID` in the URL at `localhost:3000`, replace `YOUR_ENVIRONMENT_ID` in the `.env` file located in `app/demo`. 
-
-    **Web Component Initialization:** 
-     - we initialize the @formbricks/web component during prebuilds. This involves:
-        1. Installing build dependencies for the `@formbricks/web#go` task from turbo.json in prebuilds to save time.
-        2. Starting PostgreSQL and Mailhog containers for running migrations in prebuilds.
-        3. To prevent the "Init" task from running indefinitely due to prebuild rules, a cleanup `docker compose down` step i.e. `db:down` is added to `turbo.json`. This step is designed to halt the execution of containers that are currently running.
-     - When the workspace starts:
-        1. Initializing environment variables.
-        2. Replacing `NEXT_PUBLIC_WEBAPP_URL` and `NEXTAUTH_URL` to take in Gitpod URL's ports when running on VSCode browser.
-        3. Starting the `@formbricks/web` dev environment.
-
-    **Demo Component Initialization:** 
-     - Similar to the web component, the demo component is also initialized during prebuilds. This includes:
-        1. Installing build dependencies for the `formbricks/demo#go` task from turbo.json in prebuilds to save time.
-        2. Caching hits and replaying builds from the `@formbricks/js` component.
-     - When the workspace starts: 
-        1. Initializing environment variables.
-        2. Replaces `NEXT_PUBLIC_FORMBRICKS_API_HOST` to take in Gitpod URL's ports when running on VSCode browser.
-        3. Starting the `@formbricks/demo` dev environment.
-
-    **GitHub Prebuilds Configuration:** 
-     - This configures GitHub Prebuilds for the master branch, pull requests, and adding comments. This helps automate the prebuild process for the specified branches and actions.
-
-    **VSCode Extensions:** 
-     - This includes a list of VSCode extensions that are added to the configuration when using Gitpod. These extensions can enhance the development experience within Gitpod.
-
-
-## Gitpod Guide  
-
-### 1. Browser Redirection
-
-After clicking the one-click setup button, Gitpod will open a new tab or window. Please ensure that your browser allows redirection to successfully access the services:
-
-### 2. Authorizing in Gitpod
-<Image src={GitpodAuth} alt="Gitpod Auth Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
-- This is the Gitpod Authentication Page. It appears when you click the "Open in GitPod" button and Gitpod needs to authenticate your access to the workspace. Click on 'Continue With Github' to authorize your GitPod session.
-
-### 3. Creating a New Workspace
-<Image src={GitpodNewWorkspace} alt="Gitpod New workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
-- After authentication, Gitpod asks to create a new workspace for you. This page displays the configurations of your workspace. 
-- You can use either choose either VS Code Browser or  VS Code Desktop editor with the 'Standard Class' for your workspace class.
-- If you opt for the VS Code Desktop, follow the following steps
-   1. Gitpod will prompt you to grant access to the VSCode app. Once approved, install the GitPod extension from the VSCode Marketplace and follow the prompts to authorize the integration.
-   2. Change the `WEBAPP_URL` and the `NEXTAUTH_URL` to `https://localhost:3000`
-
-
-### 4. Gitpod preparing the created Workspace
-<Image src={GitpodPreparing} alt="Gitpod Preparing workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
-- Gitpod is preparing your workspace with all the necessary dependencies and configurations. You will see this page while Gitpod sets up your development environment.
-
-### 5. Gitpod running the Workspace
-<Image src={GitpodRunning} alt="Gitpod Running Workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
-- Once the workspace is fully prepared, voila, it enters the running state. You can start working on your project in this environment.
-
-### Ports and Services
-
-Here are the ports and corresponding URLs for the services within your Gitpod environment:
-
-- **Port 3000**:
-   - **Service**: Demo App
-   - **Description**: This port hosts the demo application of your project. You can access and interact with your application's demo by navigating to this port.
-
-- **Port 3001**:
-   - **Service**: Formbricks website
-   - **Description**: This port hosts the [Formbricks](https://formbricks.com) website, which contains documents, pricing, blogs, best practices, and concierge service.
-
-- **Port 3002**:
-   - **Service**: Formbricks In-product Survey Demo App
-   - **Description**: This app helps you test your in-app surveys. You can create and test user actions, create and update user attributes, etc.
-
-- **Port 5432**:
-   - **Service**: PostgreSQL Database Server
-   - **Description**: The PostgreSQL DB is hosted on this port.
-
-- **Port 1025**:
-   - **Service**: SMPT server
-   - **Description**: SMTP Server for sending and receiving email messages. This server is responsible for handling email communication.
-
-- **Port 8025**:
-   - **Service**: Mailhog
-
-### Accessing port URLs
-  1. **Direct URL Composition**:
-   - You can access the dedicated port URL by pre-pending the port number to the workspace URL.
-   - For example, if you want to access port 3000, you can use the URL format: `3000-yourworkspace.ws-eu45.gitpod.io`.
-
-  2. **Using [gp CLI](https://www.gitpod.io/docs/references/gitpod-cli)**:
-   - Gitpod provides a convenient command, `gp url`, to quickly retrieve the URL for a specific port.
-   - Simply use the command followed by the desired port number. For example, to get the URL for port 3000, run: `gp url 3000`.
-
-  3. **Listing All Open Port URLs**:
-   - If you prefer to see a list of all open port URLs at once, you can use the `gp ports list` command.
-   - Running this command will display a list of ports along with their corresponding URLs.
-
-  4. **Viewing All Ports in Panel**:
-   - Gitpod also offers a user-friendly 'Ports' tab in the Gitpod panel.
-   - Click on the 'Ports' tab to view a list of all open ports and their respective URLs.
-
-  <Image src={GitpodPorts} alt="Gitpod Ports tab" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
-
-  These URLs and port numbers represent various services and endpoints within your Gitpod environment. You can access and interact with these services by the Port URL for the respective service.
-
-Still can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!

apps/formbricks-com/app/docs/contributing/setup/page.mdx

@@ -1,138 +1,228 @@
+import Image from "next/image";
+import GitpodPorts from "./gitpod/ports.webp";
+import GitpodAuth from "./gitpod/auth.webp";
+import GitpodNewWorkspace from "./gitpod/new-workspace.webp";
+import GitpodPreparing from "./gitpod/preparing.webp";
+import GitpodRunning from "./gitpod/running.webp";
+
+import GithubCodespaceNew from "./github-codespaces/new.webp";
+import GithubCodespaceLoading from "./github-codespaces/loading.webp";
+import GithubCodespaceEnvFile from "./github-codespaces/env.webp";
+import GithubCodespaceTerminal from "./github-codespaces/terminal.webp";
+import GithubCodespaceRun from "./github-codespaces/run.webp";
+import GithubCodespacePorts from "./github-codespaces/ports.webp";
+
 export const metadata = {
   title: "Formbricks Development Setup: Complete Guide to Local Environment Configuration for Dev",
   description:
-    "Step-by-step guide to setting up your local development environment for Formbricks. Includes installing essential tools like Node.JS, pnpm, and Docker, and accessing the entire Formbricks stack including the Demo app and the main website",
+    "Step-by-step guide to setting up a development environment for Formbricks. We officially support Gitpod and Github Codespaces for quick setup.",
 };
 
 #### Contributing
 
 # Setup Dev Environment
 
-To get the project running locally on your machine you need to have the following development tools installed:
+We currently officially support the below methods to set up your development environment for Formbricks.
 
-- Node.JS (we recommend v18)
-- [pnpm](https://pnpm.io/)
-- [Docker](https://www.docker.com/) (to run PostgreSQL / MailHog)
+<Note>
+Both the below cloud IDEs have a **generous free tier** to explore and develop! But make sure to
+not overuse the machines as Formbricks will not be responsible for any charges incurred.
+</Note>
 
-1. Clone the project:
+### [GitPod](#gitpod)
+This will open a fully configured workspace in your browser with all the necessary dependencies already installed. Click the button below to open this project in Gitpod:
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://Github.com/formbricks/formbricks)
+
+For a detailed guide, visit the [Gitpod Setup Guide](#gitpod-guide) section below.
+
+### [Github Codespaces](#Github-codespaces)
+This will open a Github VSCode Interface on the cloud for you. This setup will have the Formbricks codebase and all the dependencies installed. Click the button below to configure your instance and open the project in Github Codespaces:
+
+[![Open in Github Codespaces](https://img.shields.io/badge/Open%20in-Github%20Codespaces-blue?logo=Github)](https://Github.com/codespaces/new?machine=standardLinux32gb&repo=500289888&ref=main&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs2)
+
+
+For a detailed guide, visit the [Github Codespaces Setup Guide](#github-codespaces-guide) section below.
+
+<Note>
+For a smooth experience, we suggest the above recommended methods.
+Assistance with setup issues on your local machine may be limited due to varying factors like OS and permissions.
+</Note>
+
+## Gitpod Guide
+
+    **Building custom image for the workspace:**
+    - This includes : Installing `yq` and `turbo` globally before the workspace starts. This is accomplished within the `.gitpod.Dockerfile` along with starting upon a base custom image building on [workspace-full](https://hub.docker.com/r/gitpod/workspace-full/dockerfile).
+
+    **Initialization of Formbricks:** 
+     - During the prebuilds phase, we initialize Formbricks by performing the following tasks:
+        1. Setting up environment variables.
+        2. Installing monorepo dependencies.
+        3. Installing Docker images by extracting them from the `packages/database/docker-compose.yml` file.
+        4. Building the @formbricks/js component.
+     - When the workspace starts:
+        1. Wait for the web and demo apps to launch on Gitpod. This automatically opens the `apps/demo/.env` file. Utilize dynamic localhost URLs (e.g., `localhost:3000` for signup and `localhost:8025` for email confirmation) to configure `NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID`. After creating your account and finding the `ID` in the URL at `localhost:3000`, replace `YOUR_ENVIRONMENT_ID` in the `.env` file located in `app/demo`. 
+
+    **Web Component Initialization:** 
+     - we initialize the @formbricks/web component during prebuilds. This involves:
+        1. Installing build dependencies for the `@formbricks/web#go` task from turbo.json in prebuilds to save time.
+        2. Starting PostgreSQL and Mailhog containers for running migrations in prebuilds.
+        3. To prevent the "Init" task from running indefinitely due to prebuild rules, a cleanup `docker compose down` step i.e. `db:down` is added to `turbo.json`. This step is designed to halt the execution of containers that are currently running.
+     - When the workspace starts:
+        1. Initializing environment variables.
+        2. Replacing `NEXT_PUBLIC_WEBAPP_URL` and `NEXTAUTH_URL` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/web` dev environment.
+
+    **Demo Component Initialization:** 
+     - Similar to the web component, the demo component is also initialized during prebuilds. This includes:
+        1. Installing build dependencies for the `formbricks/demo#go` task from turbo.json in prebuilds to save time.
+        2. Caching hits and replaying builds from the `@formbricks/js` component.
+     - When the workspace starts: 
+        1. Initializing environment variables.
+        2. Replaces `NEXT_PUBLIC_FORMBRICKS_API_HOST` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/demo` dev environment.
+
+    **Github Prebuilds Configuration:** 
+     - This configures Github Prebuilds for the master branch, pull requests, and adding comments. This helps automate the prebuild process for the specified branches and actions.
+
+    **VSCode Extensions:** 
+     - This includes a list of VSCode extensions that are added to the configuration when using Gitpod. These extensions can enhance the development experience within Gitpod.
+
+
+
+### 1. Browser Redirection
+
+After clicking the one-click setup button, Gitpod will open a new tab or window. Please ensure that your browser allows redirection to successfully access the services:
+
+### 2. Authorizing in Gitpod
+<Image src={GitpodAuth} alt="Gitpod Auth Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+- This is the Gitpod Authentication Page. It appears when you click the "Open in GitPod" button and Gitpod needs to authenticate your access to the workspace. Click on 'Continue With Github' to authorize your GitPod session.
+
+### 3. Creating a New Workspace
+<Image src={GitpodNewWorkspace} alt="Gitpod New workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+- After authentication, Gitpod asks to create a new workspace for you. This page displays the configurations of your workspace. 
+- You can use either choose either VS Code Browser or  VS Code Desktop editor with the 'Standard Class' for your workspace class.
+- If you opt for the VS Code Desktop, follow the following steps
+   1. Gitpod will prompt you to grant access to the VSCode app. Once approved, install the GitPod extension from the VSCode Marketplace and follow the prompts to authorize the integration.
+   2. Change the `WEBAPP_URL` and the `NEXTAUTH_URL` to `https://localhost:3000`
+
+
+### 4. Gitpod preparing the created Workspace
+<Image src={GitpodPreparing} alt="Gitpod Preparing workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+- Gitpod is preparing your workspace with all the necessary dependencies and configurations. You will see this page while Gitpod sets up your development environment.
+
+### 5. Gitpod running the Workspace
+<Image src={GitpodRunning} alt="Gitpod Running Workspace Page" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+- Once the workspace is fully prepared, voila, it enters the running state. You can start working on your project in this environment.
+
+### Ports and Services
+
+Here are the ports and corresponding URLs for the services within your Gitpod environment:
+
+- **Port 3000**:
+   - **Service**: Demo App
+   - **Description**: This port hosts the demo application of your project. You can access and interact with your application's demo by navigating to this port.
+
+- **Port 3001**:
+   - **Service**: Formbricks website
+   - **Description**: This port hosts the [Formbricks](https://formbricks.com) website, which contains documents, pricing, blogs, best practices, and concierge service.
+
+- **Port 3002**:
+   - **Service**: Formbricks In-product Survey Demo App
+   - **Description**: This app helps you test your in-app surveys. You can create and test user actions, create and update user attributes, etc.
+
+- **Port 5432**:
+   - **Service**: PostgreSQL Database Server
+   - **Description**: The PostgreSQL DB is hosted on this port.
+
+- **Port 1025**:
+   - **Service**: SMPT server
+   - **Description**: SMTP Server for sending and receiving email messages. This server is responsible for handling email communication.
+
+- **Port 8025**:
+   - **Service**: Mailhog
+
+### Accessing port URLs
+  1. **Direct URL Composition**:
+   - You can access the dedicated port URL by pre-pending the port number to the workspace URL.
+   - For example, if you want to access port 3000, you can use the URL format: `3000-yourworkspace.ws-eu45.gitpod.io`.
+
+  2. **Using [gp CLI](https://www.gitpod.io/docs/references/gitpod-cli)**:
+   - Gitpod provides a convenient command, `gp url`, to quickly retrieve the URL for a specific port.
+   - Simply use the command followed by the desired port number. For example, to get the URL for port 3000, run: `gp url 3000`.
+
+  3. **Listing All Open Port URLs**:
+   - If you prefer to see a list of all open port URLs at once, you can use the `gp ports list` command.
+   - Running this command will display a list of ports along with their corresponding URLs.
+
+  4. **Viewing All Ports in Panel**:
+   - Gitpod also offers a user-friendly 'Ports' tab in the Gitpod panel.
+   - Click on the 'Ports' tab to view a list of all open ports and their respective URLs.
+
+  <Image src={GitpodPorts} alt="Gitpod Ports tab" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+  These URLs and port numbers represent various services and endpoints within your Gitpod environment. You can access and interact with these services by the Port URL for the respective service.
+
+---
+
+## Github Codespaces Guide
+
+1. After clicking the one-click setup button, you will be redirected to the Github Codespaces page. Review the configuration and click on the 'Create Codespace' button to create a new Codespace.
+
+<Image src={GithubCodespaceNew} alt="New Github Codespace" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+2. This will start loading the Codespace. Keep in mind this might take a few minutes to complete depending on your internet connection and the instance availability.
+
+<Image src={GithubCodespaceLoading} alt="Loading Github Codespace" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+3. Once the Codespace is loaded, you will be redirected to the VSCode editor. You can start working on your project in this environment.
+
+4. Make the changes you want to, and now, to run the app, we first need to configure the .env file. Copy the .env.example and edit the variables as mentioned in the file itself.
+
+<Image src={GithubCodespaceEnvFile} alt="Github Codespace Env File" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+5. Once you have configured the .env, it's now time to run the app and see the changes. Lets open the terminal first
+
+<Image src={GithubCodespaceTerminal} alt="Github Codespace Open Terminal" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+6. Now, run the following command to run the app
 
 <Col>
-   <CodeGroup title="Git clone Formbricks monorepo">
-
-   ```bash
-   git clone https://github.com/formbricks/formbricks
-   ```
-
-   </CodeGroup>
-</Col>
-   and move into the directory
-<Col>
-   <CodeGroup title="Move into the Formbricks monorepo">
-
-   ```bash
-   cd formbricks
-   ```
-
-   </CodeGroup>
-</Col>
-
-1. Install Node.JS packages via pnpm. Don't have pnpm? Get it [here](https://pnpm.io/installation)
-
-<Col>
-   <CodeGroup title="Install dependencies via pnpm">
-
-   ```bash
-   pnpm install
-   ```
-
-   </CodeGroup>
-</Col>
-
-1. Create a `.env` file based on `.env.example`. It's already preset to work with the docker-compose setup but you can also change values if needed.
-
-<Col>
-   <CodeGroup title="Define environment variables">
-
-   ```bash
-   cp .env.example .env
-   ```
-
-   </CodeGroup>
-</Col>
-
-1. Generate a secret value mandatory to be set for the key ENCRYPTION_KEY in the .env file. You can use the following command to generate the random string of required length:
-
-<Col>
-   <CodeGroup title="Set value of ENCRYPTION_KEY">
-
-   ```bash
-   openssl rand -hex 32
-   ```
-
-   </CodeGroup>
-</Col>
-
-1. Make sure you have [`Docker`](https://docs.docker.com/compose/) & [`docker-compose`](https://docs.docker.com/compose/) installed and running on your machine. Then run the following command to start the formbricks dev setup:
-
-<Col>
-   <CodeGroup title="Start Formbricks Dev Setup">
-
-   ```bash
-   pnpm go
-   ```
-
-   </CodeGroup>
-</Col>
-   This starts the Formbricks main app (plus all its dependencies) as well as the following services using Docker:
-
-   - a `postgres` container for hosting your database,
-   - a `mailhog` container that acts as a mock SMTP server and shows received mails in a web UI (forwarded to your host's `localhost:8025`)
-
-   **You can now access the Formbricks app on [http://localhost:3000](http://localhost:3000)**. You will be automatically redirected to the login. To use your local installation of formbricks, create a new account.
-
-   <Note>A fresh setup does not have a default account. Please create a new account and proceed accordingly.</Note>
-
-   For viewing the confirmation email and other emails the system sends you, you can access mailhog at [http://localhost:8025](http://localhost:8025)
-
-### Build
-
-To build all apps and packages and check for build errors, run the following command:
-
-<Col>
-<CodeGroup title="Build Formbricks stack">
+<CodeGroup title="Run the entire Formbricks Stack">
 
 ```bash
-pnpm build
+pnpm dev
 ```
 
 </CodeGroup>
 </Col>
-### Access Demo app
 
-To run the [Demo app](/docs/contributing/demo), run the following command in a separate terminal window:
+<Image src={GithubCodespaceRun} alt="Run on Github Codespace" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+
+7. Monitor the logs in the terminal and once you see the following, you are good to go!
 
 <Col>
-<CodeGroup title="Start Formbricks Demo App">
+<CodeGroup title="The WebApp is running">
 
 ```bash
-pnpm dev --filter=demo
+@formbricks/web:dev:   ▲ Next.js 13.5.6
+@formbricks/web:dev:   - Local:        http://localhost:3000
+@formbricks/web:dev:   - Environments: .env
+@formbricks/web:dev:   - Experiments (use at your own risk):
+@formbricks/web:dev:      · serverActions
+@formbricks/web:dev: 
+@formbricks/web:dev:  ✓ Ready in 9.4s
 ```
 
 </CodeGroup>
 </Col>
-You can now access the Demo app on [http://localhost:3002](http://localhost:3002).
 
-### Access Formbricks website
+8. Right next to the Terminal, you will see a **Ports** tab, click on it to see the ports and their respective URLs. Now access the Forwarded Address for port 3000 and you should be able to visit your Formbricks App!
 
-If you want to make changes to the Formbricks website, e.g. to update the documentation, run the following command in a separate terminal window:
+<Image src={GithubCodespacePorts} alt="Github Codespace Ports" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
-<Col>
-<CodeGroup title="Start Formbricks Website">
+Now make the changes you want to and see them live in action!
 
-```bash
-pnpm dev --filter=formbricks-com
-```
+---
 
-</CodeGroup>
-</Col>
-You can now access the Formbricks website on [http://localhost:3001](http://localhost:3001).
+Still can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!

apps/formbricks-com/app/docs/integrations/make/page.mdx

@@ -96,7 +96,7 @@ Click "Create a webhook":
   className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
-Enter the Formbricks API key. Learn how to get one from the [API Key tutorial](/docs/api/api-key-setup).
+Enter the Formbricks API key. Learn how to get one from the [API Key tutorial](/docs/api/management/api-key-setup).
 
 <Image src={EnterApiKey} alt="Enter API Key" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 

apps/formbricks-com/app/docs/integrations/n8n/page.mdx

@@ -71,7 +71,7 @@ Click on Create New Credentail button to add your host and API Key
 
 <Image src={AddApiKey} alt="Add host and api key" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
-Now you need an API key. Please refer to the [API Key Setup](/docs/api/api-key-setup) page to learn how to create one.
+Now you need an API key. Please refer to the [API Key Setup](/docs/api/management/api-key-setup) page to learn how to create one.
 
 Once you copied it in the API Key field, hit Save button to test the connection and save the credentials.
 

apps/formbricks-com/app/docs/integrations/zapier/page.mdx

@@ -94,7 +94,7 @@ Now, you have to connect Zapier with Formbricks via an API Key:
   className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
-Now you need an API key. Please refer to the [API Key Setup](/docs/api/api-key-setup) page to learn how to create one.
+Now you need an API key. Please refer to the [API Key Setup](/docs/api/management/api-key-setup) page to learn how to create one.
 
 Once you copied it in the newly opened Zapier window, you will be connected:
 

apps/formbricks-com/components/docs/Navigation.tsx

@@ -258,7 +258,6 @@ export const navigation: Array<NavGroup> = [
       { title: "Introduction", href: "/docs/contributing/introduction" },
       { title: "Demo App", href: "/docs/contributing/demo" },
       { title: "Setup Dev Environment", href: "/docs/contributing/setup" },
-      { title: "Gitpod", href: "/docs/contributing/gitpod" },
       { title: "How we code at Formbricks", href: "/docs/contributing/how-we-code" },
       { title: "How to create a service", href: "/docs/contributing/creating-a-service" },
       { title: "Troubleshooting", href: "/docs/contributing/troubleshooting" },
@@ -269,7 +268,9 @@ export const navigation: Array<NavGroup> = [
     title: "Client API",
     links: [
       { title: "Overview", href: "/docs/api/client/overview" },
+      { title: "Actions", href: "/docs/api/client/actions" },
       { title: "Displays", href: "/docs/api/client/displays" },
+      { title: "People", href: "/docs/api/client/people" },
       { title: "Responses", href: "/docs/api/client/responses" },
     ],
   },

apps/formbricks-com/components/dummyUI/templates.ts

@@ -134,7 +134,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           type: TSurveyQuestionType.OpenText,
-          headline: "What is the main benefit your receive from Formbricks?",
+          headline: "What is the main benefit you receive from Formbricks?",
           inputType: "text",
           longAnswer: true,
           required: true,
@@ -1271,6 +1271,14 @@ export const templates: TTemplate[] = [
           buttonUrl: "https://app.formbricks.com/auth/signup",
           buttonExternal: true,
         },
+        {
+          id: createId(),
+          type: TSurveyQuestionType.FileUpload,
+          headline: "Upload file",
+          required: false,
+          allowMultipleFiles: false,
+          maxSizeInMB: 10,
+        },
       ],
       thankYouCard: thankYouCardDefault,
       welcomeCard: {

apps/formbricks-com/components/shared/MetaInformation.tsx

@@ -30,6 +30,7 @@ export default function MetaInformation({
       <meta name="image" content={`https://${BASE_URL}/favicon.ico`} />
       <meta property="og:image" content={`https://${BASE_URL}/social-image.png`} />
       <link rel="icon" type="image/x-icon" href={`https://${BASE_URL}/favicon.ico`} />
+      <link rel="canonical" href="https://formbricks.com/" />
       <meta name="msapplication-TileColor" content="#00C4B8" />
       <meta name="msapplication-TileImage" content={`https://${BASE_URL}/favicon.ico`} />
       <meta property="og:image:alt" content="Open Source Experience Management, Privacy-first" />

apps/formbricks-com/next.config.mjs

@@ -155,6 +155,11 @@ const nextConfig = {
         destination: "https://formbricks.com/clmyhzfrymr4ko00hycsg1tvx",
         permanent: true,
       },
+      {
+        source: "/docs/contributing/gitpod",
+        destination: "/docs/contributing/setup#gitpod",
+        permanent: true,
+      },
     ];
   },
   async rewrites() {

apps/formbricks-com/pages/privacy-policy.mdx

@@ -38,6 +38,8 @@ This is the information we collect from **Website visitors** and **Researchers**
   If you pay for Formbricks, we will ask for your billing details including name, address and financial information depending on your payment method (stored by our payment service provider Stripe)
 - **Survey data:**
   We store your survey data (questions and responses) for you and provide tools for you to analyse and use this data.
+- **Error logs:**
+  We collect error logs to help us diagnose and fix issues with our service.
 
 ## **How we use your data**
 
@@ -63,7 +65,6 @@ We will retain your Personal Data only for as long as is necessary for the purpo
 
 We will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period, except when this data is used to strengthen the security or to improve the functionality of our Service, or we are legally obligated to retain this data for longer time periods.
 
-
 ## **Data Subprocessors**
 
 We only share your information with our Service providers who help us operate our business, in which case those third parties are also required to comply with the GDPR framework. We worked hard to reduce the number of subprocessors to a minimum and keep your information within the EU. This is a list of the subprocessors we are working with:
@@ -74,6 +75,7 @@ We only share your information with our Service providers who help us operate ou
 | AWS          | Email Address                          | Email             | 🇩🇪              | Part of ToS | [GDPR Info](https://aws.amazon.com/de/compliance/gdpr-center/)                    |
 | PostHog EU   | Anon. IP, Browser & Device Information | Product Analytics | 🇩🇪              | DPA signed  | [GDPR Info](https://posthog.com/docs/privacy/gdpr-compliance)                     |
 | Stripe       | Billing Information                    | Payments          | 🇺🇸              | Part of ToS | [GDPR Info](https://stripe.com/privacy-center/legal#international-data-transfers) |
+| Sentry       | Error Logs                             | Error Tracking    | 🇺🇸              | DPA signed  | [GDPR Info](https://sentry.io/legal/dpa/)                                         |
 
 ## **Data retention**
 
@@ -146,7 +148,6 @@ To exercise your California data protection rights described above, please send
 
 Your data protection rights, described above, are covered by the CCPA, short for the California Consumer Privacy Act. To find out more, visit the [official California Legislative Information website](https://www.leginfo.legislature.ca.gov/). The CCPA took effect on 01/01/2020.
 
-
 ## **Marketing**
 
 If Researchers register to Formbricks, we may send them emails about company news, updates, related product or service information, etc. Researchers can always opt out of the email communications.

apps/web/Dockerfile

@@ -1,6 +1,13 @@
+# Installer stage: Building the application
 FROM node:18-alpine AS installer
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
+# Install Supercronic (cron for containers without super user privileges)
+RUN apk add --no-cache curl \
+    && curl -fsSLo /tmp/supercronic \
+       "https://github.com/aptible/supercronic/releases/download/v0.2.27/supercronic-linux-amd64" \
+    && chmod +x /tmp/supercronic
+
 ARG DATABASE_URL
 ENV DATABASE_URL=$DATABASE_URL
 
@@ -15,41 +22,42 @@ WORKDIR /app
 COPY . .
 RUN touch /app/apps/web/.env
 
-
 RUN pnpm install
 
 # Build the project
 RUN pnpm post-install --filter=web...
 RUN pnpm turbo run build --filter=web...
 
+# Runner stage: Setting up the runtime environment
 FROM node:18-alpine AS runner
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
-# Don't run production as root
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-USER nextjs
+RUN apk add --no-cache curl \
+    # && addgroup --system --gid 1001 nodejs \
+    && adduser --system --uid 1001 nextjs
 
 WORKDIR /home/nextjs
 
+COPY --from=installer /tmp/supercronic /usr/local/bin/supercronic
 COPY --from=installer /app/apps/web/next.config.mjs .
 COPY --from=installer /app/apps/web/package.json .
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/standalone ./
-COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/static ./apps/web/.next/static
-COPY --from=installer --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public
-COPY --from=installer --chown=nextjs:nodejs /app/packages/database/schema.prisma ./packages/database/schema.prisma
-COPY --from=installer --chown=nextjs:nodejs /app/packages/database/migrations ./packages/database/migrations
+# Leverage output traces to reduce image size
+COPY --from=installer --chown=nextjs:nextjs /app/apps/web/.next/standalone ./
+COPY --from=installer --chown=nextjs:nextjs /app/apps/web/.next/static ./apps/web/.next/static
+COPY --from=installer --chown=nextjs:nextjs /app/apps/web/public ./apps/web/public
+COPY --from=installer --chown=nextjs:nextjs /app/packages/database/schema.prisma ./packages/database/schema.prisma
+COPY --from=installer --chown=nextjs:nextjs /app/packages/database/migrations ./packages/database/migrations
+COPY --from=installer /app/docker/cronjobs /app/docker/cronjobs
 
 EXPOSE 3000
-
 ENV HOSTNAME "0.0.0.0"
+USER nextjs
 
-CMD if [ "$NEXTAUTH_SECRET" != "RANDOM_STRING" ]; then \
-        pnpm dlx prisma migrate deploy && node apps/web/server.js; \
+CMD supercronic -quiet /app/docker/cronjobs & \
+    if [ "$NEXTAUTH_SECRET" != "RANDOM_STRING" ]; then \
+        pnpm dlx prisma migrate deploy && \
+        exec node apps/web/server.js; \
     else \
-        echo "ERROR: Please set a value for NEXTAUTH_SECRET in your docker compose variables!"; \
+        echo "ERROR: Please set a value for NEXTAUTH_SECRET in your docker compose variables!" >&2; \
         exit 1; \
-    fi
+    fi

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

@@ -1,6 +1,6 @@
 "use client";
 
-import { env } from "@/env.mjs";
+import { env } from "@formbricks/lib/env.mjs";
 import { formbricksEnabled } from "@/app/lib/formbricks";
 import formbricks from "@formbricks/js";
 import { useEffect } from "react";

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

@@ -1,5 +1,5 @@
 "use client";
-import { env } from "@/env.mjs";
+import { env } from "@formbricks/lib/env.mjs";
 import type { Session } from "next-auth";
 import { usePostHog } from "posthog-js/react";
 import { useEffect } from "react";

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

@@ -9,7 +9,11 @@ interface WidgetStatusIndicatorProps {
 }
 
 export default async function WidgetStatusIndicator({ environmentId, type }: WidgetStatusIndicatorProps) {
-  const [environment] = await Promise.all([getEnvironment(environmentId)]);
+  const environment = await getEnvironment(environmentId);
+
+  if (!environment) {
+    throw new Error("Environment not found");
+  }
 
   const stati = {
     notImplemented: {

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

@@ -41,7 +41,7 @@ export default async function SettingsLayout({ children, params }) {
           membershipRole={currentUserMembership?.role}
         />
         <div className="w-full md:ml-64">
-          <div className="max-w-4xl px-6 pb-6 pt-14 md:pt-6">
+          <div className="max-w-4xl px-20 pb-6 pt-14 md:pt-6">
             <div>{children}</div>
           </div>
         </div>

apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditBranding.tsx

@@ -0,0 +1,94 @@
+"use client";
+
+import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
+import { Alert, AlertDescription } from "@formbricks/ui/Alert";
+import { Label } from "@formbricks/ui/Label";
+import { Switch } from "@formbricks/ui/Switch";
+import Link from "next/link";
+import { useState } from "react";
+import toast from "react-hot-toast";
+import { updateProductAction } from "../actions";
+
+interface EditFormbricksBrandingProps {
+  type: "linkSurvey" | "inAppSurvey";
+  product: TProduct;
+  canRemoveBranding: boolean;
+  environmentId: string;
+  isFormbricksCloud?: boolean;
+}
+
+export function EditFormbricksBranding({
+  type,
+  product,
+  canRemoveBranding,
+  environmentId,
+  isFormbricksCloud,
+}: EditFormbricksBrandingProps) {
+  const [isBrandingEnabled, setIsBrandingEnabled] = useState(
+    type === "linkSurvey" ? product.linkSurveyBranding : product.inAppSurveyBranding
+  );
+  const [updatingBranding, setUpdatingBranding] = useState(false);
+
+  const getTextFromType = (type) => {
+    if (type === "linkSurvey") return "Link Surveys";
+    if (type === "inAppSurvey") return "In App Surveys";
+  };
+
+  const toggleBranding = async () => {
+    try {
+      setUpdatingBranding(true);
+      const newBrandingState = !isBrandingEnabled;
+      setIsBrandingEnabled(newBrandingState);
+      let inputProduct: Partial<TProductUpdateInput> = {
+        [type === "linkSurvey" ? "linkSurveyBranding" : "inAppSurveyBranding"]: newBrandingState,
+      };
+      await updateProductAction(product.id, inputProduct);
+      toast.success(
+        newBrandingState ? "Formbricks branding will be shown." : "Formbricks branding will now be hidden."
+      );
+    } catch (error) {
+      toast.error(`Error: ${error.message}`);
+    } finally {
+      setUpdatingBranding(false);
+    }
+  };
+
+  return (
+    <div className="w-full items-center">
+      {!canRemoveBranding && (
+        <div className="mb-4">
+          <Alert>
+            <AlertDescription>
+              To remove the Formbricks branding from the&nbsp;
+              <span className="font-semibold">{getTextFromType(type)}</span>, please&nbsp;
+              {type === "linkSurvey" ? (
+                <span className="underline">
+                  <Link href={`/environments/${environmentId}/settings/billing`}>upgrade your plan.</Link>
+                </span>
+              ) : (
+                <span className="underline">
+                  {isFormbricksCloud ? (
+                    <Link href={`/environments/${environmentId}/settings/billing`}>add your creditcard.</Link>
+                  ) : (
+                    <a href="mailto:hola@formbricks.com">get a self-hosted license (free to get started).</a>
+                  )}
+                </span>
+              )}
+            </AlertDescription>
+          </Alert>
+        </div>
+      )}
+      <div className="mb-6 flex items-center space-x-2">
+        <Switch
+          id={`branding-${type}`}
+          checked={isBrandingEnabled}
+          onCheckedChange={toggleBranding}
+          disabled={!canRemoveBranding || updatingBranding}
+        />
+        <Label htmlFor={`branding-${type}`}>
+          Show Formbricks Branding in {type === "linkSurvey" ? "Link" : "In-App"} Surveys
+        </Label>
+      </div>
+    </div>
+  );
+}

apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditSignature.tsx

@@ -1,67 +0,0 @@
-"use client";
-
-import { Alert, AlertDescription } from "@formbricks/ui/Alert";
-import { updateProductAction } from "../actions";
-import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
-import { Label } from "@formbricks/ui/Label";
-import { Switch } from "@formbricks/ui/Switch";
-import { useState } from "react";
-import toast from "react-hot-toast";
-import Link from "next/link";
-
-interface EditSignatureProps {
-  product: TProduct;
-  canRemoveSignature: boolean;
-  environmentId: string;
-}
-
-export function EditFormbricksSignature({ product, canRemoveSignature, environmentId }: EditSignatureProps) {
-  const [formbricksSignature, setFormbricksSignature] = useState(product.formbricksSignature);
-  const [updatingSignature, setUpdatingSignature] = useState(false);
-
-  const toggleSignature = async () => {
-    try {
-      setUpdatingSignature(true);
-      const newSignatureState = !formbricksSignature;
-      setFormbricksSignature(newSignatureState);
-      let inputProduct: Partial<TProductUpdateInput> = {
-        formbricksSignature: newSignatureState,
-      };
-      await updateProductAction(product.id, inputProduct);
-      toast.success(
-        newSignatureState ? "Formbricks signature will be shown." : "Formbricks signature will now be hidden."
-      );
-    } catch (error) {
-      toast.error(`Error: ${error.message}`);
-    } finally {
-      setUpdatingSignature(false);
-    }
-  };
-
-  return (
-    <div className="w-full items-center">
-      {!canRemoveSignature && (
-        <div className="mb-4">
-          <Alert>
-            <AlertDescription>
-              To remove the Formbricks branding from the link surveys, please{" "}
-              <span className="underline">
-                <Link href={`/environments/${environmentId}/settings/billing`}>upgrade</Link>
-              </span>{" "}
-              your plan.
-            </AlertDescription>
-          </Alert>
-        </div>
-      )}
-      <div className="flex items-center space-x-2">
-        <Switch
-          id="signature"
-          checked={formbricksSignature}
-          onCheckedChange={toggleSignature}
-          disabled={!canRemoveSignature || updatingSignature}
-        />
-        <Label htmlFor="signature">Show &apos;Powered by Formbricks&apos; Signature in Link Surveys</Label>
-      </div>
-    </div>
-  );
-}

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

@@ -1,20 +1,20 @@
 export const revalidate = REVALIDATION_INTERVAL;
 
-import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import SettingsCard from "../components/SettingsCard";
-import SettingsTitle from "../components/SettingsTitle";
-import { EditFormbricksSignature } from "./components/EditSignature";
-import { EditBrandColor } from "./components/EditBrandColor";
-import { EditPlacement } from "./components/EditPlacement";
-import { EditHighlightBorder } from "./components/EditHighlightBorder";
-import { DEFAULT_BRAND_COLOR } from "@formbricks/lib/constants";
+import { getIsEnterpriseEdition } from "@formbricks/ee/lib/service";
 import { authOptions } from "@formbricks/lib/authOptions";
-import { getServerSession } from "next-auth";
-import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
+import { DEFAULT_BRAND_COLOR, IS_FORMBRICKS_CLOUD, REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
 import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
+import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
+import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
+import { getServerSession } from "next-auth";
+import SettingsCard from "../components/SettingsCard";
+import SettingsTitle from "../components/SettingsTitle";
+import { EditBrandColor } from "./components/EditBrandColor";
+import { EditFormbricksBranding } from "./components/EditBranding";
+import { EditHighlightBorder } from "./components/EditHighlightBorder";
+import { EditPlacement } from "./components/EditPlacement";
 
 export default async function ProfileSettingsPage({ params }: { params: { environmentId: string } }) {
   const [session, team, product] = await Promise.all([
@@ -33,8 +33,14 @@ export default async function ProfileSettingsPage({ params }: { params: { enviro
     throw new Error("Team not found");
   }
 
+  const isEnterpriseEdition = await getIsEnterpriseEdition();
+
+  const canRemoveLinkBranding =
+    team.billing.features.linkSurvey.status !== "inactive" || !IS_FORMBRICKS_CLOUD;
+  const canRemoveInAppBranding =
+    team.billing.features.inAppSurvey.status !== "inactive" || isEnterpriseEdition;
+
   const currentUserMembership = await getMembershipByUserIdTeamId(session?.user.id, team.id);
-  const canRemoveSignature = team.billing.features.linkSurvey.status !== "inactive";
   const { isDeveloper, isViewer } = getAccessFlags(currentUserMembership?.role);
   const isBrandColorEditDisabled = isDeveloper ? true : isViewer;
 
@@ -68,13 +74,21 @@ export default async function ProfileSettingsPage({ params }: { params: { enviro
         />
       </SettingsCard>
       <SettingsCard
-        title="Formbricks Signature"
+        title="Formbricks Branding"
         description="We love your support but understand if you toggle it off.">
-        <EditFormbricksSignature
+        <EditFormbricksBranding
+          type="linkSurvey"
           product={product}
-          canRemoveSignature={canRemoveSignature}
+          canRemoveBranding={canRemoveLinkBranding}
           environmentId={params.environmentId}
         />
+        <EditFormbricksBranding
+          type="inAppSurvey"
+          product={product}
+          canRemoveBranding={canRemoveInAppBranding}
+          environmentId={params.environmentId}
+          isFormbricksCloud={IS_FORMBRICKS_CLOUD}
+        />
       </SettingsCard>
     </div>
   );

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

@@ -51,12 +51,12 @@ export const handleFileUpload = async (
     const { signature, timestamp, uuid } = signingData;
 
     requestHeaders = {
-      fileType: file.type,
-      fileName: file.name,
-      environmentId: environmentId ?? "",
-      signature,
-      timestamp,
-      uuid,
+      "X-File-Type": file.type,
+      "X-File-Name": encodeURIComponent(file.name),
+      "X-Environment-ID": environmentId ?? "",
+      "X-Signature": signature,
+      "X-Timestamp": String(timestamp),
+      "X-UUID": uuid,
     };
   }
 

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

@@ -1,7 +1,8 @@
-import { Metadata } from "next";
-import { authOptions } from "@formbricks/lib/authOptions";
-import { getServerSession } from "next-auth";
 import { getAnalysisData } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/data";
+import { authOptions } from "@formbricks/lib/authOptions";
+import { getSurvey } from "@formbricks/lib/survey/service";
+import { Metadata } from "next";
+import { getServerSession } from "next-auth";
 
 type Props = {
   params: { surveyId: string; environmentId: string };
@@ -9,11 +10,12 @@ type Props = {
 
 export const generateMetadata = async ({ params }: Props): Promise<Metadata> => {
   const session = await getServerSession(authOptions);
+  const survey = await getSurvey(params.surveyId);
 
   if (session) {
     const { responseCount } = await getAnalysisData(params.surveyId, params.environmentId);
     return {
-      title: `${responseCount} Responses`,
+      title: `${responseCount} Responses | ${survey?.name} Results`,
     };
   }
   return {

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

@@ -1,5 +1,6 @@
 "use server";
 
+import { getEmailTemplateHtml } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate";
 import { generateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { sendEmbedSurveyPreviewEmail } from "@formbricks/lib/emails/emails";
@@ -32,3 +33,13 @@ export const sendEmailAction = async ({ html, subject, to }: TSendEmailActionArg
   }
   return await sendEmbedSurveyPreviewEmail(to, subject, html);
 };
+
+export const getEmailHtmlAction = async (surveyId: string) => {
+  const session = await getServerSession(authOptions);
+  if (!session) throw new AuthorizationError("Not authorized");
+
+  const hasUserSurveyAccess = await canUserAccessSurvey(session.user.id, surveyId);
+  if (!hasUserSurveyAccess) throw new AuthorizationError("Not authorized");
+
+  return await getEmailTemplateHtml(surveyId);
+};

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

@@ -0,0 +1,112 @@
+import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
+import { questionTypes } from "@/app/lib/questions";
+import { getPersonIdentifier } from "@formbricks/lib/person/util";
+import { timeSince } from "@formbricks/lib/time";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import { TSurveyFileUploadQuestion } from "@formbricks/types/surveys";
+import { PersonAvatar } from "@formbricks/ui/Avatars";
+import { InboxStackIcon } from "@heroicons/react/24/solid";
+import { DownloadIcon, FileIcon } from "lucide-react";
+import Link from "next/link";
+
+interface FileUploadSummaryProps {
+  questionSummary: TSurveyQuestionSummary<TSurveyFileUploadQuestion>;
+  environmentId: string;
+}
+
+export default function FileUploadSummary({ questionSummary, environmentId }: FileUploadSummaryProps) {
+  const questionTypeInfo = questionTypes.find((type) => type.id === questionSummary.question.type);
+
+  return (
+    <div className="rounded-lg border border-slate-200 bg-slate-50 shadow-sm">
+      <div className="space-y-2 px-4 pb-5 pt-6 md:px-6">
+        <Headline headline={questionSummary.question.headline} required={questionSummary.question.required} />
+
+        <div className="flex space-x-2 text-xs font-semibold text-slate-600 md:text-sm">
+          <div className="flex items-center rounded-lg bg-slate-100 p-2 ">
+            {questionTypeInfo && <questionTypeInfo.icon className="mr-2 h-4 w-4 " />}
+            {questionTypeInfo ? questionTypeInfo.label : "Unknown Question Type"} Question
+          </div>
+          <div className=" flex items-center rounded-lg bg-slate-100 p-2">
+            <InboxStackIcon className="mr-2 h-4 w-4" />
+            {questionSummary.responses.length} Responses
+          </div>
+        </div>
+      </div>
+      <div className="rounded-b-lg bg-white ">
+        <div className="grid h-10 grid-cols-4 items-center border-y border-slate-200 bg-slate-100 text-sm font-bold text-slate-600">
+          <div className="pl-4 md:pl-6">User</div>
+          <div className="col-span-2 pl-4 md:pl-6">Response</div>
+          <div className="px-4 md:px-6">Time</div>
+        </div>
+        {questionSummary.responses.map((response) => {
+          const displayIdentifier = response.person ? getPersonIdentifier(response.person) : null;
+
+          return (
+            <div
+              key={response.id}
+              className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
+              <div className="pl-4 md:pl-6">
+                {response.person ? (
+                  <Link
+                    className="ph-no-capture group flex items-center"
+                    href={`/environments/${environmentId}/people/${response.person.id}`}>
+                    <div className="hidden md:flex">
+                      <PersonAvatar personId={response.person.id} />
+                    </div>
+                    <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                      {displayIdentifier}
+                    </p>
+                  </Link>
+                ) : (
+                  <div className="group flex items-center">
+                    <div className="hidden md:flex">
+                      <PersonAvatar personId="anonymous" />
+                    </div>
+                    <p className="break-all text-slate-600 md:ml-2">Anonymous</p>
+                  </div>
+                )}
+              </div>
+
+              <div className="col-span-2 grid">
+                {response.value === "skipped" && (
+                  <div className="flex w-full flex-col items-center justify-center p-2">
+                    <p className="mt-2 text-sm font-semibold text-slate-500 dark:text-slate-400">skipped</p>
+                  </div>
+                )}
+
+                {Array.isArray(response.value) &&
+                  (response.value.length > 0 ? (
+                    response.value.map((fileUrl, index) => (
+                      <div className="relative m-2 rounded-lg bg-slate-200">
+                        <a href={fileUrl as string} key={index} download target="_blank">
+                          <div className="absolute right-0 top-0 m-2">
+                            <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-slate-50 hover:bg-white">
+                              <DownloadIcon className="h-6 text-slate-500" />
+                            </div>
+                          </div>
+                        </a>
+
+                        <div className="flex flex-col items-center justify-center p-2">
+                          <FileIcon className="h-6 text-slate-500" />
+                          <p className="mt-2 text-sm text-slate-500 dark:text-slate-400">
+                            {fileUrl.split("/").pop()}
+                          </p>
+                        </div>
+                      </div>
+                    ))
+                  ) : (
+                    <div className="flex w-full flex-col items-center justify-center p-2">
+                      <p className="mt-2 text-sm font-semibold text-slate-500 dark:text-slate-400">skipped</p>
+                    </div>
+                  ))}
+              </div>
+
+              <div className="px-4 text-slate-500 md:px-6">{timeSince(response.updatedAt.toISOString())}</div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}

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

@@ -1,17 +1,17 @@
 "use client";
 
-import LinkTab from "./shareEmbedTabs/LinkTab";
-import EmailTab from "./shareEmbedTabs/EmailTab";
-import WebpageTab from "./shareEmbedTabs/WebpageTab";
 import LinkSingleUseSurveyModal from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal";
-import { useMemo, useState } from "react";
-import { TProduct } from "@formbricks/types/product";
-import { TSurvey } from "@formbricks/types/surveys";
 import { cn } from "@formbricks/lib/cn";
-import { DialogContent, Dialog } from "@formbricks/ui/Dialog";
-import { Button } from "@formbricks/ui/Button";
-import { LinkIcon, EnvelopeIcon, CodeBracketIcon } from "@heroicons/react/24/outline";
+import { TProduct } from "@formbricks/types/product";
 import { TProfile } from "@formbricks/types/profile";
+import { TSurvey } from "@formbricks/types/surveys";
+import { Button } from "@formbricks/ui/Button";
+import { Dialog, DialogContent } from "@formbricks/ui/Dialog";
+import { CodeBracketIcon, EnvelopeIcon, LinkIcon } from "@heroicons/react/24/outline";
+import { useMemo, useState } from "react";
+import EmailTab from "./shareEmbedTabs/EmailTab";
+import LinkTab from "./shareEmbedTabs/LinkTab";
+import WebpageTab from "./shareEmbedTabs/WebpageTab";
 
 interface ShareEmbedSurveyProps {
   survey: TSurvey;
@@ -43,16 +43,6 @@ export default function ShareEmbedSurvey({
 
   const [activeId, setActiveId] = useState(tabs[0].id);
 
-  const componentMap = {
-    link: isSingleUseLinkSurvey ? (
-      <LinkSingleUseSurveyModal survey={survey} surveyBaseUrl={webAppUrl} />
-    ) : (
-      <LinkTab surveyUrl={surveyUrl} survey={survey} brandColor={surveyBrandColor} />
-    ),
-    email: <EmailTab survey={survey} surveyUrl={surveyUrl} email={email} brandColor={surveyBrandColor} />,
-    webpage: <WebpageTab surveyUrl={surveyUrl} />,
-  };
-
   return (
     <Dialog
       open={open}
@@ -87,7 +77,15 @@ export default function ShareEmbedSurvey({
           </div>
           <div className="flex w-full grow flex-col gap-6 bg-gray-50 px-4 py-6 lg:p-6">
             <div className="flex h-full overflow-y-scroll lg:h-[590px] lg:overflow-y-visible">
-              {componentMap[activeId]}
+              {isSingleUseLinkSurvey ? (
+                <LinkSingleUseSurveyModal survey={survey} surveyBaseUrl={webAppUrl} />
+              ) : activeId === "link" ? (
+                <LinkTab surveyUrl={surveyUrl} survey={survey} brandColor={surveyBrandColor} />
+              ) : activeId === "email" ? (
+                <EmailTab surveyId={survey.id} email={email} />
+              ) : activeId === "webpage" ? (
+                <WebpageTab surveyUrl={surveyUrl} />
+              ) : null}
             </div>
             <div className="mx-auto flex max-w-max rounded-md bg-slate-100 p-1 lg:hidden">
               {tabs.slice(0, 2).map((tab) => (

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

@@ -3,7 +3,11 @@ import ConsentSummary from "@/app/(app)/environments/[environmentId]/surveys/[su
 import HiddenFieldsSummary from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
 import { TSurveyQuestionType } from "@formbricks/types/surveys";
-import type { TSurveyPictureSelectionQuestion, TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import type {
+  TSurveyFileUploadQuestion,
+  TSurveyPictureSelectionQuestion,
+  TSurveyQuestionSummary,
+} from "@formbricks/types/surveys";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TResponse } from "@formbricks/types/responses";
 import {
@@ -22,7 +26,8 @@ import MultipleChoiceSummary from "./MultipleChoiceSummary";
 import NPSSummary from "./NPSSummary";
 import OpenTextSummary from "./OpenTextSummary";
 import RatingSummary from "./RatingSummary";
-import PictureChoiceSummary from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/PictureChoiceSummary";
+import FileUploadSummary from "./FileUploadSummary";
+import PictureChoiceSummary from "./PictureChoiceSummary";
 
 interface SummaryListProps {
   environment: TEnvironment;
@@ -122,6 +127,15 @@ export default function SummaryList({ environment, survey, responses, responsesP
                   />
                 );
               }
+              if (questionSummary.question.type === TSurveyQuestionType.FileUpload) {
+                return (
+                  <FileUploadSummary
+                    key={questionSummary.question.id}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyFileUploadQuestion>}
+                    environmentId={environment.id}
+                  />
+                );
+              }
               if (questionSummary.question.type === TSurveyQuestionType.PictureSelection) {
                 return (
                   <PictureChoiceSummary

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

@@ -1,59 +1,55 @@
 "use client";
 
-import { cn } from "@formbricks/lib/cn";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { TSurveyQuestionType } from "@formbricks/types/surveys";
-import { TSurvey } from "@formbricks/types/surveys";
 import { AuthenticationError } from "@formbricks/types/errors";
-import { sendEmailAction } from "../../actions";
+import { Button } from "@formbricks/ui/Button";
 import CodeBlock from "@formbricks/ui/CodeBlock";
+import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
 import { CodeBracketIcon, DocumentDuplicateIcon, EnvelopeIcon } from "@heroicons/react/24/solid";
-import {
-  Column,
-  Container,
-  Button as EmailButton,
-  Link,
-  Row,
-  Section,
-  Tailwind,
-  Text,
-  render,
-  Img,
-} from "@react-email/components";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import toast from "react-hot-toast";
-import { isLight } from "@/app/lib/utils";
+import { getEmailHtmlAction, sendEmailAction } from "../../actions";
 
 interface EmailTabProps {
-  survey: TSurvey;
-  surveyUrl: string;
+  surveyId: string;
   email: string;
-  brandColor: string;
 }
 
-export default function EmailTab({ survey, surveyUrl, email, brandColor }: EmailTabProps) {
+export default function EmailTab({ surveyId, email }: EmailTabProps) {
   const [showEmbed, setShowEmbed] = useState(false);
+  const [emailHtmlPreview, setEmailHtmlPreview] = useState<string>("");
+
+  const emailHtml = useMemo(() => {
+    if (!emailHtmlPreview) return "";
+    return emailHtmlPreview
+      .replaceAll("?preview=true&amp;", "?")
+      .replaceAll("?preview=true&;", "?")
+      .replaceAll("?preview=true", "");
+  }, [emailHtmlPreview]);
+
+  useEffect(() => {
+    getData();
+
+    async function getData() {
+      const emailHtml = await getEmailHtmlAction(surveyId);
+      setEmailHtmlPreview(emailHtml);
+    }
+  });
+
   const subject = "Formbricks Email Survey Preview";
 
-  const emailValues = useMemo(() => {
-    return getEmailValues({ brandColor, survey, surveyUrl, preview: false });
-  }, []);
-
-  const previewEmailValues = useMemo(() => {
-    return getEmailValues({ brandColor, survey, surveyUrl, preview: true });
-  }, []);
-
-  const sendPreviewEmail = async () => {
+  const sendPreviewEmail = async (html) => {
     try {
-      await sendEmailAction({ html: previewEmailValues.html, subject, to: email });
+      await sendEmailAction({
+        html,
+        subject,
+        to: email,
+      });
       toast.success("Email sent!");
     } catch (err) {
       if (err instanceof AuthenticationError) {
         toast.error("You are not authenticated to perform this action.");
         return;
       }
-
       toast.error("Something went wrong. Please try again later.");
     }
   };
@@ -68,7 +64,7 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
             aria-label="Embed survey in your website"
             onClick={() => {
               toast.success("Embed code copied to clipboard!");
-              navigator.clipboard.writeText(emailValues.html);
+              navigator.clipboard.writeText(emailHtml);
             }}
             className="shrink-0"
             EndIcon={DocumentDuplicateIcon}>
@@ -76,12 +72,11 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
           </Button>
         ) : (
           <>
-            <Input type="email" placeholder="user@mail.com" className="h-11 grow bg-white" value={email} />
             <Button
               variant="secondary"
               title="send preview email"
               aria-label="send preview email"
-              onClick={sendPreviewEmail}
+              onClick={() => sendPreviewEmail(emailHtmlPreview)}
               EndIcon={EnvelopeIcon}
               className="shrink-0">
               Send Preview
@@ -92,7 +87,9 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
           variant="darkCTA"
           title="view embed code for email"
           aria-label="view embed code for email"
-          onClick={() => setShowEmbed(!showEmbed)}
+          onClick={() => {
+            setShowEmbed(!showEmbed);
+          }}
           EndIcon={CodeBracketIcon}
           className="shrink-0">
           {showEmbed ? "Hide Embed Code" : "View Embed Code"}
@@ -104,10 +101,10 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
             customCodeClass="!whitespace-normal sm:!whitespace-pre-wrap !break-all sm:!break-normal"
             language="html"
             showCopyToClipboard={false}>
-            {emailValues.html}
+            {emailHtml}
           </CodeBlock>
         ) : (
-          <div className="">
+          <div>
             <div className="mb-6 flex gap-2">
               <div className="h-3 w-3 rounded-full bg-red-500"></div>
               <div className="h-3 w-3 rounded-full bg-amber-500"></div>
@@ -118,7 +115,13 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
                 To : {email || "user@mail.com"}
               </div>
               <div className="border-b border-slate-200 pb-2 text-sm">Subject : {subject}</div>
-              <div className="p-4">{previewEmailValues.Component}</div>
+              <div className="p-4">
+                {emailHtml ? (
+                  <div dangerouslySetInnerHTML={{ __html: emailHtmlPreview }}></div>
+                ) : (
+                  <LoadingSpinner />
+                )}
+              </div>
             </div>
           </div>
         )}
@@ -126,308 +129,3 @@ export default function EmailTab({ survey, surveyUrl, email, brandColor }: Email
     </div>
   );
 }
-
-const getEmailValues = ({ survey, surveyUrl, brandColor, preview }) => {
-  const doctype =
-    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-
-  const Template = getEmailTemplate(survey, surveyUrl, brandColor, preview);
-  const html = render(Template, { pretty: true });
-  const htmlWithoutDoctype = html.replace(doctype, "");
-
-  return { Component: Template, html: htmlWithoutDoctype };
-};
-
-const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string, preview: boolean) => {
-  const url = preview ? `${surveyUrl}?preview=true` : surveyUrl;
-  const urlWithPrefilling = preview ? `${surveyUrl}?preview=true&` : `${surveyUrl}?`;
-
-  const firstQuestion = survey.questions[0];
-  switch (firstQuestion.type) {
-    case TSurveyQuestionType.OpenText:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
-            {firstQuestion.subheader}
-          </Text>
-          <Section className="mt-4 block h-20 w-full rounded-lg border border-solid border-gray-200 bg-slate-50" />
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.Consent:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0 block text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Container className="m-0 text-sm font-normal leading-6 text-slate-500">
-            <Text className="m-0 p-0" dangerouslySetInnerHTML={{ __html: firstQuestion.html || "" }}></Text>
-          </Container>
-
-          <Container className="m-0 mt-4 block w-full max-w-none rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 font-medium text-slate-800">
-            <Text className="m-0 inline-block">{firstQuestion.label}</Text>
-          </Container>
-          <Container className="mx-0 mt-4 flex max-w-none justify-end">
-            {!firstQuestion.required && (
-              <EmailButton
-                href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
-                className="inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium text-black">
-                Reject
-              </EmailButton>
-            )}
-            <EmailButton
-              href={`${urlWithPrefilling}${firstQuestion.id}=accepted`}
-              className={cn(
-                "bg-brand-color ml-2 inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
-                isLight(brandColor) ? "text-black" : "text-white"
-              )}>
-              Accept
-            </EmailButton>
-          </Container>
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.NPS:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Section>
-            <Text className="m-0 block text-base font-semibold leading-6 text-slate-800">
-              {firstQuestion.headline}
-            </Text>
-            <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
-              {firstQuestion.subheader}
-            </Text>
-            <Container className="mx-0 mt-4 flex w-max flex-col">
-              <Section className="block overflow-hidden rounded-md border border-gray-200">
-                {Array.from({ length: 11 }, (_, i) => (
-                  <EmailButton
-                    key={i}
-                    href={`${urlWithPrefilling}${firstQuestion.id}=${i}`}
-                    className="m-0 inline-flex h-10 w-10 items-center justify-center  border-gray-200 p-0 text-slate-800">
-                    {i}
-                  </EmailButton>
-                ))}
-              </Section>
-              <Section className="mt-2 px-1.5 text-xs leading-6 text-slate-500">
-                <Row>
-                  <Column>
-                    <Text className="m-0 inline-block w-max p-0">{firstQuestion.lowerLabel}</Text>
-                  </Column>
-                  <Column className="text-right">
-                    <Text className="m-0 inline-block w-max p-0 text-right">{firstQuestion.upperLabel}</Text>
-                  </Column>
-                </Row>
-              </Section>
-            </Container>
-            {/* {!firstQuestion.required && (
-            <EmailButton
-              href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
-              className={cn(
-                "bg-brand-color mt-4 cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
-                isLight(brandColor) ? "text-black" : "text-white"
-              )}>
-              {firstQuestion.buttonLabel || "Skip"}
-            </EmailButton>
-          )} */}
-
-            <EmailFooter />
-          </Section>
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.CTA:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0  block text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Container className="mt-2 text-sm font-normal leading-6 text-slate-500">
-            <Text className="m-0 p-0" dangerouslySetInnerHTML={{ __html: firstQuestion.html || "" }}></Text>
-          </Container>
-
-          <Container className="mx-0 mt-4 max-w-none">
-            {!firstQuestion.required && (
-              <EmailButton
-                href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
-                className="inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium text-black">
-                {firstQuestion.dismissButtonLabel || "Skip"}
-              </EmailButton>
-            )}
-            <EmailButton
-              href={`${urlWithPrefilling}${firstQuestion.id}=clicked`}
-              className={cn(
-                "bg-brand-color inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
-                isLight(brandColor) ? "text-black" : "text-white"
-              )}>
-              {firstQuestion.buttonLabel}
-            </EmailButton>
-          </Container>
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.Rating:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Section>
-            <Text className="m-0  block text-base font-semibold leading-6 text-slate-800">
-              {firstQuestion.headline}
-            </Text>
-            <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
-              {firstQuestion.subheader}
-            </Text>
-            <Container className="mx-0 mt-4 flex">
-              <Section
-                className={cn("inline-block w-max overflow-hidden rounded-md", {
-                  ["border border-solid border-gray-200"]: firstQuestion.scale === "number",
-                })}>
-                {Array.from({ length: firstQuestion.range }, (_, i) => (
-                  <EmailButton
-                    key={i}
-                    href={`${urlWithPrefilling}${firstQuestion.id}=${i + 1}`}
-                    className={cn(
-                      "m-0 inline-flex h-16 w-16 items-center justify-center p-0 text-slate-800",
-                      {
-                        ["border border-solid border-gray-200"]: firstQuestion.scale === "number",
-                      }
-                    )}>
-                    {firstQuestion.scale === "smiley" && <Text className="text-3xl">😃</Text>}
-                    {firstQuestion.scale === "number" && i + 1}
-                    {firstQuestion.scale === "star" && <Text className="text-3xl">⭐</Text>}
-                  </EmailButton>
-                ))}
-              </Section>
-              <Section className="m-0 px-1.5 text-xs leading-6 text-slate-500">
-                <Row>
-                  <Column>
-                    <Text className="m-0 inline-block p-0">{firstQuestion.lowerLabel}</Text>
-                  </Column>
-                  <Column className="text-right">
-                    <Text className="m-0 inline-block  p-0 text-right">{firstQuestion.upperLabel}</Text>
-                  </Column>
-                </Row>
-              </Section>
-            </Container>
-            {/* {!firstQuestion.required && (
-            <EmailButton
-              href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
-              className={cn(
-                "bg-brand-color mt-4 cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
-                isLight(brandColor) ? "text-black" : "text-white"
-              )}>
-              {firstQuestion.buttonLabel || "Skip"}
-            </EmailButton>
-          )} */}
-            <EmailFooter />
-          </Section>
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.MultipleChoiceMulti:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
-            {firstQuestion.subheader}
-          </Text>
-          <Container className="mx-0 max-w-none">
-            {firstQuestion.choices.map((choice) => (
-              <Section
-                className="mt-2 block w-full rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 text-slate-800"
-                key={choice.id}>
-                {choice.label}
-              </Section>
-            ))}
-          </Container>
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.MultipleChoiceSingle:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
-            {firstQuestion.subheader}
-          </Text>
-          <Container className="mx-0 max-w-none">
-            {firstQuestion.choices
-              .filter((choice) => choice.id !== "other")
-              .map((choice) => (
-                <Link
-                  key={choice.id}
-                  className="mt-2 block rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 text-slate-800 hover:bg-slate-100"
-                  href={`${urlWithPrefilling}${firstQuestion.id}=${choice.label}`}>
-                  {choice.label}
-                </Link>
-              ))}
-          </Container>
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-    case TSurveyQuestionType.PictureSelection:
-      return (
-        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
-          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
-            {firstQuestion.headline}
-          </Text>
-          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
-            {firstQuestion.subheader}
-          </Text>
-          <Section className="mx-0">
-            {firstQuestion.choices.map((choice) =>
-              firstQuestion.allowMulti ? (
-                <Img
-                  src={choice.imageUrl}
-                  className="mb-1 mr-1 inline-block h-[110px] w-[220px] rounded-lg"
-                />
-              ) : (
-                <Link
-                  href={`${urlWithPrefilling}${firstQuestion.id}=${choice.id}`}
-                  target="_blank"
-                  className="mb-1 mr-1 inline-block h-[110px] w-[220px] rounded-lg">
-                  <Img src={choice.imageUrl} className="h-full w-full rounded-lg" />
-                </Link>
-              )
-            )}
-          </Section>
-          <EmailFooter />
-        </EmailTemplateWrapper>
-      );
-  }
-};
-
-const EmailTemplateWrapper = ({ children, surveyUrl, brandColor }) => {
-  return (
-    <Tailwind
-      config={{
-        theme: {
-          extend: {
-            colors: {
-              "brand-color": brandColor,
-            },
-          },
-        },
-      }}>
-      <Link
-        href={surveyUrl}
-        target="_blank"
-        className="mx-0 my-2 block rounded-lg border border-solid border-slate-300 bg-white p-8 font-sans text-inherit">
-        {children}
-      </Link>
-    </Tailwind>
-  );
-};
-
-const EmailFooter = () => {
-  return (
-    <Container className="m-auto mt-8 text-center ">
-      <Link href="https://formbricks.com/" target="_blank" className="text-xs text-slate-400">
-        Powered by Formbricks
-      </Link>
-    </Container>
-  );
-};

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

@@ -56,10 +56,11 @@ export default function LinkTab({ surveyUrl, survey, brandColor }: EmailTabProps
         <SurveyInline
           brandColor={brandColor}
           survey={survey}
-          formbricksSignature={false}
+          isBrandingEnabled={false}
           autoFocus={false}
           isRedirectDisabled={false}
           key={survey.id}
+          onFileUpload={async () => ""}
         />
 
         <Button

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

@@ -0,0 +1,319 @@
+import { cn } from "@formbricks/lib/cn";
+import { TSurvey, TSurveyQuestionType } from "@formbricks/types/surveys";
+
+import { isLight } from "@/app/lib/utils";
+import { WEBAPP_URL } from "@formbricks/lib/constants";
+import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
+import { getSurvey } from "@formbricks/lib/survey/service";
+import {
+  Column,
+  Container,
+  Button as EmailButton,
+  Img,
+  Link,
+  Row,
+  Section,
+  Tailwind,
+  Text,
+} from "@react-email/components";
+import { render } from "@react-email/render";
+
+interface EmailTemplateProps {
+  survey: TSurvey;
+  surveyUrl: string;
+  brandColor: string;
+}
+
+export const getEmailTemplateHtml = async (surveyId) => {
+  const survey = await getSurvey(surveyId);
+  if (!survey) {
+    throw new Error("Survey not found");
+  }
+  const product = await getProductByEnvironmentId(survey.environmentId);
+  if (!product) {
+    throw new Error("Product not found");
+  }
+  const brandColor = product.brandColor;
+  const surveyUrl = WEBAPP_URL + "/s/" + survey.id;
+  const html = render(<EmailTemplate survey={survey} surveyUrl={surveyUrl} brandColor={brandColor} />, {
+    pretty: true,
+  });
+  const doctype =
+    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
+  const htmlCleaned = html.toString().replace(doctype, "");
+
+  return htmlCleaned;
+};
+
+const EmailTemplate = ({ survey, surveyUrl, brandColor }: EmailTemplateProps) => {
+  const url = `${surveyUrl}?preview=true`;
+  const urlWithPrefilling = `${surveyUrl}?preview=true&`;
+
+  const firstQuestion = survey.questions[0];
+  switch (firstQuestion.type) {
+    case TSurveyQuestionType.OpenText:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
+            {firstQuestion.subheader}
+          </Text>
+          <Section className="mt-4 block h-20 w-full rounded-lg border border-solid border-gray-200 bg-slate-50" />
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.Consent:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0 block text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Container className="m-0 text-sm font-normal leading-6 text-slate-500">
+            <Text className="m-0 p-0" dangerouslySetInnerHTML={{ __html: firstQuestion.html || "" }}></Text>
+          </Container>
+
+          <Container className="m-0 mt-4 block w-full max-w-none rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 font-medium text-slate-800">
+            <Text className="m-0 inline-block">{firstQuestion.label}</Text>
+          </Container>
+          <Container className="mx-0 mt-4 flex max-w-none justify-end">
+            {!firstQuestion.required && (
+              <EmailButton
+                href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
+                className="inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium text-black">
+                Reject
+              </EmailButton>
+            )}
+            <EmailButton
+              href={`${urlWithPrefilling}${firstQuestion.id}=accepted`}
+              className={cn(
+                "bg-brand-color ml-2 inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
+                isLight(brandColor) ? "text-black" : "text-white"
+              )}>
+              Accept
+            </EmailButton>
+          </Container>
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.NPS:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Section>
+            <Text className="m-0 block text-base font-semibold leading-6 text-slate-800">
+              {firstQuestion.headline}
+            </Text>
+            <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
+              {firstQuestion.subheader}
+            </Text>
+            <Container className="mx-0 mt-4 flex w-max flex-col">
+              <Section className="block overflow-hidden rounded-md border border-gray-200">
+                {Array.from({ length: 11 }, (_, i) => (
+                  <EmailButton
+                    key={i}
+                    href={`${urlWithPrefilling}${firstQuestion.id}=${i}`}
+                    className="m-0 inline-flex h-10 w-10 items-center justify-center  border-gray-200 p-0 text-slate-800">
+                    {i}
+                  </EmailButton>
+                ))}
+              </Section>
+              <Section className="mt-2 px-1.5 text-xs leading-6 text-slate-500">
+                <Row>
+                  <Column>
+                    <Text className="m-0 inline-block w-max p-0">{firstQuestion.lowerLabel}</Text>
+                  </Column>
+                  <Column className="text-right">
+                    <Text className="m-0 inline-block w-max p-0 text-right">{firstQuestion.upperLabel}</Text>
+                  </Column>
+                </Row>
+              </Section>
+            </Container>
+            <EmailFooter />
+          </Section>
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.CTA:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0  block text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Container className="mt-2 text-sm font-normal leading-6 text-slate-500">
+            <Text className="m-0 p-0" dangerouslySetInnerHTML={{ __html: firstQuestion.html || "" }}></Text>
+          </Container>
+
+          <Container className="mx-0 mt-4 max-w-none">
+            {!firstQuestion.required && (
+              <EmailButton
+                href={`${urlWithPrefilling}${firstQuestion.id}=dismissed`}
+                className="inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium text-black">
+                {firstQuestion.dismissButtonLabel || "Skip"}
+              </EmailButton>
+            )}
+            <EmailButton
+              href={`${urlWithPrefilling}${firstQuestion.id}=clicked`}
+              className={cn(
+                "bg-brand-color inline-flex cursor-pointer appearance-none rounded-md px-6 py-3 text-sm font-medium",
+                isLight(brandColor) ? "text-black" : "text-white"
+              )}>
+              {firstQuestion.buttonLabel}
+            </EmailButton>
+          </Container>
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.Rating:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Section>
+            <Text className="m-0  block text-base font-semibold leading-6 text-slate-800">
+              {firstQuestion.headline}
+            </Text>
+            <Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
+              {firstQuestion.subheader}
+            </Text>
+            <Container className="mx-0 mt-4 flex">
+              <Section
+                className={cn("inline-block w-max overflow-hidden rounded-md", {
+                  ["border border-solid border-gray-200"]: firstQuestion.scale === "number",
+                })}>
+                {Array.from({ length: firstQuestion.range }, (_, i) => (
+                  <EmailButton
+                    key={i}
+                    href={`${urlWithPrefilling}${firstQuestion.id}=${i + 1}`}
+                    className={cn(
+                      "m-0 inline-flex h-16 w-16 items-center justify-center p-0 text-slate-800",
+                      {
+                        ["border border-solid border-gray-200"]: firstQuestion.scale === "number",
+                      }
+                    )}>
+                    {firstQuestion.scale === "smiley" && <Text className="text-3xl">😃</Text>}
+                    {firstQuestion.scale === "number" && i + 1}
+                    {firstQuestion.scale === "star" && <Text className="text-3xl">⭐</Text>}
+                  </EmailButton>
+                ))}
+              </Section>
+              <Section className="m-0 px-1.5 text-xs leading-6 text-slate-500">
+                <Row>
+                  <Column>
+                    <Text className="m-0 inline-block p-0">{firstQuestion.lowerLabel}</Text>
+                  </Column>
+                  <Column className="text-right">
+                    <Text className="m-0 inline-block  p-0 text-right">{firstQuestion.upperLabel}</Text>
+                  </Column>
+                </Row>
+              </Section>
+            </Container>
+            <EmailFooter />
+          </Section>
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.MultipleChoiceMulti:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
+            {firstQuestion.subheader}
+          </Text>
+          <Container className="mx-0 max-w-none">
+            {firstQuestion.choices.map((choice) => (
+              <Section
+                className="mt-2 block w-full rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 text-slate-800"
+                key={choice.id}>
+                {choice.label}
+              </Section>
+            ))}
+          </Container>
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.MultipleChoiceSingle:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
+            {firstQuestion.subheader}
+          </Text>
+          <Container className="mx-0 max-w-none">
+            {firstQuestion.choices
+              .filter((choice) => choice.id !== "other")
+              .map((choice) => (
+                <Link
+                  key={choice.id}
+                  className="mt-2 block rounded-lg border border-solid border-gray-200 bg-slate-50 p-4 text-slate-800 hover:bg-slate-100"
+                  href={`${urlWithPrefilling}${firstQuestion.id}=${choice.label}`}>
+                  {choice.label}
+                </Link>
+              ))}
+          </Container>
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+    case TSurveyQuestionType.PictureSelection:
+      return (
+        <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
+          <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
+            {firstQuestion.headline}
+          </Text>
+          <Text className="m-0 mb-2 block p-0 text-sm font-normal leading-6 text-slate-500">
+            {firstQuestion.subheader}
+          </Text>
+          <Section className="mx-0">
+            {firstQuestion.choices.map((choice) =>
+              firstQuestion.allowMulti ? (
+                <Img
+                  src={choice.imageUrl}
+                  className="mb-1 mr-1 inline-block h-[110px] w-[220px] rounded-lg"
+                />
+              ) : (
+                <Link
+                  href={`${urlWithPrefilling}${firstQuestion.id}=${choice.id}`}
+                  target="_blank"
+                  className="mb-1 mr-1 inline-block h-[110px] w-[220px] rounded-lg">
+                  <Img src={choice.imageUrl} className="h-full w-full rounded-lg" />
+                </Link>
+              )
+            )}
+          </Section>
+          <EmailFooter />
+        </EmailTemplateWrapper>
+      );
+  }
+};
+
+const EmailTemplateWrapper = ({ children, surveyUrl, brandColor }) => {
+  return (
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: {
+              "brand-color": brandColor,
+            },
+          },
+        },
+      }}>
+      <Link
+        href={surveyUrl}
+        target="_blank"
+        className="mx-0 my-2 block rounded-lg border border-solid border-slate-300 bg-white p-8 font-sans text-inherit">
+        {children}
+      </Link>
+    </Tailwind>
+  );
+};
+
+const EmailFooter = () => {
+  return (
+    <Container className="m-auto mt-8 text-center ">
+      <Link href="https://formbricks.com/" target="_blank" className="text-xs text-slate-400">
+        Powered by Formbricks
+      </Link>
+    </Container>
+  );
+};

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

@@ -0,0 +1,234 @@
+"use client";
+
+import { useGetBillingInfo } from "@formbricks/lib/team/hooks/useGetBillingInfo";
+import { TAllowedFileExtension, ZAllowedFileExtension } from "@formbricks/types/common";
+import { TProduct } from "@formbricks/types/product";
+import { TSurvey, TSurveyFileUploadQuestion } from "@formbricks/types/surveys";
+import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/Button";
+import { Input } from "@formbricks/ui/Input";
+import { Label } from "@formbricks/ui/Label";
+import { PlusIcon, TrashIcon, XCircleIcon } from "@heroicons/react/24/solid";
+import { useMemo, useState } from "react";
+import { toast } from "react-hot-toast";
+
+interface FileUploadFormProps {
+  localSurvey: TSurvey;
+  product?: TProduct;
+  question: TSurveyFileUploadQuestion;
+  questionIdx: number;
+  updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
+  lastQuestion: boolean;
+  isInValid: boolean;
+}
+
+export default function FileUploadQuestionForm({
+  question,
+  questionIdx,
+  updateQuestion,
+  isInValid,
+  product,
+}: FileUploadFormProps): JSX.Element {
+  const [showSubheader, setShowSubheader] = useState(!!question.subheader);
+  const [extension, setExtension] = useState("");
+  const {
+    billingInfo,
+    error: billingInfoError,
+    isLoading: billingInfoLoading,
+  } = useGetBillingInfo(product?.teamId ?? "");
+
+  const handleInputChange = (event) => {
+    setExtension(event.target.value);
+  };
+
+  const addExtension = (event) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    let modifiedExtension = extension.trim();
+
+    // Remove the dot at the start if it exists
+    if (modifiedExtension.startsWith(".")) {
+      modifiedExtension = modifiedExtension.substring(1);
+    }
+
+    if (!modifiedExtension) {
+      toast.error("Please enter a file extension.");
+      return;
+    }
+
+    const parsedExtensionResult = ZAllowedFileExtension.safeParse(modifiedExtension);
+
+    if (!parsedExtensionResult.success) {
+      toast.error("This file type is not supported.");
+      return;
+    }
+
+    if (question.allowedFileExtensions) {
+      if (!question.allowedFileExtensions.includes(modifiedExtension as TAllowedFileExtension)) {
+        updateQuestion(questionIdx, {
+          allowedFileExtensions: [...question.allowedFileExtensions, modifiedExtension],
+        });
+        setExtension("");
+      } else {
+        toast.error("This extension is already added.");
+      }
+    } else {
+      updateQuestion(questionIdx, { allowedFileExtensions: [modifiedExtension] });
+      setExtension("");
+    }
+  };
+
+  const removeExtension = (event, index: number) => {
+    event.preventDefault();
+    if (question.allowedFileExtensions) {
+      const updatedExtensions = [...question?.allowedFileExtensions];
+      updatedExtensions.splice(index, 1);
+      updateQuestion(questionIdx, { allowedFileExtensions: updatedExtensions });
+    }
+  };
+
+  const maxSizeInMBLimit = useMemo(() => {
+    if (billingInfoError || billingInfoLoading || !billingInfo) {
+      return 10;
+    }
+
+    if (billingInfo.features.linkSurvey.status === "active") {
+      // 1GB in MB
+      return 1024;
+    }
+
+    return 10;
+  }, [billingInfo, billingInfoError, billingInfoLoading]);
+
+  return (
+    <form>
+      <div className="mt-3">
+        <Label htmlFor="headline">Question</Label>
+        <div className="mt-2">
+          <Input
+            autoFocus
+            id="headline"
+            name="headline"
+            value={question.headline}
+            onChange={(e) => updateQuestion(questionIdx, { headline: e.target.value })}
+            isInvalid={isInValid && question.headline.trim() === ""}
+          />
+        </div>
+      </div>
+      <div className="mt-3">
+        {showSubheader && (
+          <>
+            <Label htmlFor="subheader">Description</Label>
+            <div className="mt-2 inline-flex w-full items-center">
+              <Input
+                id="subheader"
+                name="subheader"
+                value={question.subheader}
+                onChange={(e) => updateQuestion(questionIdx, { subheader: e.target.value })}
+              />
+              <TrashIcon
+                className="ml-2 h-4 w-4 cursor-pointer text-slate-400 hover:text-slate-500"
+                onClick={() => {
+                  setShowSubheader(false);
+                  updateQuestion(questionIdx, { subheader: "" });
+                }}
+              />
+            </div>
+          </>
+        )}
+        {!showSubheader && (
+          <Button size="sm" variant="minimal" type="button" onClick={() => setShowSubheader(true)}>
+            <PlusIcon className="mr-1 h-4 w-4" />
+            Add Description
+          </Button>
+        )}
+      </div>
+      <div className="mb-8 mt-6 space-y-6">
+        <AdvancedOptionToggle
+          isChecked={question.allowMultipleFiles}
+          onToggle={() => updateQuestion(questionIdx, { allowMultipleFiles: !question.allowMultipleFiles })}
+          htmlId="allowMultipleFile"
+          title="Allow Multiple Files"
+          description="Let people upload up to 10 files at the same time."
+          childBorder
+          customContainerClass="p-0"></AdvancedOptionToggle>
+
+        <AdvancedOptionToggle
+          isChecked={!!question.maxSizeInMB}
+          onToggle={(checked) => updateQuestion(questionIdx, { maxSizeInMB: checked ? 10 : undefined })}
+          htmlId="maxFileSize"
+          title="Max file size"
+          description="Limit the maximum file size."
+          childBorder
+          customContainerClass="p-0">
+          <label htmlFor="autoCompleteResponses" className="cursor-pointer bg-slate-50 p-4">
+            <p className="text-sm font-semibold text-slate-700">
+              Limit upload file size to
+              <Input
+                autoFocus
+                type="number"
+                id="fileSizeLimit"
+                value={question.maxSizeInMB}
+                onChange={(e) => {
+                  const parsedValue = parseInt(e.target.value, 10);
+
+                  if (parsedValue > maxSizeInMBLimit) {
+                    toast.error(`Max file size limit is ${maxSizeInMBLimit} MB`);
+                    updateQuestion(questionIdx, { maxSizeInMB: maxSizeInMBLimit });
+                    return;
+                  }
+
+                  updateQuestion(questionIdx, { maxSizeInMB: parseInt(e.target.value, 10) });
+                }}
+                className="ml-2 mr-2 inline w-20 bg-white text-center text-sm"
+              />
+              MB
+            </p>
+          </label>
+        </AdvancedOptionToggle>
+
+        <AdvancedOptionToggle
+          isChecked={!!question.allowedFileExtensions}
+          onToggle={(checked) =>
+            updateQuestion(questionIdx, { allowedFileExtensions: checked ? [] : undefined })
+          }
+          htmlId="limitFileType"
+          title="Limit file types"
+          description="Control which file types can be uploaded."
+          childBorder
+          customContainerClass="p-0">
+          <div className="p-4">
+            <div className="flex flex-row flex-wrap gap-2">
+              {question.allowedFileExtensions &&
+                question.allowedFileExtensions.map((item, index) => (
+                  <div className="mb-2 flex h-8 items-center space-x-2 rounded-full bg-slate-200 px-2">
+                    <p className="text-sm text-slate-800">{item}</p>
+                    <Button
+                      className="inline-flex px-0"
+                      variant="minimal"
+                      onClick={(e) => removeExtension(e, index)}>
+                      <XCircleIcon className="h-4 w-4" />
+                    </Button>
+                  </div>
+                ))}
+            </div>
+            <div className="flex items-center">
+              <Input
+                autoFocus
+                className="mr-2 w-20 rounded-md bg-white placeholder:text-sm"
+                placeholder=".pdf"
+                value={extension}
+                onChange={handleInputChange}
+                type="text"
+              />
+              <Button size="sm" variant="secondary" onClick={(e) => addExtension(e)}>
+                Allow file type
+              </Button>
+            </div>
+          </div>
+        </AdvancedOptionToggle>
+      </div>
+    </form>
+  );
+}

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

@@ -9,7 +9,6 @@ import {
   CheckCircleIcon,
   ComputerDesktopIcon,
   DevicePhoneMobileIcon,
-  EnvelopeIcon,
   ExclamationCircleIcon,
   LinkIcon,
 } from "@heroicons/react/24/solid";
@@ -59,7 +58,7 @@ export default function HowToSendCard({ localSurvey, setLocalSurvey, environment
       id: "link",
       name: "Link survey",
       icon: LinkIcon,
-      description: "Share a link to a survey page.",
+      description: "Share a link to a survey page or embed it in a web page or email.",
       comingSoon: false,
       alert: false,
     },
@@ -71,14 +70,6 @@ export default function HowToSendCard({ localSurvey, setLocalSurvey, environment
       comingSoon: true,
       alert: false,
     },
-    {
-      id: "email",
-      name: "Email",
-      icon: EnvelopeIcon,
-      description: "Send email surveys to your user base with your current email provider.",
-      comingSoon: true,
-      alert: false,
-    },
   ];
 
   return (

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

@@ -81,6 +81,7 @@ export default function LogicEditor({
     cta: ["clicked", "skipped"],
     consent: ["skipped", "accepted"],
     pictureSelection: ["submitted", "skipped"],
+    fileUpload: ["uploaded", "notUploaded"],
   };
 
   const logicConditions: LogicConditions = {
@@ -99,6 +100,16 @@ export default function LogicEditor({
       values: null,
       unique: true,
     },
+    uploaded: {
+      label: "has uploaded file",
+      values: null,
+      unique: true,
+    },
+    notUploaded: {
+      label: "has not uploaded file",
+      values: null,
+      unique: true,
+    },
     clicked: {
       label: "is clicked",
       values: null,
@@ -242,7 +253,7 @@ export default function LogicEditor({
                 <SelectContent>
                   {conditions[question.type].map(
                     (condition) =>
-                      !(question.required && condition === "skipped") && (
+                      !(question.required && (condition === "skipped" || condition === "notUploaded")) && (
                         <SelectItem
                           key={condition}
                           value={condition}

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

@@ -1,10 +1,10 @@
 "use client";
 
-import { cn } from "@formbricks/lib/cn";
-import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
-import { Label } from "@formbricks/ui/Label";
 import { getPlacementStyle } from "@/app/lib/preview";
+import { cn } from "@formbricks/lib/cn";
 import { TPlacement } from "@formbricks/types/common";
+import { Label } from "@formbricks/ui/Label";
+import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
 const placements = [
   { name: "Bottom Right", value: "bottomRight", disabled: false },
   { name: "Top Right", value: "topRight", disabled: false },
@@ -18,8 +18,8 @@ type TPlacementProps = {
   setCurrentPlacement: (placement: TPlacement) => void;
   setOverlay: (overlay: string) => void;
   overlay: string;
-  setClickOutside: (clickOutside: boolean) => void;
-  clickOutside: boolean;
+  setClickOutsideClose: (clickOutside: boolean) => void;
+  clickOutsideClose: boolean;
 };
 
 export default function Placement({
@@ -27,8 +27,8 @@ export default function Placement({
   currentPlacement,
   setOverlay,
   overlay,
-  setClickOutside,
-  clickOutside,
+  setClickOutsideClose,
+  clickOutsideClose,
 }: TPlacementProps) {
   return (
     <>
@@ -78,8 +78,8 @@ export default function Placement({
           <div className="mt-6 space-y-2">
             <Label className="font-semibold">Allow users to exit by clicking outside the study</Label>
             <RadioGroup
-              onValueChange={(value) => setClickOutside(value === "allow")}
-              value={clickOutside ? "allow" : "disallow"}
+              onValueChange={(value) => setClickOutsideClose(value === "allow")}
+              value={clickOutsideClose ? "allow" : "disallow"}
               className="flex space-x-4">
               <div className="flex items-center space-x-2 whitespace-nowrap">
                 <RadioGroupItem id="disallow" value="disallow" />

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

@@ -18,11 +18,13 @@ import {
   PresentationChartBarIcon,
   QueueListIcon,
   StarIcon,
+  ArrowUpTrayIcon,
   PhotoIcon,
 } from "@heroicons/react/24/solid";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { useState } from "react";
 import { Draggable } from "react-beautiful-dnd";
+import FileUploadQuestionForm from "./FileUploadQuestionForm";
 import CTAQuestionForm from "./CTAQuestionForm";
 import ConsentQuestionForm from "./ConsentQuestionForm";
 import MultipleChoiceMultiForm from "./MultipleChoiceMultiForm";
@@ -32,9 +34,11 @@ import OpenQuestionForm from "./OpenQuestionForm";
 import QuestionDropdown from "./QuestionMenu";
 import RatingQuestionForm from "./RatingQuestionForm";
 import PictureSelectionForm from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/PictureSelectionForm";
+import { TProduct } from "@formbricks/types/product";
 
 interface QuestionCardProps {
   localSurvey: TSurvey;
+  product?: TProduct;
   questionIdx: number;
   moveQuestion: (questionIndex: number, up: boolean) => void;
   updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
@@ -74,6 +78,7 @@ export function BackButtonInput({
 
 export default function QuestionCard({
   localSurvey,
+  product,
   questionIdx,
   moveQuestion,
   updateQuestion,
@@ -123,7 +128,9 @@ export default function QuestionCard({
               <div>
                 <div className="inline-flex">
                   <div className="-ml-0.5 mr-3 h-6 w-6 text-slate-400">
-                    {question.type === TSurveyQuestionType.OpenText ? (
+                    {question.type === TSurveyQuestionType.FileUpload ? (
+                      <ArrowUpTrayIcon />
+                    ) : question.type === TSurveyQuestionType.OpenText ? (
                       <ChatBubbleBottomCenterTextIcon />
                     ) : question.type === TSurveyQuestionType.MultipleChoiceSingle ? (
                       <QueueListIcon />
@@ -236,6 +243,16 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
+              ) : question.type === TSurveyQuestionType.FileUpload ? (
+                <FileUploadQuestionForm
+                  localSurvey={localSurvey}
+                  product={product}
+                  question={question}
+                  questionIdx={questionIdx}
+                  updateQuestion={updateQuestion}
+                  lastQuestion={lastQuestion}
+                  isInValid={isInValid}
+                />
               ) : null}
               <div className="mt-4">
                 <Collapsible.Root open={openAdvanced} onOpenChange={setOpenAdvanced} className="mt-5">

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

@@ -202,6 +202,7 @@ export default function QuestionsView({
                   <QuestionCard
                     key={internalQuestionIdMap[question.id]}
                     localSurvey={localSurvey}
+                    product={product}
                     questionIdx={questionIdx}
                     moveQuestion={moveQuestion}
                     updateQuestion={updateQuestion}

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

@@ -19,7 +19,8 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
   const [open, setOpen] = useState(false);
 
   const { type, productOverwrites } = localSurvey;
-  const { brandColor, clickOutside, darkOverlay, placement, highlightBorderColor } = productOverwrites ?? {};
+  const { brandColor, clickOutsideClose, darkOverlay, placement, highlightBorderColor } =
+    productOverwrites ?? {};
 
   const togglePlacement = () => {
     setLocalSurvey({
@@ -93,12 +94,12 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
     });
   };
 
-  const handleClickOutside = (clickOutside: boolean) => {
+  const handleClickOutsideClose = (clickOutsideClose: boolean) => {
     setLocalSurvey({
       ...localSurvey,
       productOverwrites: {
         ...localSurvey.productOverwrites,
-        clickOutside,
+        clickOutsideClose,
       },
     });
   };
@@ -163,8 +164,8 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
                         setCurrentPlacement={handlePlacementChange}
                         setOverlay={handleOverlay}
                         overlay={darkOverlay ? "dark" : "light"}
-                        setClickOutside={handleClickOutside}
-                        clickOutside={!!clickOutside}
+                        setClickOutsideClose={handleClickOutsideClose}
+                        clickOutsideClose={!!clickOutsideClose}
                       />
                     </div>
                   </div>
@@ -183,9 +184,9 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
                 />
                 <Label htmlFor="autoComplete" className="cursor-pointer">
                   <div className="ml-2">
-                    <h3 className="text-sm font-semibold text-slate-700">Overwrite border highlight</h3>
+                    <h3 className="text-sm font-semibold text-slate-700">Overwrite Highlight Border</h3>
                     <p className="text-xs font-normal text-slate-500">
-                      Change the border highlight for this survey.
+                      Change the highlight border for this survey.
                     </p>
                   </div>
                 </Label>

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

@@ -12,8 +12,8 @@ import { TSurvey } from "@formbricks/types/surveys";
 import { TProduct } from "@formbricks/types/product";
 import { TAttributeClass } from "@formbricks/types/attributeClasses";
 import { TActionClass } from "@formbricks/types/actionClasses";
-import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 import { TMembershipRole } from "@formbricks/types/memberships";
+import Loading from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/loading";
 
 interface SurveyEditorProps {
   survey: TSurvey;
@@ -41,6 +41,7 @@ export default function SurveyEditor({
 
   useEffect(() => {
     if (survey) {
+      if (localSurvey) return;
       setLocalSurvey(JSON.parse(JSON.stringify(survey)));
 
       if (survey.questions.length > 0) {
@@ -59,7 +60,7 @@ export default function SurveyEditor({
   }, [localSurvey?.type]);
 
   if (!localSurvey) {
-    return <ErrorComponent />;
+    return <Loading />;
   }
 
   return (
@@ -109,6 +110,7 @@ export default function SurveyEditor({
               product={product}
               environment={environment}
               previewType={localSurvey.type === "web" ? "modal" : "fullwidth"}
+              onFileUpload={async (file) => file.name}
             />
           </aside>
         </div>

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

@@ -97,6 +97,7 @@ export default function WhenToSendCard({
   };
 
   useEffect(() => {
+    if (isAddEventModalOpen) return;
     if (activeIndex !== null) {
       const newActionClass = actionClassArray[actionClassArray.length - 1].name;
       const currentActionClass = localSurvey.triggers[activeIndex];

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

@@ -1,18 +1,25 @@
 export const revalidate = REVALIDATION_INTERVAL;
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
+import { authOptions } from "@formbricks/lib/authOptions";
 import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
 import { getEnvironment } from "@formbricks/lib/environment/service";
+import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
+import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { getResponseCountBySurveyId } from "@formbricks/lib/response/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
-import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
-import SurveyEditor from "./components/SurveyEditor";
 import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
-import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
+import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 import { getServerSession } from "next-auth";
-import { authOptions } from "@formbricks/lib/authOptions";
-import { getAccessFlags } from "@formbricks/lib/membership/utils";
+import SurveyEditor from "./components/SurveyEditor";
+
+export const generateMetadata = async ({ params }) => {
+  const survey = await getSurvey(params.surveyId);
+  return {
+    title: survey?.name ? `${survey?.name} | Editor` : "Editor",
+  };
+};
 
 export default async function SurveysEditPage({ params }) {
   const [survey, product, environment, actionClasses, attributeClasses, responseCount, team, session] =

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

@@ -17,6 +17,7 @@ import {
 } from "@heroicons/react/24/solid";
 import { Variants, motion } from "framer-motion";
 import { useEffect, useRef, useState } from "react";
+import { TUploadFileConfig } from "@formbricks/types/storage";
 
 type TPreviewType = "modal" | "fullwidth" | "email";
 
@@ -27,6 +28,7 @@ interface PreviewSurveyProps {
   previewType?: TPreviewType;
   product: TProduct;
   environment: TEnvironment;
+  onFileUpload: (file: File, config?: TUploadFileConfig) => Promise<string>;
 }
 
 let surveyNameTemp;
@@ -64,6 +66,7 @@ export default function PreviewSurvey({
   previewType,
   product,
   environment,
+  onFileUpload,
 }: PreviewSurveyProps) {
   const [isModalOpen, setIsModalOpen] = useState(true);
   const [isFullScreenPreview, setIsFullScreenPreview] = useState(false);
@@ -204,9 +207,10 @@ export default function PreviewSurvey({
                     survey={survey}
                     brandColor={brandColor}
                     activeQuestionId={activeQuestionId || undefined}
-                    formbricksSignature={product.formbricksSignature}
+                    isBrandingEnabled={product.linkSurveyBranding}
                     onActiveQuestionChange={setActiveQuestionId}
                     isRedirectDisabled={true}
+                    onFileUpload={onFileUpload}
                   />
                 </Modal>
               ) : (
@@ -219,8 +223,9 @@ export default function PreviewSurvey({
                         survey={survey}
                         brandColor={brandColor}
                         activeQuestionId={activeQuestionId || undefined}
-                        formbricksSignature={product.formbricksSignature}
+                        isBrandingEnabled={product.linkSurveyBranding}
                         onActiveQuestionChange={setActiveQuestionId}
+                        onFileUpload={onFileUpload}
                       />
                     </div>
                   </div>
@@ -274,9 +279,10 @@ export default function PreviewSurvey({
                   survey={survey}
                   brandColor={brandColor}
                   activeQuestionId={activeQuestionId || undefined}
-                  formbricksSignature={product.formbricksSignature}
+                  isBrandingEnabled={product.linkSurveyBranding}
                   onActiveQuestionChange={setActiveQuestionId}
                   isRedirectDisabled={true}
+                  onFileUpload={onFileUpload}
                 />
               </Modal>
             ) : (
@@ -287,9 +293,10 @@ export default function PreviewSurvey({
                       survey={survey}
                       brandColor={brandColor}
                       activeQuestionId={activeQuestionId || undefined}
-                      formbricksSignature={product.formbricksSignature}
+                      isBrandingEnabled={product.linkSurveyBranding}
                       onActiveQuestionChange={setActiveQuestionId}
                       isRedirectDisabled={true}
+                      onFileUpload={onFileUpload}
                     />
                   </div>
                 </div>

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

@@ -1,21 +1,21 @@
 import { UsageAttributesUpdater } from "@/app/(app)/components/FormbricksClient";
 import SurveyDropDownMenu from "@/app/(app)/environments/[environmentId]/surveys/components/SurveyDropDownMenu";
 import SurveyStarter from "@/app/(app)/environments/[environmentId]/surveys/components/SurveyStarter";
-import { SurveyStatusIndicator } from "@formbricks/ui/SurveyStatusIndicator";
+import { generateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
+import { authOptions } from "@formbricks/lib/authOptions";
 import { WEBAPP_URL } from "@formbricks/lib/constants";
 import { getEnvironment, getEnvironments } from "@formbricks/lib/environment/service";
-import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
-import type { TEnvironment } from "@formbricks/types/environment";
-import { Badge } from "@formbricks/ui/Badge";
-import { ComputerDesktopIcon, LinkIcon, PlusIcon } from "@heroicons/react/24/solid";
-import Link from "next/link";
-import { generateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@formbricks/lib/authOptions";
-import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
+import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
+import { getSurveys } from "@formbricks/lib/survey/service";
+import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
+import type { TEnvironment } from "@formbricks/types/environment";
+import { Badge } from "@formbricks/ui/Badge";
+import { SurveyStatusIndicator } from "@formbricks/ui/SurveyStatusIndicator";
+import { ComputerDesktopIcon, LinkIcon, PlusIcon } from "@heroicons/react/24/solid";
+import { getServerSession } from "next-auth";
+import Link from "next/link";
 
 export default async function SurveysList({ environmentId }: { environmentId: string }) {
   const session = await getServerSession(authOptions);

apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateContainer.tsx

@@ -77,6 +77,7 @@ export default function TemplateContainerWithPreview({
                 product={product}
                 environment={environment}
                 setActiveQuestionId={setActiveQuestionId}
+                onFileUpload={async (file) => file.name}
               />
             </div>
           )}

apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateList.tsx

@@ -15,7 +15,7 @@ import { SplitIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { createSurveyAction } from "../actions";
-import { customSurvey, templates } from "./templates";
+import { customSurvey, templates, testTemplate } from "./templates";
 
 type TemplateList = {
   environmentId: string;
@@ -147,7 +147,10 @@ export default function TemplateList({
             </div>
           )}
         </button>
-        {filteredTemplates.map((template: TTemplate) => (
+        {(process.env.NODE_ENV === "development"
+          ? [...filteredTemplates, testTemplate]
+          : filteredTemplates
+        ).map((template: TTemplate) => (
           <div
             onClick={() => {
               const newTemplate = replacePresetPlaceholders(template, product);

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

@@ -1,5 +1,9 @@
-import { TSurveyQuestionType } from "@formbricks/types/surveys";
-import { TSurvey, TSurveyHiddenFields, TSurveyWelcomeCard } from "@formbricks/types/surveys";
+import {
+  TSurvey,
+  TSurveyHiddenFields,
+  TSurveyQuestionType,
+  TSurveyWelcomeCard,
+} from "@formbricks/types/surveys";
 import { TTemplate } from "@formbricks/types/templates";
 import { createId } from "@paralleldrive/cuid2";
 
@@ -21,6 +25,308 @@ const welcomeCardDefault: TSurveyWelcomeCard = {
   timeToFinish: true,
 };
 
+export const testTemplate: TTemplate = {
+  name: "Test template",
+  description: "Test template consisting of all questions",
+  preset: {
+    name: "Test template",
+    questions: [
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter some text:",
+        required: true,
+        inputType: "text",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter some text:",
+        required: false,
+        inputType: "text",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter an email",
+        required: true,
+        inputType: "email",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter an email",
+        required: false,
+        inputType: "email",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a number",
+        required: true,
+        inputType: "number",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a number",
+        required: false,
+        inputType: "number",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a phone number",
+        required: true,
+        inputType: "phone",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a phone number",
+        required: false,
+        inputType: "phone",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a url",
+        required: true,
+        inputType: "url",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.OpenText,
+        headline: "This is an open text question",
+        subheader: "Please enter a url",
+        required: false,
+        inputType: "url",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.MultipleChoiceSingle,
+        headline: "This ia a Multiple choice Single question",
+        subheader: "Please select one of the following",
+        required: true,
+        shuffleOption: "none",
+        choices: [
+          {
+            id: createId(),
+            label: "Option1",
+          },
+          {
+            id: createId(),
+            label: "Option2",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.MultipleChoiceSingle,
+        headline: "This ia a Multiple choice Single question",
+        subheader: "Please select one of the following",
+        required: false,
+        shuffleOption: "none",
+        choices: [
+          {
+            id: createId(),
+            label: "Option 1",
+          },
+          {
+            id: createId(),
+            label: "Option 2",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.MultipleChoiceMulti,
+        headline: "This ia a Multiple choice Multiple question",
+        subheader: "Please select some from the following",
+        required: true,
+        shuffleOption: "none",
+        choices: [
+          {
+            id: createId(),
+            label: "Option1",
+          },
+          {
+            id: createId(),
+            label: "Option2",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.MultipleChoiceMulti,
+        headline: "This ia a Multiple choice Multiple question",
+        subheader: "Please select some from the following",
+        required: false,
+        shuffleOption: "none",
+        choices: [
+          {
+            id: createId(),
+            label: "Option1",
+          },
+          {
+            id: createId(),
+            label: "Option2",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: true,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "number",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: false,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "number",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: true,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "smiley",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: false,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "smiley",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: true,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "star",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Rating,
+        headline: "This is a rating question",
+        required: false,
+        lowerLabel: "Low",
+        upperLabel: "High",
+        range: 5,
+        scale: "star",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.CTA,
+        headline: "This is a CTA question",
+        html: "This is a test CTA",
+        buttonLabel: "Click",
+        buttonUrl: "https://formbricks.com",
+        buttonExternal: true,
+        required: true,
+        dismissButtonLabel: "Maybe later",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.CTA,
+        headline: "This is a CTA question",
+        html: "This is a test CTA",
+        buttonLabel: "Click",
+        buttonUrl: "https://formbricks.com",
+        buttonExternal: true,
+        required: false,
+        dismissButtonLabel: "Maybe later",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.PictureSelection,
+        headline: "This is a Picture select",
+        allowMulti: true,
+        required: true,
+        choices: [
+          {
+            id: createId(),
+            imageUrl: "https://formbricks-cdn.s3.eu-central-1.amazonaws.com/puppy-1-small.jpg",
+          },
+          {
+            id: createId(),
+            imageUrl: "https://formbricks-cdn.s3.eu-central-1.amazonaws.com/puppy-2-small.jpg",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.PictureSelection,
+        headline: "This is a Picture select",
+        allowMulti: true,
+        required: false,
+        choices: [
+          {
+            id: createId(),
+            imageUrl: "https://formbricks-cdn.s3.eu-central-1.amazonaws.com/puppy-1-small.jpg",
+          },
+          {
+            id: createId(),
+            imageUrl: "https://formbricks-cdn.s3.eu-central-1.amazonaws.com/puppy-2-small.jpg",
+          },
+        ],
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Consent,
+        headline: "This is a Consent question",
+        required: true,
+        label: "I agree to the terms and conditions",
+        dismissButtonLabel: "Skip",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionType.Consent,
+        headline: "This is a Consent question",
+        required: false,
+        label: "I agree to the terms and conditions",
+        dismissButtonLabel: "Skip",
+      },
+    ],
+    thankYouCard: thankYouCardDefault,
+    welcomeCard: {
+      enabled: false,
+      timeToFinish: false,
+    },
+    hiddenFields: {
+      enabled: false,
+    },
+  },
+};
+
 export const templates: TTemplate[] = [
   {
     name: "Product Market Fit (Superhuman)",
@@ -104,7 +410,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           type: TSurveyQuestionType.OpenText,
-          headline: "What is the main benefit your receive from {{productName}}?",
+          headline: "What is the main benefit you receive from {{productName}}?",
           required: true,
           inputType: "text",
         },
@@ -2176,7 +2482,7 @@ export const customSurvey: TTemplate = {
       {
         id: createId(),
         type: TSurveyQuestionType.OpenText,
-        headline: "Custom Survey",
+        headline: "What would you like to know?",
         subheader: "This is an example survey.",
         placeholder: "Type your answer here...",
         required: true,

apps/web/app/(app)/onboarding/components/Objective.tsx

@@ -1,11 +1,10 @@
 "use client";
 
 import { updateProfileAction } from "@/app/(app)/onboarding/actions";
-import { env } from "@/env.mjs";
 import { formbricksEnabled, updateResponse } from "@/app/lib/formbricks";
 import { cn } from "@formbricks/lib/cn";
-import { TProfileObjective } from "@formbricks/types/profile";
-import { TProfile } from "@formbricks/types/profile";
+import { env } from "@formbricks/lib/env.mjs";
+import { TProfile, TProfileObjective } from "@formbricks/types/profile";
 import { Button } from "@formbricks/ui/Button";
 import { useEffect, useRef, useState } from "react";
 import { toast } from "react-hot-toast";
@@ -129,7 +128,7 @@ const Objective: React.FC<ObjectiveProps> = ({ next, skip, formbricksResponseId,
         </div>
       </div>
       <div className="mb-24 flex justify-between">
-        <Button size="lg" className="text-slate-400" variant="minimal" onClick={skip} id="objective-skip">
+        <Button size="lg" className="text-slate-500" variant="minimal" onClick={skip} id="objective-skip">
           Skip
         </Button>
         <Button

apps/web/app/(app)/onboarding/components/Onboarding.tsx

@@ -1,5 +1,8 @@
 "use client";
 
+import { updateProfileAction } from "@/app/(app)/onboarding/actions";
+import { TProduct } from "@formbricks/types/product";
+import { TProfile } from "@formbricks/types/profile";
 import { Logo } from "@formbricks/ui/Logo";
 import { ProgressBar } from "@formbricks/ui/ProgressBar";
 import { Session } from "next-auth";
@@ -10,14 +13,11 @@ import Greeting from "./Greeting";
 import Objective from "./Objective";
 import Product from "./Product";
 import Role from "./Role";
-import { TProfile } from "@formbricks/types/profile";
-import { TProduct } from "@formbricks/types/product";
-import { updateProfileAction } from "@/app/(app)/onboarding/actions";
 
 const MAX_STEPS = 6;
 
 interface OnboardingProps {
-  session: Session | null;
+  session: Session;
   environmentId: string;
   profile: TProfile;
   product: TProduct;
@@ -75,7 +75,7 @@ export default function Onboarding({ session, environmentId, profile, product }:
         </div>
         <div className="col-span-2 flex items-center justify-center gap-8">
           <div className="relative grow overflow-hidden rounded-full bg-slate-200">
-            <ProgressBar progress={percent} barColor="bg-brand" height={2} />
+            <ProgressBar progress={percent} barColor="bg-brand-dark" height={2} />
           </div>
           <div className="grow-0 text-xs font-semibold text-slate-700">
             {currentStep < 5 ? <>{Math.floor(percent * 100)}% complete</> : <>Almost there!</>}
@@ -88,7 +88,12 @@ export default function Onboarding({ session, environmentId, profile, product }:
           <Greeting next={next} skip={doLater} name={profile.name ? profile.name : ""} session={session} />
         )}
         {currentStep === 2 && (
-          <Role next={next} skip={skipStep} setFormbricksResponseId={setFormbricksResponseId} />
+          <Role
+            next={next}
+            skip={skipStep}
+            setFormbricksResponseId={setFormbricksResponseId}
+            session={session}
+          />
         )}
         {currentStep === 3 && (
           <Objective

apps/web/app/(app)/onboarding/components/Product.tsx

@@ -10,6 +10,7 @@ import { Label } from "@formbricks/ui/Label";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
+import { isLight } from "@/app/lib/utils";
 
 type Product = {
   done: () => void;
@@ -73,6 +74,10 @@ const Product: React.FC<Product> = ({ done, isLoading, environmentId, product })
   if (!product) {
     return <ErrorComponent />;
   }
+  const buttonStyle = {
+    backgroundColor: color,
+    color: isLight(color) ? "black" : "white",
+  };
 
   return (
     <div className="flex w-full max-w-xl flex-col gap-8 px-8">
@@ -140,7 +145,7 @@ const Product: React.FC<Product> = ({ done, isLoading, environmentId, product })
                 </fieldset>
               </div>
               <div className="mt-4 flex w-full justify-end">
-                <Button className="pointer-events-none" style={{ backgroundColor: color }}>
+                <Button className="pointer-events-none" style={buttonStyle}>
                   Next
                 </Button>
               </div>

apps/web/app/(app)/onboarding/components/Role.tsx

@@ -2,9 +2,10 @@
 
 import { updateProfileAction } from "@/app/(app)/onboarding/actions";
 import { createResponse, formbricksEnabled } from "@/app/lib/formbricks";
-import { env } from "@/env.mjs";
 import { cn } from "@formbricks/lib/cn";
+import { env } from "@formbricks/lib/env.mjs";
 import { Button } from "@formbricks/ui/Button";
+import { Session } from "next-auth";
 import { useEffect, useRef, useState } from "react";
 import { toast } from "react-hot-toast";
 import { handleTabNavigation } from "../utils";
@@ -13,6 +14,7 @@ type RoleProps = {
   next: () => void;
   skip: () => void;
   setFormbricksResponseId: (id: string) => void;
+  session: Session;
 };
 
 type RoleChoice = {
@@ -20,7 +22,7 @@ type RoleChoice = {
   id: "project_manager" | "engineer" | "founder" | "marketing_specialist" | "other";
 };
 
-const Role: React.FC<RoleProps> = ({ next, skip, setFormbricksResponseId }) => {
+const Role: React.FC<RoleProps> = ({ next, skip, setFormbricksResponseId, session }) => {
   const [selectedChoice, setSelectedChoice] = useState<string | null>(null);
   const [isUpdating, setIsUpdating] = useState(false);
   const fieldsetRef = useRef<HTMLFieldSetElement>(null);
@@ -55,7 +57,7 @@ const Role: React.FC<RoleProps> = ({ next, skip, setFormbricksResponseId }) => {
           console.error(e);
         }
         if (formbricksEnabled && env.NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID) {
-          const res = await createResponse(env.NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID, {
+          const res = await createResponse(env.NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID, session.user.id, {
             role: selectedRole.label,
           });
           if (res.ok) {
@@ -122,7 +124,7 @@ const Role: React.FC<RoleProps> = ({ next, skip, setFormbricksResponseId }) => {
         </div>
       </div>
       <div className="mb-24 flex justify-between">
-        <Button size="lg" className="text-slate-400" variant="minimal" onClick={skip} id="role-skip">
+        <Button size="lg" className="text-slate-500" variant="minimal" onClick={skip} id="role-skip">
           Skip
         </Button>
         <Button

apps/web/app/(auth)/invite/page.tsx

@@ -10,7 +10,7 @@ import {
   UsedContent,
   RightAccountContent,
 } from "./components/InviteContentComponents";
-import { env } from "@/env.mjs";
+import { env } from "@formbricks/lib/env.mjs";
 
 export default async function JoinTeam({ searchParams }) {
   const currentUser = await getServerSession(authOptions);

apps/web/app/api/cron/ping/route.ts

@@ -0,0 +1,17 @@
+import { responses } from "@/app/lib/api/response";
+import { CRON_SECRET } from "@formbricks/lib/constants";
+import { captureTelemetry } from "@formbricks/lib/telemetry";
+import { headers } from "next/headers";
+
+export async function POST() {
+  const headersList = headers();
+  const apiKey = headersList.get("x-api-key");
+
+  if (!apiKey || apiKey !== CRON_SECRET) {
+    return responses.notAuthenticatedResponse();
+  }
+
+  captureTelemetry("ping");
+
+  return responses.successResponse({}, true);
+}

apps/web/app/api/cron/weekly_summary/route.ts

@@ -6,122 +6,78 @@ import { NextResponse } from "next/server";
 import { sendNoLiveSurveyNotificationEmail, sendWeeklySummaryNotificationEmail } from "./email";
 import { EnvironmentData, NotificationResponse, ProductData, Survey, SurveyResponse } from "./types";
 
+const BATCH_SIZE = 10;
+
 export async function POST(): Promise<NextResponse> {
-  // check authentication with x-api-key header and CRON_SECRET env variable
+  // Check authentication
   if (headers().get("x-api-key") !== CRON_SECRET) {
     return responses.notAuthenticatedResponse();
   }
 
-  // list of email sending promises to wait for
   const emailSendingPromises: Promise<void>[] = [];
 
-  const products = await getProducts();
+  // Fetch all team IDs
+  const teamIds = await getTeamIds();
 
-  // iterate through the products and send weekly summary email to each team member
-  for await (const product of products) {
-    // check if there are team members that have weekly summary notification enabled
-    const teamMembers = product.team.memberships;
-    const teamMembersWithNotificationEnabled = teamMembers.filter((member) => {
-      return (
-        member.user.notificationSettings?.weeklySummary &&
-        member.user.notificationSettings.weeklySummary[product.id]
-      );
-    });
-    // if there are no team members with weekly summary notification enabled, skip to the next product (do not send email)
-    if (teamMembersWithNotificationEnabled.length == 0) {
-      continue;
-    }
-    // calculate insights for the product
-    const notificationResponse = getNotificationResponse(product.environments[0], product.name);
+  // Paginate through teams
+  for (let i = 0; i < teamIds.length; i += BATCH_SIZE) {
+    const batchedTeamIds = teamIds.slice(i, i + BATCH_SIZE);
+    // Fetch products for batched teams asynchronously
+    const batchedProductsPromises = batchedTeamIds.map((teamId) => getProductsByTeamId(teamId));
 
-    // if there were no responses in the last 7 days, send a different email
-    if (notificationResponse.insights.numLiveSurvey == 0) {
-      for (const teamMember of teamMembersWithNotificationEnabled) {
-        emailSendingPromises.push(
-          sendNoLiveSurveyNotificationEmail(teamMember.user.email, notificationResponse)
+    const batchedProducts = await Promise.all(batchedProductsPromises);
+    for (const products of batchedProducts) {
+      for (const product of products) {
+        const teamMembers = product.team.memberships;
+        const teamMembersWithNotificationEnabled = teamMembers.filter(
+          (member) =>
+            member.user.notificationSettings?.weeklySummary &&
+            member.user.notificationSettings.weeklySummary[product.id]
         );
-      }
-      continue;
-    }
 
-    // send weekly summary email
-    for (const teamMember of teamMembersWithNotificationEnabled) {
-      emailSendingPromises.push(
-        sendWeeklySummaryNotificationEmail(teamMember.user.email, notificationResponse)
-      );
+        if (teamMembersWithNotificationEnabled.length === 0) continue;
+
+        const notificationResponse = getNotificationResponse(product.environments[0], product.name);
+
+        if (notificationResponse.insights.numLiveSurvey === 0) {
+          for (const teamMember of teamMembersWithNotificationEnabled) {
+            emailSendingPromises.push(
+              sendNoLiveSurveyNotificationEmail(teamMember.user.email, notificationResponse)
+            );
+          }
+          continue;
+        }
+
+        for (const teamMember of teamMembersWithNotificationEnabled) {
+          emailSendingPromises.push(
+            sendWeeklySummaryNotificationEmail(teamMember.user.email, notificationResponse)
+          );
+        }
+      }
     }
   }
-  // wait for all emails to be sent
+
   await Promise.all(emailSendingPromises);
   return responses.successResponse({}, true);
 }
 
-const getNotificationResponse = (environment: EnvironmentData, productName: string): NotificationResponse => {
-  const insights = {
-    totalCompletedResponses: 0,
-    totalDisplays: 0,
-    totalResponses: 0,
-    completionRate: 0,
-    numLiveSurvey: 0,
-  };
-
-  const surveys: Survey[] = [];
-
-  // iterate through the surveys and calculate the overall insights
-  for (const survey of environment.surveys) {
-    const surveyData: Survey = {
-      id: survey.id,
-      name: survey.name,
-      status: survey.status,
-      responseCount: survey.responses.length,
-      responses: [],
-    };
-    // iterate through the responses and calculate the survey insights
-    for (const response of survey.responses) {
-      // only take the first 3 responses
-      if (surveyData.responses.length >= 1) {
-        break;
-      }
-      const surveyResponse: SurveyResponse = {};
-      for (const question of survey.questions) {
-        const headline = question.headline;
-        const answer = response.data[question.id]?.toString() || null;
-        if (answer === null || answer === "" || answer?.length === 0) {
-          continue;
-        }
-        surveyResponse[headline] = answer;
-      }
-      surveyData.responses.push(surveyResponse);
-    }
-    surveys.push(surveyData);
-    // calculate the overall insights
-    if (survey.status == "inProgress") {
-      insights.numLiveSurvey += 1;
-    }
-    insights.totalCompletedResponses += survey.responses.filter((r) => r.finished).length;
-    insights.totalDisplays += survey.displays.length;
-    insights.totalResponses += survey.responses.length;
-    insights.completionRate = Math.round((insights.totalCompletedResponses / insights.totalResponses) * 100);
-  }
-  // build the notification response needed for the emails
-  const lastWeekDate = new Date();
-  lastWeekDate.setDate(lastWeekDate.getDate() - 7);
-  return {
-    environmentId: environment.id,
-    currentDate: new Date(),
-    lastWeekDate,
-    productName: productName,
-    surveys,
-    insights,
-  };
+const getTeamIds = async (): Promise<string[]> => {
+  const teams = await prisma.team.findMany({
+    select: {
+      id: true,
+    },
+  });
+  return teams.map((team) => team.id);
 };
 
-const getProducts = async (): Promise<ProductData[]> => {
-  // gets all products together with team members, surveys, responses, and displays for the last 7 days
+const getProductsByTeamId = async (teamId: string): Promise<ProductData[]> => {
   const sevenDaysAgo = new Date();
   sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
 
   return await prisma.product.findMany({
+    where: {
+      teamId: teamId,
+    },
     select: {
       id: true,
       name: true,
@@ -204,3 +160,63 @@ const getProducts = async (): Promise<ProductData[]> => {
     },
   });
 };
+
+const getNotificationResponse = (environment: EnvironmentData, productName: string): NotificationResponse => {
+  const insights = {
+    totalCompletedResponses: 0,
+    totalDisplays: 0,
+    totalResponses: 0,
+    completionRate: 0,
+    numLiveSurvey: 0,
+  };
+
+  const surveys: Survey[] = [];
+
+  // iterate through the surveys and calculate the overall insights
+  for (const survey of environment.surveys) {
+    const surveyData: Survey = {
+      id: survey.id,
+      name: survey.name,
+      status: survey.status,
+      responseCount: survey.responses.length,
+      responses: [],
+    };
+    // iterate through the responses and calculate the survey insights
+    for (const response of survey.responses) {
+      // only take the first 3 responses
+      if (surveyData.responses.length >= 1) {
+        break;
+      }
+      const surveyResponse: SurveyResponse = {};
+      for (const question of survey.questions) {
+        const headline = question.headline;
+        const answer = response.data[question.id]?.toString() || null;
+        if (answer === null || answer === "" || answer?.length === 0) {
+          continue;
+        }
+        surveyResponse[headline] = answer;
+      }
+      surveyData.responses.push(surveyResponse);
+    }
+    surveys.push(surveyData);
+    // calculate the overall insights
+    if (survey.status == "inProgress") {
+      insights.numLiveSurvey += 1;
+    }
+    insights.totalCompletedResponses += survey.responses.filter((r) => r.finished).length;
+    insights.totalDisplays += survey.displays.length;
+    insights.totalResponses += survey.responses.length;
+    insights.completionRate = Math.round((insights.totalCompletedResponses / insights.totalResponses) * 100);
+  }
+  // build the notification response needed for the emails
+  const lastWeekDate = new Date();
+  lastWeekDate.setDate(lastWeekDate.getDate() - 7);
+  return {
+    environmentId: environment.id,
+    currentDate: new Date(),
+    lastWeekDate,
+    productName: productName,
+    surveys,
+    insights,
+  };
+};

apps/web/app/api/internal/excel-conversion/route.ts

@@ -19,10 +19,8 @@ export async function POST(request: NextRequest) {
   const ws = xlsx.utils.json_to_sheet(json, { header: fields });
   xlsx.utils.book_append_sheet(wb, ws, "Sheet1");
 
-  const buffer = xlsx.write(wb, { type: "buffer", bookType: "xlsx" });
-
-  const binaryString = String.fromCharCode.apply(null, buffer);
-  const base64String = btoa(binaryString);
+  const buffer = xlsx.write(wb, { type: "buffer", bookType: "xlsx" }) as Buffer;
+  const base64String = buffer.toString("base64");
 
   const headers = new Headers();
   headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

apps/web/app/api/v1/(legacy)/client/[environmentId]/people/[userId]/set-attribute/route.ts

@@ -0,0 +1,95 @@
+import { responses } from "@/app/lib/api/response";
+import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { getActionClasses } from "@formbricks/lib/actionClass/service";
+import { createAttributeClass, getAttributeClassByName } from "@formbricks/lib/attributeClass/service";
+import { personCache } from "@formbricks/lib/person/cache";
+import { getPerson, updatePersonAttribute } from "@formbricks/lib/person/service";
+import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
+import { surveyCache } from "@formbricks/lib/survey/cache";
+import { getSyncSurveys } from "@formbricks/lib/survey/service";
+import { TJsStateSync, ZJsPeopleAttributeInput } from "@formbricks/types/js";
+import { NextResponse } from "next/server";
+
+interface Context {
+  params: {
+    userId: string;
+    environmentId: string;
+  };
+}
+
+export async function OPTIONS(): Promise<NextResponse> {
+  return responses.successResponse({}, true);
+}
+
+export async function POST(req: Request, context: Context): Promise<NextResponse> {
+  try {
+    const { userId, environmentId } = context.params;
+    const personId = userId; // legacy workaround for formbricks-js 1.2.0 & 1.2.1
+    const jsonInput = await req.json();
+
+    // validate using zod
+    const inputValidation = ZJsPeopleAttributeInput.safeParse(jsonInput);
+
+    if (!inputValidation.success) {
+      return responses.badRequestResponse(
+        "Fields are missing or incorrectly formatted",
+        transformErrorToDetails(inputValidation.error),
+        true
+      );
+    }
+
+    const { key, value } = inputValidation.data;
+
+    const person = await getPerson(personId);
+
+    if (!person) {
+      return responses.notFoundResponse("Person", personId, true);
+    }
+
+    let attributeClass = await getAttributeClassByName(environmentId, key);
+
+    // create new attribute class if not found
+    if (attributeClass === null) {
+      attributeClass = await createAttributeClass(environmentId, key, "code");
+    }
+
+    if (!attributeClass) {
+      return responses.internalServerErrorResponse("Unable to create attribute class", true);
+    }
+
+    // upsert attribute (update or create)
+    await updatePersonAttribute(personId, attributeClass.id, value);
+
+    personCache.revalidate({
+      id: personId,
+      environmentId,
+    });
+
+    surveyCache.revalidate({
+      environmentId,
+    });
+
+    const [surveys, noCodeActionClasses, product] = await Promise.all([
+      getSyncSurveys(environmentId, person),
+      getActionClasses(environmentId),
+      getProductByEnvironmentId(environmentId),
+    ]);
+
+    if (!product) {
+      throw new Error("Product not found");
+    }
+
+    // return state
+    const state: TJsStateSync = {
+      person: { id: person.id, userId: person.userId },
+      surveys,
+      noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
+      product,
+    };
+
+    return responses.successResponse({ ...state }, true);
+  } catch (error) {
+    console.error(error);
+    return responses.internalServerErrorResponse(`Unable to complete request: ${error.message}`, true);
+  }
+}

apps/web/app/api/v1/(legacy)/client/displays/[displayId]/responded/route.ts

@@ -1,5 +1,5 @@
 import { responses } from "@/app/lib/api/response";
-import { markDisplayResponded } from "@formbricks/lib/display/service";
+import { markDisplayRespondedLegacy } from "@formbricks/lib/display/service";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
@@ -14,15 +14,8 @@ export async function POST(_: Request, { params }: { params: { displayId: string
   }
 
   try {
-    const display = await markDisplayResponded(displayId);
-    return responses.successResponse(
-      {
-        ...display,
-        createdAt: display.createdAt.toISOString(),
-        updatedAt: display.updatedAt.toISOString(),
-      },
-      true
-    );
+    await markDisplayRespondedLegacy(displayId);
+    return responses.successResponse({}, true);
   } catch (error) {
     return responses.internalServerErrorResponse(error.message);
   }

apps/web/app/api/v1/(legacy)/client/displays/[displayId]/route.ts

@@ -1,8 +1,8 @@
 import { responses } from "@/app/lib/api/response";
-import { updateDisplay } from "@formbricks/lib/display/service";
-import { TDisplayCreateInput, ZDisplayUpdateInput } from "@formbricks/types/displays";
-import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { updateDisplayLegacy } from "@formbricks/lib/display/service";
+import { ZDisplayLegacyUpdateInput } from "@formbricks/types/displays";
+import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
   return responses.successResponse({}, true);
@@ -16,8 +16,8 @@ export async function PUT(
   if (!displayId) {
     return responses.badRequestResponse("Missing displayId", undefined, true);
   }
-  const displayInput: TDisplayCreateInput = await request.json();
-  const inputValidation = ZDisplayUpdateInput.safeParse(displayInput);
+  const displayInput = await request.json();
+  const inputValidation = ZDisplayLegacyUpdateInput.safeParse(displayInput);
 
   if (!inputValidation.success) {
     return responses.badRequestResponse(
@@ -27,7 +27,7 @@ export async function PUT(
     );
   }
   try {
-    const display = await updateDisplay(displayId, inputValidation.data);
+    const display = await updateDisplayLegacy(displayId, inputValidation.data);
     return responses.successResponse(display, true);
   } catch (error) {
     console.error(error);

apps/web/app/api/v1/(legacy)/client/displays/route.ts

@@ -72,12 +72,5 @@ export async function POST(request: Request): Promise<NextResponse> {
     console.warn("Posthog capture not possible. No team owner found");
   }
 
-  return responses.successResponse(
-    {
-      ...display,
-      createdAt: display.createdAt.toISOString(),
-      updatedAt: display.updatedAt.toISOString(),
-    },
-    true
-  );
+  return responses.successResponse({ id: display.id }, true);
 }

apps/web/app/api/v1/(legacy)/client/people/[personId]/set-attribute/route.ts

@@ -1,11 +1,13 @@
-import { getUpdatedState } from "@/app/api/v1/(legacy)/js/lib/sync";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { createAttributeClass, getAttributeClassByName } from "@formbricks/lib/attributeClass/service";
 import { personCache } from "@formbricks/lib/person/cache";
 import { getPerson, updatePersonAttribute } from "@formbricks/lib/person/service";
+import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { surveyCache } from "@formbricks/lib/survey/cache";
-import { ZJsPeopleAttributeInput } from "@formbricks/types/js";
+import { getSyncSurveys } from "@formbricks/lib/survey/service";
+import { TJsStateSync, ZJsPeopleAttributeInput } from "@formbricks/types/js";
 import { NextResponse } from "next/server";
 
 interface Context {
@@ -37,9 +39,9 @@ export async function POST(req: Request, context: Context): Promise<NextResponse
 
     const { key, value } = inputValidation.data;
 
-    const existingPerson = await getPerson(personId);
+    const person = await getPerson(personId);
 
-    if (!existingPerson) {
+    if (!person) {
       return responses.notFoundResponse("Person", personId, true);
     }
 
@@ -66,7 +68,23 @@ export async function POST(req: Request, context: Context): Promise<NextResponse
       environmentId,
     });
 
-    const state = await getUpdatedState(environmentId, personId);
+    const [surveys, noCodeActionClasses, product] = await Promise.all([
+      getSyncSurveys(environmentId, person),
+      getActionClasses(environmentId),
+      getProductByEnvironmentId(environmentId),
+    ]);
+
+    if (!product) {
+      throw new Error("Product not found");
+    }
+
+    // return state
+    const state: TJsStateSync = {
+      person: { id: person.id, userId: person.userId },
+      surveys,
+      noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
+      product,
+    };
 
     return responses.successResponse({ ...state }, true);
   } catch (error) {

apps/web/app/api/v1/(legacy)/client/responses/[responseId]/route.ts

@@ -83,5 +83,5 @@ export async function PUT(
       response: response,
     });
   }
-  return responses.successResponse(response, true);
+  return responses.successResponse({}, true);
 }

apps/web/app/api/v1/(legacy)/client/responses/route.ts

@@ -1,27 +1,27 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { InvalidInputError } from "@formbricks/types/errors";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
+import { createResponseLegacy } from "@formbricks/lib/response/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
-import { createResponse } from "@formbricks/lib/response/service";
 import { getTeamDetails } from "@formbricks/lib/teamDetail/service";
-import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
+import { InvalidInputError } from "@formbricks/types/errors";
+import { TResponse, ZResponseLegacyInput } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { NextResponse } from "next/server";
 import { UAParser } from "ua-parser-js";
-import { TSurvey } from "@formbricks/types/surveys";
 
 export async function OPTIONS(): Promise<NextResponse> {
   return responses.successResponse({}, true);
 }
 
 export async function POST(request: Request): Promise<NextResponse> {
-  const responseInput: TResponseInput = await request.json();
+  const responseInput = await request.json();
   if (responseInput.personId === "legacy") {
     responseInput.personId = null;
   }
   const agent = UAParser(request.headers.get("user-agent"));
-  const inputValidation = ZResponseInput.safeParse(responseInput);
+  const inputValidation = ZResponseLegacyInput.safeParse(responseInput);
 
   if (!inputValidation.success) {
     return responses.badRequestResponse(
@@ -67,7 +67,7 @@ export async function POST(request: Request): Promise<NextResponse> {
       responseInput.personId = null;
     }
 
-    response = await createResponse({
+    response = await createResponseLegacy({
       ...responseInput,
       meta,
     });
@@ -105,5 +105,5 @@ export async function POST(request: Request): Promise<NextResponse> {
     console.warn("Posthog capture not possible. No team owner found");
   }
 
-  return responses.successResponse(response, true);
+  return responses.successResponse({ id: response.id }, true);
 }

apps/web/app/api/v1/(legacy)/js/lib/surveys.ts

@@ -1,116 +0,0 @@
-import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
-import { SERVICES_REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { displayCache } from "@formbricks/lib/display/cache";
-import { getDisplaysByPersonId } from "@formbricks/lib/display/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
-import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { productCache } from "@formbricks/lib/product/cache";
-import { surveyCache } from "@formbricks/lib/survey/cache";
-import { TSurveyWithTriggers } from "@formbricks/types/js";
-import { TPerson } from "@formbricks/types/people";
-import { unstable_cache } from "next/cache";
-
-// Helper function to calculate difference in days between two dates
-const diffInDays = (date1: Date, date2: Date) => {
-  const diffTime = Math.abs(date2.getTime() - date1.getTime());
-  return Math.floor(diffTime / (1000 * 60 * 60 * 24));
-};
-
-export const getSyncSurveysCached = (environmentId: string, person: TPerson) =>
-  unstable_cache(
-    async () => {
-      return await getSyncSurveys(environmentId, person);
-    },
-    [`getSyncSurveysCached-${environmentId}`],
-    {
-      tags: [
-        displayCache.tag.byPersonId(person.id),
-        surveyCache.tag.byEnvironmentId(environmentId),
-        productCache.tag.byEnvironmentId(environmentId),
-      ],
-      revalidate: SERVICES_REVALIDATION_INTERVAL,
-    }
-  )();
-
-export const getSyncSurveys = async (
-  environmentId: string,
-  person: TPerson
-): Promise<TSurveyWithTriggers[]> => {
-  // get recontactDays from product
-  const product = await getProductByEnvironmentId(environmentId);
-
-  if (!product) {
-    throw new Error("Product not found");
-  }
-
-  let surveys = await getSurveys(environmentId);
-
-  // filtered surveys for running and web
-  surveys = surveys.filter((survey) => survey.status === "inProgress" && survey.type === "web");
-
-  const displays = await getDisplaysByPersonId(person.id);
-
-  // filter surveys that meet the displayOption criteria
-  surveys = surveys.filter((survey) => {
-    if (survey.displayOption === "respondMultiple") {
-      return true;
-    } else if (survey.displayOption === "displayOnce") {
-      return displays.filter((display) => display.surveyId === survey.id).length === 0;
-    } else if (survey.displayOption === "displayMultiple") {
-      return (
-        displays.filter((display) => display.surveyId === survey.id && display.responseId !== null).length ===
-        0
-      );
-    } else {
-      throw Error("Invalid displayOption");
-    }
-  });
-
-  const attributeClasses = await getAttributeClasses(environmentId);
-
-  // filter surveys that meet the attributeFilters criteria
-  const potentialSurveysWithAttributes = surveys.filter((survey) => {
-    const attributeFilters = survey.attributeFilters;
-    if (attributeFilters.length === 0) {
-      return true;
-    }
-    // check if meets all attribute filters criterias
-    return attributeFilters.every((attributeFilter) => {
-      const attributeClassName = attributeClasses.find(
-        (attributeClass) => attributeClass.id === attributeFilter.attributeClassId
-      )?.name;
-      if (!attributeClassName) {
-        throw Error("Invalid attribute filter class");
-      }
-      const personAttributeValue = person.attributes[attributeClassName];
-      if (attributeFilter.condition === "equals") {
-        return personAttributeValue === attributeFilter.value;
-      } else if (attributeFilter.condition === "notEquals") {
-        return personAttributeValue !== attributeFilter.value;
-      } else {
-        throw Error("Invalid attribute filter condition");
-      }
-    });
-  });
-
-  const latestDisplay = displays[0];
-
-  // filter surveys that meet the recontactDays criteria
-  surveys = potentialSurveysWithAttributes.filter((survey) => {
-    if (!latestDisplay) {
-      return true;
-    } else if (survey.recontactDays !== null) {
-      const lastDisplaySurvey = displays.filter((display) => display.surveyId === survey.id)[0];
-      if (!lastDisplaySurvey) {
-        return true;
-      }
-      return diffInDays(new Date(), new Date(lastDisplaySurvey.createdAt)) >= survey.recontactDays;
-    } else if (product.recontactDays !== null) {
-      return diffInDays(new Date(), new Date(latestDisplay.createdAt)) >= product.recontactDays;
-    } else {
-      return true;
-    }
-  });
-
-  return surveys;
-};

apps/web/app/api/v1/(legacy)/js/lib/sync.ts

@@ -1,133 +0,0 @@
-import { getSyncSurveysCached } from "@/app/api/v1/(legacy)/js/lib/surveys";
-import { IS_FORMBRICKS_CLOUD, MAU_LIMIT, PRICING_USERTARGETING_FREE_MTU } from "@formbricks/lib/constants";
-import { getActionClasses } from "@formbricks/lib/actionClass/service";
-import { getEnvironment, updateEnvironment } from "@formbricks/lib/environment/service";
-import { getPerson } from "@formbricks/lib/person/service";
-import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { captureTelemetry } from "@formbricks/lib/telemetry";
-import { TEnvironment } from "@formbricks/types/environment";
-import { TJsLegacyState } from "@formbricks/types/js";
-import { getSurveys } from "@formbricks/lib/survey/service";
-import { getMonthlyActiveTeamPeopleCount, getTeamByEnvironmentId } from "@formbricks/lib/team/service";
-
-const captureNewSessionTelemetry = async (jsVersion?: string): Promise<void> => {
-  await captureTelemetry("state update", { jsVersion: jsVersion ?? "unknown" });
-};
-
-export const getUpdatedState = async (
-  environmentId: string,
-  personId: string,
-  jsVersion?: string
-): Promise<TJsLegacyState> => {
-  let environment: TEnvironment | null;
-
-  if (jsVersion) {
-    captureNewSessionTelemetry(jsVersion);
-  }
-
-  // check if environment exists
-  environment = await getEnvironment(environmentId);
-
-  if (!environment) {
-    throw new Error("Environment does not exist");
-  }
-
-  if (!environment?.widgetSetupCompleted) {
-    await updateEnvironment(environment.id, { widgetSetupCompleted: true });
-  }
-
-  // check team subscriptons
-  const team = await getTeamByEnvironmentId(environmentId);
-
-  if (!team) {
-    throw new Error("Team does not exist");
-  }
-
-  // check if Monthly Active Users limit is reached
-  if (IS_FORMBRICKS_CLOUD) {
-    const hasUserTargetingSubscription =
-      team?.billing?.features.userTargeting.status &&
-      team?.billing?.features.userTargeting.status in ["active", "canceled"];
-    const currentMau = await getMonthlyActiveTeamPeopleCount(team.id);
-    const isMauLimitReached = !hasUserTargetingSubscription && currentMau >= PRICING_USERTARGETING_FREE_MTU;
-
-    if (isMauLimitReached) {
-      const errorMessage = `Monthly Active Users limit reached in ${environmentId} (${currentMau}/${MAU_LIMIT})`;
-      throw new Error(errorMessage);
-
-      // if (!personId) {
-      //   // don't allow new people
-      //   throw new Error(errorMessage);
-      // }
-      // const session = await getSession(sessionId);
-      // if (!session) {
-      //   // don't allow new sessions
-      //   throw new Error(errorMessage);
-      // }
-      // // check if session was created this month (user already active this month)
-      // const now = new Date();
-      // const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
-      // if (new Date(session.createdAt) < firstDayOfMonth) {
-      //   throw new Error(errorMessage);
-      // }
-    }
-  }
-
-  const person = await getPerson(personId);
-
-  if (!person) {
-    throw new Error("Person not found");
-  }
-
-  const [surveys, noCodeActionClasses, product] = await Promise.all([
-    getSyncSurveysCached(environmentId, person),
-    getActionClasses(environmentId),
-    getProductByEnvironmentId(environmentId),
-  ]);
-
-  if (!product) {
-    throw new Error("Product not found");
-  }
-
-  // return state
-  const state: TJsLegacyState = {
-    person: person!,
-    session: {},
-    surveys,
-    noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
-    product,
-  };
-
-  return state;
-};
-
-export const getPublicUpdatedState = async (environmentId: string) => {
-  // check if environment exists
-  const environment = await getEnvironment(environmentId);
-
-  if (!environment) {
-    throw new Error("Environment does not exist");
-  }
-
-  // TODO: check if Monthly Active Users limit is reached
-
-  const [surveys, noCodeActionClasses, product] = await Promise.all([
-    getSurveys(environmentId),
-    getActionClasses(environmentId),
-    getProductByEnvironmentId(environmentId),
-  ]);
-
-  if (!product) {
-    throw new Error("Product not found");
-  }
-
-  const state: TJsLegacyState = {
-    surveys,
-    session: {},
-    noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
-    product,
-    person: null,
-  };
-
-  return state;
-};

apps/web/app/api/v1/(legacy)/js/people/[personId]/set-attribute/route.ts

@@ -1,4 +1,4 @@
-import { getUpdatedState } from "@/app/api/v1/(legacy)/js/lib/sync";
+import { getUpdatedState } from "@/app/api/v1/(legacy)/js/sync/lib/sync";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { createAttributeClass, getAttributeClassByName } from "@formbricks/lib/attributeClass/service";
@@ -6,6 +6,7 @@ import { personCache } from "@formbricks/lib/person/cache";
 import { getPerson, updatePersonAttribute } from "@formbricks/lib/person/service";
 import { surveyCache } from "@formbricks/lib/survey/cache";
 import { ZJsPeopleLegacyAttributeInput } from "@formbricks/types/js";
+import { TPersonClient } from "@formbricks/types/people";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
@@ -66,7 +67,15 @@ export async function POST(req: Request, { params }): Promise<NextResponse> {
 
     const state = await getUpdatedState(environmentId, personId);
 
-    return responses.successResponse({ ...state }, true);
+    let person: TPersonClient | null = null;
+    if (state.person && "id" in state.person && "userId" in state.person) {
+      person = {
+        id: state.person.id,
+        userId: state.person.userId,
+      };
+    }
+
+    return responses.successResponse({ ...state, person }, true);
   } catch (error) {
     console.error(error);
     return responses.internalServerErrorResponse(`Unable to complete request: ${error.message}`, true);

apps/web/app/api/v1/(legacy)/js/people/[personId]/set-user-id/route.ts

@@ -1,7 +1,7 @@
-import { getUpdatedState } from "@/app/api/v1/(legacy)/js/lib/sync";
+import { getUpdatedState } from "@/app/api/v1/(legacy)/js/sync/lib/sync";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { getOrCreatePersonByUserId } from "@formbricks/lib/person/service";
+import { createPerson, getPersonByUserId } from "@formbricks/lib/person/service";
 import { ZJsPeopleUserIdInput } from "@formbricks/types/js";
 import { NextResponse } from "next/server";
 
@@ -26,11 +26,18 @@ export async function POST(req: Request): Promise<NextResponse> {
 
     const { environmentId, userId } = inputValidation.data;
 
-    const personWithUserId = await getOrCreatePersonByUserId(userId, environmentId);
+    let person = await getPersonByUserId(environmentId, userId);
+    if (!person) {
+      person = await createPerson(environmentId, userId);
+    }
 
-    const state = await getUpdatedState(environmentId, personWithUserId.id);
+    const personClient = {
+      id: person.id,
+      userId: person.userId,
+    };
 
-    return responses.successResponse({ ...state }, true);
+    const state = await getUpdatedState(environmentId, person.id);
+    return responses.successResponse({ ...state, person: personClient }, true);
   } catch (error) {
     console.error(error);
     return responses.internalServerErrorResponse("Unable to handle the request: " + error.message, true);

apps/web/app/api/v1/(legacy)/js/people/route.ts

@@ -23,9 +23,9 @@ export async function POST(req: NextRequest) {
   }
 
   try {
-    const person = await createPerson(environmentId, userId);
+    await createPerson(environmentId, userId);
 
-    return responses.successResponse({ status: "success", person }, true);
+    return responses.successResponse({}, true);
   } catch (err) {
     return responses.internalServerErrorResponse("Something went wrong", true);
   }

apps/web/app/api/v1/(legacy)/js/sync/lib/legacy.ts

@@ -0,0 +1,11 @@
+import { TJsLegacyState, TJsState } from "@formbricks/types/js";
+
+export const transformLegacySurveys = (state: TJsState): TJsLegacyState => {
+  const updatedState: any = { ...state };
+  updatedState.surveys = updatedState.surveys.map((survey) => {
+    const updatedSurvey = { ...survey };
+    updatedSurvey.triggers = updatedSurvey.triggers.map((trigger) => ({ name: trigger }));
+    return updatedSurvey;
+  });
+  return { ...updatedState, session: {} };
+};

apps/web/app/api/v1/(legacy)/js/sync/lib/surveys.ts

@@ -1,116 +0,0 @@
-import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
-import { SERVICES_REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { displayCache } from "@formbricks/lib/display/cache";
-import { getDisplaysByPersonId } from "@formbricks/lib/display/service";
-import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { productCache } from "@formbricks/lib/product/cache";
-import { getSurveys } from "@formbricks/lib/survey/service";
-import { surveyCache } from "@formbricks/lib/survey/cache";
-import { TSurveyWithTriggers } from "@formbricks/types/js";
-import { TPerson } from "@formbricks/types/people";
-import { unstable_cache } from "next/cache";
-
-// Helper function to calculate difference in days between two dates
-const diffInDays = (date1: Date, date2: Date) => {
-  const diffTime = Math.abs(date2.getTime() - date1.getTime());
-  return Math.floor(diffTime / (1000 * 60 * 60 * 24));
-};
-
-export const getSyncSurveysCached = (environmentId: string, person: TPerson) =>
-  unstable_cache(
-    async () => {
-      return await getSyncSurveys(environmentId, person);
-    },
-    [`getSyncSurveysCached-${environmentId}-${person.id}`],
-    {
-      tags: [
-        displayCache.tag.byPersonId(person.id),
-        surveyCache.tag.byEnvironmentId(environmentId),
-        productCache.tag.byEnvironmentId(environmentId),
-      ],
-      revalidate: SERVICES_REVALIDATION_INTERVAL,
-    }
-  )();
-
-export const getSyncSurveys = async (
-  environmentId: string,
-  person: TPerson
-): Promise<TSurveyWithTriggers[]> => {
-  // get recontactDays from product
-  const product = await getProductByEnvironmentId(environmentId);
-
-  if (!product) {
-    throw new Error("Product not found");
-  }
-
-  let surveys = await getSurveys(environmentId);
-
-  // filtered surveys for running and web
-  surveys = surveys.filter((survey) => survey.status === "inProgress" && survey.type === "web");
-
-  const displays = await getDisplaysByPersonId(person.id);
-
-  // filter surveys that meet the displayOption criteria
-  surveys = surveys.filter((survey) => {
-    if (survey.displayOption === "respondMultiple") {
-      return true;
-    } else if (survey.displayOption === "displayOnce") {
-      return displays.filter((display) => display.surveyId === survey.id).length === 0;
-    } else if (survey.displayOption === "displayMultiple") {
-      return (
-        displays.filter((display) => display.surveyId === survey.id && display.responseId !== null).length ===
-        0
-      );
-    } else {
-      throw Error("Invalid displayOption");
-    }
-  });
-
-  const attributeClasses = await getAttributeClasses(environmentId);
-
-  // filter surveys that meet the attributeFilters criteria
-  const potentialSurveysWithAttributes = surveys.filter((survey) => {
-    const attributeFilters = survey.attributeFilters;
-    if (attributeFilters.length === 0) {
-      return true;
-    }
-    // check if meets all attribute filters criterias
-    return attributeFilters.every((attributeFilter) => {
-      const attributeClassName = attributeClasses.find(
-        (attributeClass) => attributeClass.id === attributeFilter.attributeClassId
-      )?.name;
-      if (!attributeClassName) {
-        throw Error("Invalid attribute filter class");
-      }
-      const personAttributeValue = person.attributes[attributeClassName];
-      if (attributeFilter.condition === "equals") {
-        return personAttributeValue === attributeFilter.value;
-      } else if (attributeFilter.condition === "notEquals") {
-        return personAttributeValue !== attributeFilter.value;
-      } else {
-        throw Error("Invalid attribute filter condition");
-      }
-    });
-  });
-
-  const latestDisplay = displays[0];
-
-  // filter surveys that meet the recontactDays criteria
-  surveys = potentialSurveysWithAttributes.filter((survey) => {
-    if (!latestDisplay) {
-      return true;
-    } else if (survey.recontactDays !== null) {
-      const lastDisplaySurvey = displays.filter((display) => display.surveyId === survey.id)[0];
-      if (!lastDisplaySurvey) {
-        return true;
-      }
-      return diffInDays(new Date(), new Date(lastDisplaySurvey.createdAt)) >= survey.recontactDays;
-    } else if (product.recontactDays !== null) {
-      return diffInDays(new Date(), new Date(latestDisplay.createdAt)) >= product.recontactDays;
-    } else {
-      return true;
-    }
-  });
-
-  return surveys;
-};

apps/web/app/api/v1/(legacy)/js/sync/lib/sync.ts

@@ -1,4 +1,3 @@
-import { getSyncSurveysCached } from "@/app/api/v1/(legacy)/js/sync/lib/surveys";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import {
   IS_FORMBRICKS_CLOUD,
@@ -9,15 +8,25 @@ import {
 import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getPerson } from "@formbricks/lib/person/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
+import { getSurveys, getSyncSurveys } from "@formbricks/lib/survey/service";
 import {
   getMonthlyActiveTeamPeopleCount,
   getMonthlyTeamResponseCount,
   getTeamByEnvironmentId,
 } from "@formbricks/lib/team/service";
 import { TEnvironment } from "@formbricks/types/environment";
-import { TJsLegacyState } from "@formbricks/types/js";
+import { TJsLegacyState, TSurveyWithTriggers } from "@formbricks/types/js";
 import { TPerson } from "@formbricks/types/people";
+import { TSurvey } from "@formbricks/types/surveys";
+
+export const transformLegacySurveys = (surveys: TSurvey[]): TSurveyWithTriggers[] => {
+  const updatedSurveys = surveys.map((survey) => {
+    const updatedSurvey: any = { ...survey };
+    updatedSurvey.triggers = updatedSurvey.triggers.map((trigger) => ({ name: trigger }));
+    return updatedSurvey;
+  });
+  return updatedSurveys;
+};
 
 export const getUpdatedState = async (environmentId: string, personId?: string): Promise<TJsLegacyState> => {
   let environment: TEnvironment | null;
@@ -85,12 +94,14 @@ export const getUpdatedState = async (environmentId: string, personId?: string):
   if (isAppSurveyLimitReached) {
     surveys = [];
   } else if (isPerson) {
-    surveys = await getSyncSurveysCached(environmentId, person as TPerson);
+    surveys = await getSyncSurveys(environmentId, person as TPerson);
   } else {
     surveys = await getSurveys(environmentId);
-    surveys = surveys.filter((survey) => survey.type === "web");
+    surveys = surveys.filter((survey) => survey.type === "web" && survey.status === "inProgress");
   }
 
+  surveys = transformLegacySurveys(surveys);
+
   // get/create rest of the state
   const [noCodeActionClasses, product] = await Promise.all([
     getActionClasses(environmentId),

apps/web/app/api/v1/(legacy)/js/sync/route.ts

@@ -2,6 +2,7 @@ import { getUpdatedState } from "@/app/api/v1/(legacy)/js/sync/lib/sync";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { ZJsSyncLegacyInput } from "@formbricks/types/js";
+import { TPersonClient } from "@formbricks/types/people";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
@@ -27,7 +28,15 @@ export async function POST(req: Request): Promise<NextResponse> {
 
     const state = await getUpdatedState(environmentId, personId);
 
-    return responses.successResponse({ ...state }, true);
+    let person: TPersonClient | null = null;
+    if (state.person && "id" in state.person && "userId" in state.person) {
+      person = {
+        id: state.person.id,
+        userId: state.person.userId,
+      };
+    }
+
+    return responses.successResponse({ ...state, person }, true);
   } catch (error) {
     console.error(error);
     return responses.internalServerErrorResponse("Unable to handle the request: " + error.message, true);

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

@@ -16,10 +16,11 @@ export async function OPTIONS(): Promise<NextResponse> {
 }
 
 export async function PUT(request: Request, context: Context): Promise<NextResponse> {
-  const { displayId } = context.params;
+  const { displayId, environmentId } = context.params;
   const jsonInput = await request.json();
   const inputValidation = ZDisplayUpdateInput.safeParse({
     ...jsonInput,
+    environmentId,
   });
 
   if (!inputValidation.success) {
@@ -31,8 +32,8 @@ export async function PUT(request: Request, context: Context): Promise<NextRespo
   }
 
   try {
-    const display = await updateDisplay(displayId, inputValidation.data);
-    return responses.successResponse(display, true);
+    await updateDisplay(displayId, inputValidation.data);
+    return responses.successResponse({}, true);
   } catch (error) {
     console.error(error);
     return responses.internalServerErrorResponse(error.message, true);

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

@@ -3,7 +3,7 @@ import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { createDisplay } from "@formbricks/lib/display/service";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
 import { getTeamDetails } from "@formbricks/lib/teamDetail/service";
-import { TDisplay, ZDisplayCreateInput } from "@formbricks/types/displays";
+import { ZDisplayCreateInput } from "@formbricks/types/displays";
 import { InvalidInputError } from "@formbricks/types/errors";
 import { NextResponse } from "next/server";
 
@@ -36,9 +36,8 @@ export async function POST(request: Request, context: Context): Promise<NextResp
   const teamDetails = await getTeamDetails(inputValidation.data.environmentId);
 
   // create display
-  let display: TDisplay;
   try {
-    display = await createDisplay(inputValidation.data);
+    await createDisplay(inputValidation.data);
   } catch (error) {
     if (error instanceof InvalidInputError) {
       return responses.badRequestResponse(error.message);
@@ -54,12 +53,5 @@ export async function POST(request: Request, context: Context): Promise<NextResp
     console.warn("Posthog capture not possible. No team owner found");
   }
 
-  return responses.successResponse(
-    {
-      ...display,
-      createdAt: display.createdAt.toISOString(),
-      updatedAt: display.updatedAt.toISOString(),
-    },
-    true
-  );
+  return responses.successResponse({}, true);
 }

apps/web/app/api/v1/client/[environmentId]/in-app/sync/[userId]/route.ts

@@ -1,14 +1,15 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { getLatestActionByPersonId } from "@formbricks/lib/action/service";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
-import { IS_FORMBRICKS_CLOUD, MAU_LIMIT, PRICING_USERTARGETING_FREE_MTU } from "@formbricks/lib/constants";
+import { IS_FORMBRICKS_CLOUD, PRICING_USERTARGETING_FREE_MTU } from "@formbricks/lib/constants";
 import { getEnvironment, updateEnvironment } from "@formbricks/lib/environment/service";
-import { getOrCreatePersonByUserId } from "@formbricks/lib/person/service";
+import { createPerson, getPersonByUserId } from "@formbricks/lib/person/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { getSyncSurveysCached } from "@formbricks/lib/survey/service";
+import { getSyncSurveys } from "@formbricks/lib/survey/service";
 import { getMonthlyActiveTeamPeopleCount, getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { TEnvironment } from "@formbricks/types/environment";
-import { TJsState, ZJsPeopleUserIdInput } from "@formbricks/types/js";
+import { TJsStateSync, ZJsPeopleUserIdInput } from "@formbricks/types/js";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
@@ -43,52 +44,54 @@ export async function GET(
 
     const { environmentId, userId } = inputValidation.data;
 
-    // check if person exists
-    const person = await getOrCreatePersonByUserId(userId, environmentId);
-
-    if (!person) {
-      return responses.badRequestResponse(`Person with userId ${userId} not found`);
-    }
-
     let environment: TEnvironment | null;
 
     // check if environment exists
     environment = await getEnvironment(environmentId);
-
     if (!environment) {
       throw new Error("Environment does not exist");
     }
-
     if (!environment?.widgetSetupCompleted) {
       await updateEnvironment(environment.id, { widgetSetupCompleted: true });
     }
 
-    // check team subscriptons
-    const team = await getTeamByEnvironmentId(environmentId);
-
-    if (!team) {
-      throw new Error("Team does not exist");
-    }
-
-    // check if Monthly Active Users limit is reached
+    // check if MAU limit is reached
+    let isMauLimitReached = false;
     if (IS_FORMBRICKS_CLOUD) {
+      // check team subscriptons
+      const team = await getTeamByEnvironmentId(environmentId);
+
+      if (!team) {
+        throw new Error("Team does not exist");
+      }
       const hasUserTargetingSubscription =
         team?.billing?.features.userTargeting.status &&
         team?.billing?.features.userTargeting.status in ["active", "canceled"];
       const currentMau = await getMonthlyActiveTeamPeopleCount(team.id);
-      const isMauLimitReached = !hasUserTargetingSubscription && currentMau >= PRICING_USERTARGETING_FREE_MTU;
+      isMauLimitReached = !hasUserTargetingSubscription && currentMau >= PRICING_USERTARGETING_FREE_MTU;
+    }
 
-      // TODO: Problem is that if isMauLimitReached, all sync request will fail
-      // But what we essentially want, is to fail only for new people syncing for the first time
-
-      if (isMauLimitReached) {
-        const errorMessage = `Monthly Active Users limit reached in ${environmentId} (${currentMau}/${MAU_LIMIT})`;
+    let person = await getPersonByUserId(environmentId, userId);
+    if (!isMauLimitReached) {
+      if (!person) {
+        person = await createPerson(environmentId, userId);
+      }
+    } else {
+      const errorMessage = `Monthly Active Users limit in the current plan is reached in ${environmentId}`;
+      if (!person) {
+        // if it's a new person and MAU limit is reached, throw an error
         throw new Error(errorMessage);
+      } else {
+        // check if person has been active this month
+        const latestAction = await getLatestActionByPersonId(person.id);
+        if (!latestAction || new Date(latestAction.createdAt).getMonth() !== new Date().getMonth()) {
+          throw new Error(errorMessage);
+        }
       }
     }
 
     const [surveys, noCodeActionClasses, product] = await Promise.all([
-      getSyncSurveysCached(environmentId, person),
+      getSyncSurveys(environmentId, person),
       getActionClasses(environmentId),
       getProductByEnvironmentId(environmentId),
     ]);
@@ -98,8 +101,8 @@ export async function GET(
     }
 
     // return state
-    const state: TJsState = {
-      person,
+    const state: TJsStateSync = {
+      person: { id: person.id, userId: person.userId },
       surveys,
       noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
       product,

apps/web/app/api/v1/client/[environmentId]/in-app/sync/route.ts

@@ -4,7 +4,7 @@ import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { getEnvironment, updateEnvironment } from "@formbricks/lib/environment/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { getSurveys } from "@formbricks/lib/survey/service";
-import { TJsState, ZJsPublicSyncInput } from "@formbricks/types/js";
+import { TJsStateSync, ZJsPublicSyncInput } from "@formbricks/types/js";
 import { NextRequest, NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
@@ -51,7 +51,7 @@ export async function GET(
       throw new Error("Product not found");
     }
 
-    const state: TJsState = {
+    const state: TJsStateSync = {
       surveys: surveys.filter((survey) => survey.status === "inProgress" && survey.type === "web"),
       noCodeActionClasses: noCodeActionClasses.filter((actionClass) => actionClass.type === "noCode"),
       product,

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

@@ -0,0 +1,49 @@
+import { responses } from "@/app/lib/api/response";
+import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { createPerson, getPersonByUserId, updatePerson } from "@formbricks/lib/person/service";
+import { ZPersonUpdateInput } from "@formbricks/types/people";
+import { NextResponse } from "next/server";
+
+interface Context {
+  params: {
+    userId: string;
+    environmentId: string;
+  };
+}
+
+export async function OPTIONS(): Promise<NextResponse> {
+  return responses.successResponse({}, true);
+}
+
+export async function POST(req: Request, context: Context): Promise<NextResponse> {
+  try {
+    const { userId, environmentId } = context.params;
+    const jsonInput = await req.json();
+
+    // validate using zod
+    const inputValidation = ZPersonUpdateInput.safeParse(jsonInput);
+
+    if (!inputValidation.success) {
+      return responses.badRequestResponse(
+        "Fields are missing or incorrectly formatted",
+        transformErrorToDetails(inputValidation.error),
+        true
+      );
+    }
+
+    let person = await getPersonByUserId(environmentId, userId);
+
+    if (!person) {
+      // return responses.notFoundResponse("PersonByUserId", userId, true);
+      // HOTFIX: create person if not found to work around caching issue
+      person = await createPerson(environmentId, userId);
+    }
+
+    await updatePerson(person.id, inputValidation.data);
+
+    return responses.successResponse({}, true);
+  } catch (error) {
+    console.error(error);
+    return responses.internalServerErrorResponse(`Unable to complete request: ${error.message}`, true);
+  }
+}

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

@@ -6,6 +6,7 @@ import { getSurvey } from "@formbricks/lib/survey/service";
 import { updateResponse } from "@formbricks/lib/response/service";
 import { ZResponseUpdateInput } from "@formbricks/types/responses";
 import { NextResponse } from "next/server";
+import { getPerson } from "@formbricks/lib/person/service";
 
 export async function OPTIONS(): Promise<NextResponse> {
   return responses.successResponse({}, true);
@@ -23,6 +24,13 @@ export async function PUT(
 
   const responseUpdate = await request.json();
 
+  // legacy workaround for formbricks-js 1.2.0 & 1.2.1
+  if (responseUpdate.personId && typeof responseUpdate.personId === "string") {
+    const person = await getPerson(responseUpdate.personId);
+    responseUpdate.userId = person?.userId;
+    delete responseUpdate.personId;
+  }
+
   const inputValidation = ZResponseUpdateInput.safeParse(responseUpdate);
 
   if (!inputValidation.success) {
@@ -83,5 +91,5 @@ export async function PUT(
       response: response,
     });
   }
-  return responses.successResponse(response, true);
+  return responses.successResponse({}, true);
 }

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

@@ -1,23 +1,50 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { InvalidInputError } from "@formbricks/types/errors";
+import { getPerson } from "@formbricks/lib/person/service";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
-import { getSurvey } from "@formbricks/lib/survey/service";
 import { createResponse } from "@formbricks/lib/response/service";
+import { getSurvey } from "@formbricks/lib/survey/service";
 import { getTeamDetails } from "@formbricks/lib/teamDetail/service";
-import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
+import { ZId } from "@formbricks/types/environment";
+import { InvalidInputError } from "@formbricks/types/errors";
+import { TResponse, ZResponseInput } from "@formbricks/types/responses";
 import { NextResponse } from "next/server";
 import { UAParser } from "ua-parser-js";
 
+interface Context {
+  params: {
+    environmentId: string;
+  };
+}
+
 export async function OPTIONS(): Promise<NextResponse> {
   return responses.successResponse({}, true);
 }
 
-export async function POST(request: Request): Promise<NextResponse> {
-  const responseInput: TResponseInput = await request.json();
+export async function POST(request: Request, context: Context): Promise<NextResponse> {
+  const { environmentId } = context.params;
+  const environmentIdValidation = ZId.safeParse(environmentId);
+
+  if (!environmentIdValidation.success) {
+    return responses.badRequestResponse(
+      "Fields are missing or incorrectly formatted",
+      transformErrorToDetails(environmentIdValidation.error),
+      true
+    );
+  }
+
+  const responseInput = await request.json();
+
+  // legacy workaround for formbricks-js 1.2.0 & 1.2.1
+  if (responseInput.personId && typeof responseInput.personId === "string") {
+    const person = await getPerson(responseInput.personId);
+    responseInput.userId = person?.userId;
+    delete responseInput.personId;
+  }
+
   const agent = UAParser(request.headers.get("user-agent"));
-  const inputValidation = ZResponseInput.safeParse(responseInput);
+  const inputValidation = ZResponseInput.safeParse({ ...responseInput, environmentId });
 
   if (!inputValidation.success) {
     return responses.badRequestResponse(
@@ -27,17 +54,20 @@ export async function POST(request: Request): Promise<NextResponse> {
     );
   }
 
-  let survey;
-
-  try {
-    survey = await getSurvey(responseInput.surveyId);
-  } catch (error) {
-    if (error instanceof InvalidInputError) {
-      return responses.badRequestResponse(error.message);
-    } else {
-      console.error(error);
-      return responses.internalServerErrorResponse(error.message);
-    }
+  // get and check survey
+  const survey = await getSurvey(responseInput.surveyId);
+  if (!survey) {
+    return responses.notFoundResponse("Survey", responseInput.surveyId, true);
+  }
+  if (survey.environmentId !== environmentId) {
+    return responses.badRequestResponse(
+      "Survey is part of another environment",
+      {
+        "survey.environmentId": survey.environmentId,
+        environmentId,
+      },
+      true
+    );
   }
 
   const teamDetails = await getTeamDetails(survey.environmentId);
@@ -54,14 +84,8 @@ export async function POST(request: Request): Promise<NextResponse> {
       },
     };
 
-    // check if personId is anonymous
-    if (responseInput.personId === "anonymous") {
-      // remove this from the request
-      responseInput.personId = null;
-    }
-
     response = await createResponse({
-      ...responseInput,
+      ...inputValidation.data,
       meta,
     });
   } catch (error) {
@@ -98,5 +122,5 @@ export async function POST(request: Request): Promise<NextResponse> {
     console.warn("Posthog capture not possible. No team owner found");
   }
 
-  return responses.successResponse(response, true);
+  return responses.successResponse({ id: response.id }, true);
 }

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

@@ -6,7 +6,7 @@ import { NextRequest, NextResponse } from "next/server";
 import { headers } from "next/headers";
 import { putFileToLocalStorage } from "@formbricks/lib/storage/service";
 import { UPLOADS_DIR } from "@formbricks/lib/constants";
-import { env } from "@/env.mjs";
+import { env } from "@formbricks/lib/env.mjs";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { validateLocalSignedUrl } from "@formbricks/lib/crypto";
@@ -17,25 +17,39 @@ interface Context {
   };
 }
 
+export async function OPTIONS(): Promise<NextResponse> {
+  return NextResponse.json(
+    {},
+    {
+      headers: {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
+        "Access-Control-Allow-Headers":
+          "Content-Type, Authorization, X-File-Name, X-File-Type, X-Survey-ID, X-Signature, X-Timestamp, X-UUID",
+      },
+    }
+  );
+}
+
 export async function POST(req: NextRequest, context: Context): Promise<NextResponse> {
   const environmentId = context.params.environmentId;
 
   const accessType = "private"; // private files are accessible only by authorized users
   const headersList = headers();
 
-  const fileType = headersList.get("fileType");
-  const fileName = headersList.get("fileName");
-  const surveyId = headersList.get("surveyId");
+  const fileType = headersList.get("X-File-Type");
+  const encodedFileName = headersList.get("X-File-Name");
+  const surveyId = headersList.get("X-Survey-ID");
 
-  const signedSignature = headersList.get("signature");
-  const signedUuid = headersList.get("uuid");
-  const signedTimestamp = headersList.get("timestamp");
+  const signedSignature = headersList.get("X-Signature");
+  const signedUuid = headersList.get("X-UUID");
+  const signedTimestamp = headersList.get("X-Timestamp");
 
   if (!fileType) {
     return responses.badRequestResponse("contentType is required");
   }
 
-  if (!fileName) {
+  if (!encodedFileName) {
     return responses.badRequestResponse("fileName is required");
   }
 
@@ -65,6 +79,8 @@ export async function POST(req: NextRequest, context: Context): Promise<NextResp
     return responses.notFoundResponse("TeamByEnvironmentId", environmentId);
   }
 
+  const fileName = decodeURIComponent(encodedFileName);
+
   // validate signature
 
   const validated = validateLocalSignedUrl(

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

@@ -10,6 +10,10 @@ interface Context {
   };
 }
 
+export async function OPTIONS(): Promise<NextResponse> {
+  return responses.successResponse({}, true);
+}
+
 // api endpoint for uploading private files
 // uploaded files will be private, only the user who has access to the environment can access the file
 // uploading private files requires no authentication

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

@@ -1,14 +1,19 @@
+import { authenticateRequest } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { getResponsesByEnvironmentId } from "@formbricks/lib/response/service";
-import { authenticateRequest } from "@/app/api/v1/auth";
 import { DatabaseError } from "@formbricks/types/errors";
+import { NextRequest } from "next/server";
 
-export async function GET(request: Request) {
+export async function GET(request: NextRequest) {
+  const surveyId = request.nextUrl.searchParams.get("surveyId");
   try {
     const authentication = await authenticateRequest(request);
     if (!authentication) return responses.notAuthenticatedResponse();
-    const responseArray = await getResponsesByEnvironmentId(authentication.environmentId!);
-    return responses.successResponse(responseArray);
+    let environmentResponses = await getResponsesByEnvironmentId(authentication.environmentId!);
+    if (surveyId) {
+      environmentResponses = environmentResponses.filter((response) => response.surveyId === surveyId);
+    }
+    return responses.successResponse(environmentResponses);
   } catch (error) {
     if (error instanceof DatabaseError) {
       return responses.badRequestResponse(error.message);