[pull] main from formbricks:main

apps/storybook/package.json

@@ -23,7 +23,7 @@
     "eslint-plugin-react-refresh": "0.4.26",
     "eslint-plugin-storybook": "10.2.17",
     "storybook": "10.2.17",
-    "vite": "7.3.1",
+    "vite": "7.3.2",
     "@storybook/addon-docs": "10.2.17"
   }
 }

apps/web/app/api/v1/client/[environmentId]/displays/[displayId]/response/lib/response.test.ts

@@ -0,0 +1,98 @@
+import { Prisma } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
+import { validateInputs } from "@/lib/utils/validate";
+import { getResponseIdByDisplayId } from "./response";
+
+vi.mock("@/lib/utils/validate", () => ({
+  validateInputs: vi.fn((inputs: [unknown, unknown][]) =>
+    inputs.map((input: [unknown, unknown]) => input[0])
+  ),
+}));
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    display: {
+      findFirst: vi.fn(),
+    },
+  },
+}));
+
+describe("getResponseIdByDisplayId", () => {
+  const environmentId = "env1234567890123456789012";
+  const displayId = "display1234567890123456789";
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns the linked responseId when a response exists", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue({
+      response: {
+        id: "response123456789012345678",
+      },
+    } as any);
+
+    const result = await getResponseIdByDisplayId(environmentId, displayId);
+
+    expect(validateInputs).toHaveBeenCalledWith(
+      [environmentId, expect.any(Object)],
+      [displayId, expect.any(Object)]
+    );
+    expect(prisma.display.findFirst).toHaveBeenCalledWith({
+      where: {
+        id: displayId,
+        survey: {
+          environmentId,
+        },
+      },
+      select: {
+        response: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+    expect(result).toEqual({ responseId: "response123456789012345678" });
+  });
+
+  test("returns null when the display exists but has no response", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue({
+      response: null,
+    } as any);
+
+    await expect(getResponseIdByDisplayId(environmentId, displayId)).resolves.toEqual({
+      responseId: null,
+    });
+  });
+
+  test("throws ResourceNotFoundError when the display does not exist in the environment", async () => {
+    vi.mocked(prisma.display.findFirst).mockResolvedValue(null);
+
+    await expect(getResponseIdByDisplayId(environmentId, displayId)).rejects.toThrow(
+      new ResourceNotFoundError("Display", displayId)
+    );
+  });
+
+  test("throws ValidationError when input validation fails", async () => {
+    const validationError = new ValidationError("Validation failed");
+    vi.mocked(validateInputs).mockImplementation(() => {
+      throw validationError;
+    });
+
+    await expect(getResponseIdByDisplayId(environmentId, displayId)).rejects.toThrow(ValidationError);
+    expect(prisma.display.findFirst).not.toHaveBeenCalled();
+  });
+
+  test("throws DatabaseError on Prisma request errors", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Database error", {
+      code: "P2002",
+      clientVersion: "test",
+    });
+    vi.mocked(prisma.display.findFirst).mockRejectedValue(prismaError);
+
+    await expect(getResponseIdByDisplayId(environmentId, displayId)).rejects.toThrow(DatabaseError);
+  });
+});

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

