-
-
- {!csvResponse.length ? (
-
-
-
- ) : (
-
-
- {t("environments.contacts.upload_contacts_modal_preview")}
-
-
-
-
-
- )}
-
- {!csvResponse.length && (
-
-
-
- )}
-
-
- {csvResponse.length > 0 ? (
-
-
- {t("environments.contacts.upload_contacts_modal_attributes_title")}
-
-
- {t("environments.contacts.upload_contacts_modal_attributes_description")}
-
+
-
-
-
+
{csvResponse.length > 0 ? (
) : null}
-
-
-
+
+
+
);
};
diff --git a/apps/web/modules/ee/contacts/lib/contact-survey-link.test.ts b/apps/web/modules/ee/contacts/lib/contact-survey-link.test.ts
index e84f6b34a3..bbba2228ce 100644
--- a/apps/web/modules/ee/contacts/lib/contact-survey-link.test.ts
+++ b/apps/web/modules/ee/contacts/lib/contact-survey-link.test.ts
@@ -10,6 +10,12 @@ vi.mock("jsonwebtoken", () => ({
default: {
sign: vi.fn(),
verify: vi.fn(),
+ TokenExpiredError: class TokenExpiredError extends Error {
+ constructor(message: string) {
+ super(message);
+ this.name = "TokenExpiredError";
+ }
+ },
},
}));
@@ -145,8 +151,8 @@ describe("Contact Survey Link", () => {
if (!result.ok) {
expect(result.error).toEqual({
type: "bad_request",
- message: "Invalid or expired survey token",
- details: [{ field: "token", issue: "Invalid or expired survey token" }],
+ message: "Invalid survey token",
+ details: [{ field: "token", issue: "invalid_token" }],
});
}
});
@@ -166,8 +172,8 @@ describe("Contact Survey Link", () => {
if (!result.ok) {
expect(result.error).toEqual({
type: "bad_request",
- message: "Invalid or expired survey token",
- details: [{ field: "token", issue: "Invalid or expired survey token" }],
+ message: "Invalid survey token",
+ details: [{ field: "token", issue: "invalid_token" }],
});
}
});
diff --git a/apps/web/modules/ee/contacts/lib/contact-survey-link.ts b/apps/web/modules/ee/contacts/lib/contact-survey-link.ts
index 0caf191b11..30cd4204df 100644
--- a/apps/web/modules/ee/contacts/lib/contact-survey-link.ts
+++ b/apps/web/modules/ee/contacts/lib/contact-survey-link.ts
@@ -3,6 +3,7 @@ import { symmetricDecrypt, symmetricEncrypt } from "@/lib/crypto";
import { getPublicDomain } from "@/lib/getPublicUrl";
import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
import jwt from "jsonwebtoken";
+import { logger } from "@formbricks/logger";
import { Result, err, ok } from "@formbricks/types/error-handlers";
// Creates an encrypted personalized survey link for a contact
@@ -73,11 +74,22 @@ export const verifyContactSurveyToken = (
surveyId,
});
} catch (error) {
- console.error("Error verifying contact survey token:", error);
+ logger.error("Error verifying contact survey token:", error);
+
+ // Check if the error is specifically a JWT expiration error
+ if (error instanceof jwt.TokenExpiredError) {
+ return err({
+ type: "bad_request",
+ message: "Survey link has expired",
+ details: [{ field: "token", issue: "token_expired" }],
+ });
+ }
+
+ // Handle other JWT errors or general validation errors
return err({
type: "bad_request",
- message: "Invalid or expired survey token",
- details: [{ field: "token", issue: "Invalid or expired survey token" }],
+ message: "Invalid survey token",
+ details: [{ field: "token", issue: "invalid_token" }],
});
}
};
diff --git a/apps/web/modules/ee/contacts/lib/contacts.test.ts b/apps/web/modules/ee/contacts/lib/contacts.test.ts
index d4796ee099..b32374a844 100644
--- a/apps/web/modules/ee/contacts/lib/contacts.test.ts
+++ b/apps/web/modules/ee/contacts/lib/contacts.test.ts
@@ -6,10 +6,31 @@ import {
buildContactWhereClause,
createContactsFromCSV,
deleteContact,
+ generatePersonalLinks,
getContact,
getContacts,
+ getContactsInSegment,
} from "./contacts";
+// Mock additional dependencies for the new functions
+vi.mock("@/modules/ee/contacts/segments/lib/segments", () => ({
+ getSegment: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/contacts/segments/lib/filter/prisma-query", () => ({
+ segmentFilterToPrismaQuery: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/contacts/lib/contact-survey-link", () => ({
+ getContactSurveyLink: vi.fn(),
+}));
+
+vi.mock("@formbricks/logger", () => ({
+ logger: {
+ error: vi.fn(),
+ },
+}));
+
vi.mock("@formbricks/database", () => ({
prisma: {
contact: {
@@ -31,11 +52,18 @@ vi.mock("@formbricks/database", () => ({
},
},
}));
-vi.mock("@/lib/constants", () => ({ ITEMS_PER_PAGE: 2 }));
+vi.mock("@/lib/constants", () => ({
+ ITEMS_PER_PAGE: 2,
+ ENCRYPTION_KEY: "test-encryption-key-32-chars-long!",
+ IS_PRODUCTION: false,
+ IS_POSTHOG_CONFIGURED: false,
+ POSTHOG_API_HOST: "test-posthog-host",
+ POSTHOG_API_KEY: "test-posthog-key",
+}));
-const environmentId = "env1";
-const contactId = "contact1";
-const userId = "user1";
+const environmentId = "cm123456789012345678901237";
+const contactId = "cm123456789012345678901238";
+const userId = "cm123456789012345678901239";
const mockContact: Contact & {
attributes: { value: string; attributeKey: { key: string; name: string } }[];
} = {
@@ -159,7 +187,7 @@ describe("createContactsFromCSV", () => {
.mockResolvedValueOnce([
{ key: "email", id: "id-email" },
{ key: "name", id: "id-name" },
- ]);
+ ] as any);
vi.mocked(prisma.contactAttributeKey.createMany).mockResolvedValue({ count: 2 });
vi.mocked(prisma.contact.create).mockResolvedValue({
id: "c1",
@@ -183,12 +211,12 @@ describe("createContactsFromCSV", () => {
test("skips duplicate contact with 'skip' action", async () => {
vi.mocked(prisma.contact.findMany).mockResolvedValue([
{ id: "c1", attributes: [{ attributeKey: { key: "email" }, value: "john@example.com" }] },
- ]);
+ ] as any);
vi.mocked(prisma.contactAttribute.findMany).mockResolvedValue([]);
vi.mocked(prisma.contactAttributeKey.findMany).mockResolvedValue([
{ key: "email", id: "id-email" },
{ key: "name", id: "id-name" },
- ]);
+ ] as any);
const csvData = [{ email: "john@example.com", name: "John" }];
const result = await createContactsFromCSV(csvData, environmentId, "skip", {
email: "email",
@@ -206,12 +234,12 @@ describe("createContactsFromCSV", () => {
{ attributeKey: { key: "name" }, value: "Old" },
],
},
- ]);
+ ] as any);
vi.mocked(prisma.contactAttribute.findMany).mockResolvedValue([]);
vi.mocked(prisma.contactAttributeKey.findMany).mockResolvedValue([
{ key: "email", id: "id-email" },
{ key: "name", id: "id-name" },
- ]);
+ ] as any);
vi.mocked(prisma.contact.update).mockResolvedValue({
id: "c1",
environmentId,
@@ -239,12 +267,12 @@ describe("createContactsFromCSV", () => {
{ attributeKey: { key: "name" }, value: "Old" },
],
},
- ]);
+ ] as any);
vi.mocked(prisma.contactAttribute.findMany).mockResolvedValue([]);
vi.mocked(prisma.contactAttributeKey.findMany).mockResolvedValue([
{ key: "email", id: "id-email" },
{ key: "name", id: "id-name" },
- ]);
+ ] as any);
vi.mocked(prisma.contactAttribute.deleteMany).mockResolvedValue({ count: 2 });
vi.mocked(prisma.contact.update).mockResolvedValue({
id: "c1",
@@ -326,8 +354,333 @@ describe("buildContactWhereClause", () => {
});
test("returns where clause without search", () => {
- const environmentId = "env-1";
+ const environmentId = "cm123456789012345678901240";
const result = buildContactWhereClause(environmentId);
expect(result).toEqual({ environmentId });
});
});
+
+describe("getContactsInSegment", () => {
+ const mockSegmentId = "cm123456789012345678901235";
+ const mockEnvironmentId = "cm123456789012345678901236";
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ test("returns contacts when segment and filters are valid", async () => {
+ const mockSegment = {
+ id: mockSegmentId,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ environmentId: mockEnvironmentId,
+ description: "Test segment",
+ title: "Test Segment",
+ isPrivate: false,
+ surveys: [],
+ filters: [],
+ };
+
+ const mockContacts = [
+ {
+ id: "contact-1",
+ attributes: [
+ { attributeKey: { key: "email" }, value: "test@example.com" },
+ { attributeKey: { key: "name" }, value: "Test User" },
+ ],
+ },
+ {
+ id: "contact-2",
+ attributes: [
+ { attributeKey: { key: "email" }, value: "another@example.com" },
+ { attributeKey: { key: "name" }, value: "Another User" },
+ ],
+ },
+ ] as any;
+
+ const mockWhereClause = {
+ environmentId: mockEnvironmentId,
+ attributes: {
+ some: {
+ attributeKey: { key: "email" },
+ value: "test@example.com",
+ },
+ },
+ };
+
+ // Mock the dependencies
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+ const { segmentFilterToPrismaQuery } = await import(
+ "@/modules/ee/contacts/segments/lib/filter/prisma-query"
+ );
+
+ vi.mocked(getSegment).mockResolvedValue(mockSegment);
+
+ vi.mocked(segmentFilterToPrismaQuery).mockResolvedValue({
+ ok: true,
+ data: { whereClause: mockWhereClause },
+ } as any);
+
+ vi.mocked(prisma.contact.findMany).mockResolvedValue(mockContacts);
+
+ const result = await getContactsInSegment(mockSegmentId);
+
+ expect(result).toEqual([
+ {
+ contactId: "contact-1",
+ attributes: {
+ email: "test@example.com",
+ name: "Test User",
+ },
+ },
+ {
+ contactId: "contact-2",
+ attributes: {
+ email: "another@example.com",
+ name: "Another User",
+ },
+ },
+ ]);
+
+ expect(prisma.contact.findMany).toHaveBeenCalledWith({
+ where: mockWhereClause,
+ select: {
+ id: true,
+ attributes: {
+ where: {
+ attributeKey: {
+ key: {
+ in: ["userId", "firstName", "lastName", "email"],
+ },
+ },
+ },
+ select: {
+ attributeKey: {
+ select: {
+ key: true,
+ },
+ },
+ value: true,
+ },
+ },
+ },
+ orderBy: {
+ createdAt: "desc",
+ },
+ });
+ });
+
+ test("returns null when segment is not found", async () => {
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+
+ vi.mocked(getSegment).mockRejectedValue(new Error("Segment not found"));
+
+ const result = await getContactsInSegment(mockSegmentId);
+
+ expect(result).toBeNull();
+ });
+
+ test("returns null when segment filter to prisma query fails", async () => {
+ const mockSegment = {
+ id: mockSegmentId,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ environmentId: mockEnvironmentId,
+ description: "Test segment",
+ title: "Test Segment",
+ isPrivate: false,
+ surveys: [],
+ filters: [],
+ };
+
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+ const { segmentFilterToPrismaQuery } = await import(
+ "@/modules/ee/contacts/segments/lib/filter/prisma-query"
+ );
+
+ vi.mocked(getSegment).mockResolvedValue(mockSegment);
+
+ vi.mocked(segmentFilterToPrismaQuery).mockResolvedValue({
+ ok: false,
+ error: { type: "bad_request" },
+ } as any);
+
+ const result = await getContactsInSegment(mockSegmentId);
+
+ expect(result).toBeNull();
+ });
+
+ test("returns null when prisma query fails", async () => {
+ const mockSegment = {
+ id: mockSegmentId,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ environmentId: mockEnvironmentId,
+ description: "Test segment",
+ title: "Test Segment",
+ isPrivate: false,
+ surveys: [],
+ filters: [],
+ };
+
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+ const { segmentFilterToPrismaQuery } = await import(
+ "@/modules/ee/contacts/segments/lib/filter/prisma-query"
+ );
+
+ vi.mocked(getSegment).mockResolvedValue(mockSegment);
+
+ vi.mocked(segmentFilterToPrismaQuery).mockResolvedValue({
+ ok: true,
+ data: { whereClause: {} },
+ } as any);
+
+ vi.mocked(prisma.contact.findMany).mockRejectedValue(new Error("Database error"));
+
+ const result = await getContactsInSegment(mockSegmentId);
+
+ expect(result).toBeNull();
+ });
+
+ test("handles errors gracefully", async () => {
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+
+ vi.mocked(getSegment).mockRejectedValue(new Error("Database error"));
+
+ const result = await getContactsInSegment(mockSegmentId);
+
+ expect(result).toBeNull(); // The function catches errors and returns null
+ });
+});
+
+describe("generatePersonalLinks", () => {
+ const mockSurveyId = "cm123456789012345678901234"; // Valid CUID2 format
+ const mockSegmentId = "cm123456789012345678901235"; // Valid CUID2 format
+ const mockExpirationDays = 7;
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ test("returns null when getContactsInSegment fails", async () => {
+ // Mock getSegment to fail which will cause getContactsInSegment to return null
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+
+ vi.mocked(getSegment).mockRejectedValue(new Error("Segment not found"));
+
+ const result = await generatePersonalLinks(mockSurveyId, mockSegmentId);
+
+ expect(result).toBeNull();
+ });
+
+ test("returns empty array when no contacts in segment", async () => {
+ // Mock successful segment retrieval but no contacts
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+ const { segmentFilterToPrismaQuery } = await import(
+ "@/modules/ee/contacts/segments/lib/filter/prisma-query"
+ );
+
+ vi.mocked(getSegment).mockResolvedValue({
+ id: mockSegmentId,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ environmentId: "env-123",
+ description: "Test segment",
+ title: "Test Segment",
+ isPrivate: false,
+ surveys: [],
+ filters: [],
+ });
+
+ vi.mocked(segmentFilterToPrismaQuery).mockResolvedValue({
+ ok: true,
+ data: { whereClause: {} },
+ } as any);
+
+ vi.mocked(prisma.contact.findMany).mockResolvedValue([]);
+
+ const result = await generatePersonalLinks(mockSurveyId, mockSegmentId);
+
+ expect(result).toEqual([]);
+ });
+
+ test("generates personal links for contacts successfully", async () => {
+ // Mock all the dependencies that getContactsInSegment needs
+ const { getSegment } = await import("@/modules/ee/contacts/segments/lib/segments");
+ const { segmentFilterToPrismaQuery } = await import(
+ "@/modules/ee/contacts/segments/lib/filter/prisma-query"
+ );
+ const { getContactSurveyLink } = await import("@/modules/ee/contacts/lib/contact-survey-link");
+
+ vi.mocked(getSegment).mockResolvedValue({
+ id: mockSegmentId,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ environmentId: "env-123",
+ description: "Test segment",
+ title: "Test Segment",
+ isPrivate: false,
+ surveys: [],
+ filters: [],
+ });
+
+ vi.mocked(segmentFilterToPrismaQuery).mockResolvedValue({
+ ok: true,
+ data: { whereClause: {} },
+ } as any);
+
+ vi.mocked(prisma.contact.findMany).mockResolvedValue([
+ {
+ id: "contact-1",
+ attributes: [
+ { attributeKey: { key: "email" }, value: "test@example.com" },
+ { attributeKey: { key: "name" }, value: "Test User" },
+ ],
+ },
+ {
+ id: "contact-2",
+ attributes: [
+ { attributeKey: { key: "email" }, value: "another@example.com" },
+ { attributeKey: { key: "name" }, value: "Another User" },
+ ],
+ },
+ ] as any);
+
+ // Mock getContactSurveyLink to return successful results
+ vi.mocked(getContactSurveyLink)
+ .mockReturnValueOnce({
+ ok: true,
+ data: "https://example.com/survey/link1",
+ })
+ .mockReturnValueOnce({
+ ok: true,
+ data: "https://example.com/survey/link2",
+ });
+
+ const result = await generatePersonalLinks(mockSurveyId, mockSegmentId, mockExpirationDays);
+
+ expect(result).toEqual([
+ {
+ contactId: "contact-1",
+ attributes: {
+ email: "test@example.com",
+ name: "Test User",
+ },
+ surveyUrl: "https://example.com/survey/link1",
+ expirationDays: mockExpirationDays,
+ },
+ {
+ contactId: "contact-2",
+ attributes: {
+ email: "another@example.com",
+ name: "Another User",
+ },
+ surveyUrl: "https://example.com/survey/link2",
+ expirationDays: mockExpirationDays,
+ },
+ ]);
+
+ expect(getContactSurveyLink).toHaveBeenCalledWith("contact-1", mockSurveyId, mockExpirationDays);
+ expect(getContactSurveyLink).toHaveBeenCalledWith("contact-2", mockSurveyId, mockExpirationDays);
+ });
+});
diff --git a/apps/web/modules/ee/contacts/lib/contacts.ts b/apps/web/modules/ee/contacts/lib/contacts.ts
index 922c2f39b5..499a44b151 100644
--- a/apps/web/modules/ee/contacts/lib/contacts.ts
+++ b/apps/web/modules/ee/contacts/lib/contacts.ts
@@ -1,9 +1,13 @@
import "server-only";
import { ITEMS_PER_PAGE } from "@/lib/constants";
import { validateInputs } from "@/lib/utils/validate";
+import { getContactSurveyLink } from "@/modules/ee/contacts/lib/contact-survey-link";
+import { segmentFilterToPrismaQuery } from "@/modules/ee/contacts/segments/lib/filter/prisma-query";
+import { getSegment } from "@/modules/ee/contacts/segments/lib/segments";
import { Prisma } from "@prisma/client";
import { cache as reactCache } from "react";
import { prisma } from "@formbricks/database";
+import { logger } from "@formbricks/logger";
import { ZId, ZOptionalNumber, ZOptionalString } from "@formbricks/types/common";
import { DatabaseError, ValidationError } from "@formbricks/types/errors";
import {
@@ -15,6 +19,76 @@ import {
} from "../types/contact";
import { transformPrismaContact } from "./utils";
+export const getContactsInSegment = reactCache(async (segmentId: string) => {
+ try {
+ const segment = await getSegment(segmentId);
+
+ if (!segment) {
+ return null;
+ }
+
+ const segmentFilterToPrismaQueryResult = await segmentFilterToPrismaQuery(
+ segment.id,
+ segment.filters,
+ segment.environmentId
+ );
+
+ if (!segmentFilterToPrismaQueryResult.ok) {
+ return null;
+ }
+
+ const { whereClause } = segmentFilterToPrismaQueryResult.data;
+
+ const requiredAttributes = ["userId", "firstName", "lastName", "email"];
+
+ const contacts = await prisma.contact.findMany({
+ where: whereClause,
+ select: {
+ id: true,
+ attributes: {
+ where: {
+ attributeKey: {
+ key: {
+ in: requiredAttributes,
+ },
+ },
+ },
+ select: {
+ attributeKey: {
+ select: {
+ key: true,
+ },
+ },
+ value: true,
+ },
+ },
+ },
+ orderBy: {
+ createdAt: "desc",
+ },
+ });
+
+ const contactsWithAttributes = contacts.map((contact) => {
+ const attributes = contact.attributes.reduce(
+ (acc, attr) => {
+ acc[attr.attributeKey.key] = attr.value;
+ return acc;
+ },
+ {} as Record
+ );
+ return {
+ contactId: contact.id,
+ attributes,
+ };
+ });
+
+ return contactsWithAttributes;
+ } catch (error) {
+ logger.error(error, "Failed to get contacts in segment");
+ return null;
+ }
+});
+
const selectContact = {
id: true,
createdAt: true,
@@ -418,3 +492,37 @@ export const createContactsFromCSV = async (
throw error;
}
};
+
+export const generatePersonalLinks = async (surveyId: string, segmentId: string, expirationDays?: number) => {
+ const contactsResult = await getContactsInSegment(segmentId);
+
+ if (!contactsResult) {
+ return null;
+ }
+
+ // Generate survey links for each contact
+ const contactLinks = contactsResult
+ .map((contact) => {
+ const { contactId, attributes } = contact;
+
+ const surveyUrlResult = getContactSurveyLink(contactId, surveyId, expirationDays);
+
+ if (!surveyUrlResult.ok) {
+ logger.error(
+ { error: surveyUrlResult.error, contactId: contactId, surveyId: surveyId },
+ "Failed to generate survey URL for contact"
+ );
+ return null;
+ }
+
+ return {
+ contactId,
+ attributes,
+ surveyUrl: surveyUrlResult.data,
+ expirationDays,
+ };
+ })
+ .filter(Boolean);
+
+ return contactLinks;
+};
diff --git a/apps/web/modules/ee/contacts/segments/components/add-filter-modal.test.tsx b/apps/web/modules/ee/contacts/segments/components/add-filter-modal.test.tsx
index 9a7ca51583..65158153ce 100644
--- a/apps/web/modules/ee/contacts/segments/components/add-filter-modal.test.tsx
+++ b/apps/web/modules/ee/contacts/segments/components/add-filter-modal.test.tsx
@@ -6,47 +6,66 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
import { TSegment } from "@formbricks/types/segment";
-// Mock the Modal component
-vi.mock("@/modules/ui/components/modal", () => ({
- Modal: ({
+// Mock the Dialog components
+vi.mock("@/modules/ui/components/dialog", () => ({
+ Dialog: ({
children,
open,
- closeOnOutsideClick,
- setOpen,
+ onOpenChange,
}: {
children: React.ReactNode;
open: boolean;
- closeOnOutsideClick?: boolean;
- setOpen?: (open: boolean) => void;
- }) => {
- return open ? ( // NOSONAR // This is a mock
-
- ) : null; // NOSONAR // This is a mock
- },
+ onOpenChange: (open: boolean) => void;
+ }) =>
+ open ? (
+
+ {children}
+
+
+ ) : null,
+ DialogContent: ({
+ children,
+ className,
+ hideCloseButton,
+ }: {
+ children: React.ReactNode;
+ className?: string;
+ hideCloseButton?: boolean;
+ }) => (
+
+ {children}
+
+ ),
+ DialogHeader: ({ children }: { children: React.ReactNode }) => (
+ {children}
+ ),
+ DialogTitle: ({ children }: { children: React.ReactNode }) => (
+ {children}
+ ),
+ DialogBody: ({ children }: { children: React.ReactNode }) => (
+ {children}
+ ),
+}));
+
+// Mock the Input component
+vi.mock("@/modules/ui/components/input", () => ({
+ Input: ({ placeholder, onChange, autoFocus }: any) => (
+
+ ),
}));
// Mock the TabBar component
vi.mock("@/modules/ui/components/tab-bar", () => ({
- TabBar: ({
- tabs,
- activeId,
- setActiveId,
- }: {
- tabs: any[];
- activeId: string;
- setActiveId: (id: string) => void;
- }) => (
-
- {tabs.map((tab) => (
-