@@ -0,0 +1,44 @@
+import { Prisma } from "@prisma/client";
+import { prisma } from "@formbricks/database";
+import { ZId } from "@formbricks/types/common";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { validateInputs } from "@/lib/utils/validate";
+
+export const getResponseIdByDisplayId = async (
+  environmentId: string,
+  displayId: string
+): Promise<{ responseId: string | null }> => {
+  validateInputs([environmentId, ZId], [displayId, ZId]);
+
+  try {
+    const display = await prisma.display.findFirst({
+      where: {
+        id: displayId,
+        survey: {
+          environmentId,
+        },
+      },
+      select: {
+        response: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    if (!display) {
+      throw new ResourceNotFoundError("Display", displayId);
+    }
+
+    return {
+      responseId: display.response?.id ?? null,
+    };
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError(error.message);
+    }
+
+    throw error;
+  }
+};

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

@@ -0,0 +1,70 @@
+import { NextRequest } from "next/server";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { getResponseIdByDisplayId } from "./lib/response";
+import { GET } from "./route";
+
+vi.mock("@/app/lib/api/with-api-logging", async () => {
+  return {
+    withV1ApiWrapper:
+      ({ handler }: { handler: any }) =>
+      async (req: NextRequest, props: any) => {
+        const result = await handler({ req, props });
+        return result.response;
+      },
+  };
+});
+
+vi.mock("./lib/response", () => ({
+  getResponseIdByDisplayId: vi.fn(),
+}));
+
+describe("GET /api/v1/client/[environmentId]/displays/[displayId]/response", () => {
+  const req = new NextRequest("http://localhost/api/v1/client/env/displays/display/response");
+  const props = {
+    params: Promise.resolve({
+      environmentId: "env1234567890123456789012",
+      displayId: "display1234567890123456789",
+    }),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns the responseId when a linked response exists", async () => {
+    vi.mocked(getResponseIdByDisplayId).mockResolvedValue({ responseId: "response123456789012345678" });
+
+    const response = await GET(req, props);
+
+    expect(response.status).toBe(200);
+    await expect(response.json()).resolves.toEqual({
+      data: {
+        responseId: "response123456789012345678",
+      },
+    });
+  });
+
+  test("returns null when the display exists without a response", async () => {
+    vi.mocked(getResponseIdByDisplayId).mockResolvedValue({ responseId: null });
+
+    const response = await GET(req, props);
+
+    expect(response.status).toBe(200);
+    await expect(response.json()).resolves.toEqual({
+      data: {
+        responseId: null,
+      },
+    });
+  });
+
+  test("returns 404 when the display is missing for the environment", async () => {
+    vi.mocked(getResponseIdByDisplayId).mockRejectedValue(
+      new ResourceNotFoundError("Display", "display1234567890123456789")
+    );
+
+    const response = await GET(req, props);
+
+    expect(response.status).toBe(404);
+  });
+});

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

@@ -0,0 +1,40 @@
+import { logger } from "@formbricks/logger";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { responses } from "@/app/lib/api/response";
+import { THandlerParams, withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
+import { getResponseIdByDisplayId } from "./lib/response";
+
+export const OPTIONS = async (): Promise<Response> => {
+  return responses.successResponse({}, true);
+};
+
+export const GET = withV1ApiWrapper({
+  handler: async ({
+    req,
+    props,
+  }: THandlerParams<{ params: Promise<{ environmentId: string; displayId: string }> }>) => {
+    const params = await props.params;
+
+    try {
+      const response = await getResponseIdByDisplayId(params.environmentId, params.displayId);
+
+      return {
+        response: responses.successResponse(response, true),
+      };
+    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        return {
+          response: responses.notFoundResponse("Display", params.displayId, true),
+        };
+      }
+
+      logger.error(
+        { error, url: req.url, environmentId: params.environmentId, displayId: params.displayId },
+        "Error in GET /api/v1/client/[environmentId]/displays/[displayId]/response"
+      );
+      return {
+        response: responses.internalServerErrorResponse("Something went wrong. Please try again."),
+      };
+    }
+  },
+});

apps/web/lib/utils/safe-identifier.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { isSafeIdentifier } from "./safe-identifier";
+import { isSafeIdentifier, toSafeIdentifier } from "./safe-identifier";
 
 describe("safe-identifier", () => {
   describe("isSafeIdentifier", () => {
@@ -32,4 +32,23 @@ describe("safe-identifier", () => {
       expect(isSafeIdentifier("")).toBe(false);
     });
   });
+
+  describe("toSafeIdentifier", () => {
+    test("normalizes free-form labels into safe identifiers", () => {
+      expect(toSafeIdentifier("Date of Birth")).toBe("date_of_birth");
+      expect(toSafeIdentifier("Customer-ID")).toBe("customer_id");
+      expect(toSafeIdentifier("  Preferred Language  ")).toBe("preferred_language");
+      expect(toSafeIdentifier("city__name")).toBe("city_name");
+    });
+
+    test("strips invalid leading characters until first lowercase letter", () => {
+      expect(toSafeIdentifier("123 Date")).toBe("date");
+      expect(toSafeIdentifier("__name")).toBe("name");
+      expect(toSafeIdentifier("99")).toBe("");
+    });
+
+    test("keeps already safe identifiers unchanged", () => {
+      expect(toSafeIdentifier("country_code")).toBe("country_code");
+    });
+  });
 });

apps/web/lib/utils/safe-identifier.ts

@@ -12,6 +12,44 @@ export const isSafeIdentifier = (value: string): boolean => {
   return /^[a-z0-9_]+$/.test(value);
 };
 
+/**
+ * Converts a free-form string to a safe identifier candidate.
+ * The output only contains lowercase letters, numbers, and underscores.
+ * It also ensures the identifier starts with a lowercase letter by stripping invalid leading chars.
+ */
+export const toSafeIdentifier = (value: string): string => {
+  const normalized = value.trim().toLowerCase();
+  let safeIdentifier = "";
+  let shouldInsertUnderscore = false;
+
+  for (const char of normalized) {
+    const isLowercaseLetter = char >= "a" && char <= "z";
+    const isDigit = char >= "0" && char <= "9";
+
+    if (isLowercaseLetter || isDigit) {
+      if (shouldInsertUnderscore && safeIdentifier.length > 0) {
+        safeIdentifier += "_";
+      }
+      safeIdentifier += char;
+      shouldInsertUnderscore = false;
+      continue;
+    }
+
+    if (safeIdentifier.length > 0) {
+      shouldInsertUnderscore = true;
+    }
+  }
+
+  for (let i = 0; i < safeIdentifier.length; i++) {
+    const char = safeIdentifier[i];
+    if (char >= "a" && char <= "z") {
+      return safeIdentifier.slice(i);
+    }
+  }
+
+  return "";
+};
+
 /**
  * Converts a snake_case string to Title Case for display as a label.
  * Example: "job_description" -> "Job Description"