Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Ignore AND/OR inside quoted commission metadata filter values.

Kiran K19b4d9452fa6
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index 128f17dd38..874b6ad53d 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -21,7 +21,7 @@ type CommissionsFilters = Omit<
fraudEventGroupId?: string;
};
-const commissionIncludes: Prisma.CommissionInclude = {
+const commissionIncludes = {
customer: true,
partner: true,
programEnrollment: true,
@@ -30,7 +30,7 @@ const commissionIncludes: Prisma.CommissionInclude = {
paidAt: true,
},
},
-};
+} satisfies Prisma.CommissionInclude;
export async function getCommissions(filters: CommissionsFilters) {
const {
diff --git a/apps/web/lib/api/commissions/metadata-filters.ts b/apps/web/lib/api/commissions/metadata-filters.ts
index c1a77ed429..7a02220b02 100644
--- a/apps/web/lib/api/commissions/metadata-filters.ts
+++ b/apps/web/lib/api/commissions/metadata-filters.ts
@@ -82,6 +82,30 @@ function parseCondition(condition: string): CommissionMetadataFilter {
};
}
+/** Mask quoted segments so AND/OR inside values are not treated as connectives. */
+function maskQuotedSegments(query: string): string {
+ return query.replace(/'[^']*'|"[^"]*"/g, (match) =>
+ "\u0000".repeat(match.length),
+ );
+}
+
+/** Split on AND/OR outside quotes by finding connectives on a masked copy. */
+function splitConditionsOutsideQuotes(query: string): string[] {
+ const masked = maskQuotedSegments(query);
+ const connective = /\s+(?:and|or)\s+/gi;
+ const conditions: string[] = [];
+ let lastIndex = 0;
+
+ for (const match of masked.matchAll(connective)) {
+ const start = match.index ?? 0;
+ conditions.push(query.slice(lastIndex, start));
+ lastIndex = start + match[0].length;
+ }
+
+ conditions.push(query.slice(lastIndex));
+ return conditions;
+}
+
export function parseCommissionMetadataQuery(
query: string | undefined,
): ParsedCommissionMetadataQuery | undefined {
@@ -90,16 +114,17 @@ export function parseCommissionMetadataQuery(
}
const trimmed = query.trim();
+ const masked = maskQuotedSegments(trimmed);
- if (/\s+(?:and|or)\s*$/i.test(trimmed)) {
+ if (/\s+(?:and|or)\s*$/i.test(masked)) {
throw new DubApiError({
code: "unprocessable_entity",
message: "Invalid metadata query.",
});
}
- const hasAnd = /\s+and\s+/i.test(trimmed);
- const hasOr = /\s+or\s+/i.test(trimmed);
+ const hasAnd = /\s+and\s+/i.test(masked);
+ const hasOr = /\s+or\s+/i.test(masked);
if (hasAnd && hasOr) {
throw new DubApiError({
@@ -109,7 +134,7 @@ export function parseCommissionMetadataQuery(
}
const logic: "AND" | "OR" = hasOr ? "OR" : "AND";
- const conditions = trimmed.split(/\s+(?:and|or)\s+/i);
+ const conditions = splitConditionsOutsideQuotes(trimmed);
const filters: CommissionMetadataFilter[] = [];
for (const condition of conditions) {
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.ts
index fc38f969fd..329194a563 100644
--- a/apps/web/lib/zod/schemas/commissions.ts
+++ b/apps/web/lib/zod/schemas/commissions.ts
@@ -214,7 +214,7 @@ export const getCommissionsQuerySchema = z
.optional()
.meta({
description:
- "Filter by lead or sale event metadata. Top-level keys only.",
+ "Filter by lead or sale event metadata. Top-level keys only. Compares string values only — numeric and boolean metadata values are not matched.",
examples: [
"metadata['key']='value'",
"metadata['key']!='value'",
diff --git a/apps/web/playwright/api/commissions/commissions-create.spec.ts b/apps/web/playwright/api/commissions/commissions-create.spec.ts
index 137fedb963..e03e044804 100644
--- a/apps/web/playwright/api/commissions/commissions-create.spec.ts
+++ b/apps/web/playwright/api/commissions/commissions-create.spec.ts
@@ -403,41 +403,34 @@ test.describe("Sale commissions", () => {
test("converts nested sale.currency to USD", async ({ api, program }) => {
const invoiceId = `INV_${nanoid()}`;
- const previousEurRate = await redis.hget("fxRates:usd", "EUR");
+ const eurRate = await redis.hget("fxRates:usd", "EUR");
+ test.skip(!eurRate, "EUR FX rate not available in Redis");
- try {
- await redis.hset("fxRates:usd", { EUR: 2 });
+ const expectedAmount = Math.round(10000 / Number(eurRate));
- await withCommissionPartner(api, program, async (partnerId) => {
- expect(
- await api.post("/api/commissions", {
- type: "sale",
- partnerId,
- sale: {
- amount: 10000,
- currency: "eur",
- invoiceId,
- },
- customer: customerBody(),
- }),
- ).toEqual(expectedQueuedResponse);
-
- await expectCommissionCreated({
- api,
- partnerId,
- programId: program.id,
+ await withCommissionPartner(api, program, async (partnerId) => {
+ expect(
+ await api.post("/api/commissions", {
type: "sale",
- invoiceId,
- expectedAmount: 5000,
- });
+ partnerId,
+ sale: {
+ amount: 10000,
+ currency: "eur",
+ invoiceId,
+ },
+ customer: customerBody(),
+ }),
+ ).toEqual(expectedQueuedResponse);
+
+ await expectCommissionCreated({
+ api,
+ partnerId,
+ programId: program.id,
+ type: "sale",
+ invoiceId,
+ expectedAmount,
});
- } finally {
- if (previousEurRate == null) {
- await redis.hdel("fxRates:usd", "EUR");
- } else {
- await redis.hset("fxRates:usd", { EUR: previousEurRate });
- }
- }
+ });
});
test("supports deprecated sale fields", async ({ api, program }) => {
diff --git a/apps/web/playwright/api/fixtures.ts b/apps/web/playwright/api/fixtures.ts
index 121d3f7a2d..9737a65e6a 100644
--- a/apps/web/playwright/api/fixtures.ts
+++ b/apps/web/playwright/api/fixtures.ts
@@ -16,6 +16,12 @@ export type ApiClient = {
delete: <T>(url: string) => Promise<ApiResponse<T>>;
};
+type WorkerFixtures = {
+ api: ApiClient;
+ workspace: { id: string; slug: string };
+ program: { id: string; defaultGroupId: string };
+};
+
function loadApiAuth() {
return JSON.parse(readFileSync(authFile, "utf-8")) as {
token: string;
@@ -47,36 +53,38 @@ function createApiClient(request: APIRequestContext): ApiClient {
};
}
-export const test = base.extend<{
- api: ApiClient;
- workspace: { id: string; slug: string };
- program: { id: string; defaultGroupId: string };
-}>({
- // Authenticated API request context (token from globalSetup → .auth/api.json).
- request: async ({ playwright, baseURL }, use) => {
- const { token } = loadApiAuth();
- const context = await playwright.request.newContext({
- baseURL,
- extraHTTPHeaders: {
- Authorization: `Bearer ${token}`,
- "Content-Type": "application/json",
- },
- });
- await use(context);
- await context.dispose();
- },
-
- api: async ({ request }, use) => {
- await use(createApiClient(request));
- },
+export const test = base.extend<{}, WorkerFixtures>({
+ // Authenticated API client (token from globalSetup → .auth/api.json).
+ // Worker-scoped so beforeAll hooks can use api/program (Playwright rejects test-scoped fixtures there).
+ api: [
+ async ({ playwright }, use, workerInfo) => {
+ const { token } = loadApiAuth();
+ const context = await playwright.request.newContext({
+ baseURL: workerInfo.project.use.baseURL,
+ extraHTTPHeaders: {
+ Authorization: `Bearer ${token}`,
+ "Content-Type": "application/json",
+ },
+ });
+ await use(createApiClient(context));
+ await context.dispose();
+ },
+ { scope: "worker" },
+ ],
- workspace: async ({}, use) => {
- const { workspaceId, workspaceSlug } = loadApiAuth();
- await use({ id: workspaceId, slug: workspaceSlug });
- },
+ workspace: [
+ async ({}, use) => {
+ const { workspaceId, workspaceSlug } = loadApiAuth();
+ await use({ id: workspaceId, slug: workspaceSlug });
+ },
+ { scope: "worker" },
+ ],
- program: async ({}, use) => {
- const { programId, defaultGroupId } = loadApiAuth();
- await use({ id: programId, defaultGroupId });
- },
+ program: [
+ async ({}, use) => {
+ const { programId, defaultGroupId } = loadApiAuth();
+ await use({ id: programId, defaultGroupId });
+ },
+ { scope: "worker" },
+ ],
});
diff --git a/apps/web/tests/commissions/metadata-filters.test.ts b/apps/web/tests/commissions/metadata-filters.test.ts
index b23066631d..b48592fff9 100644
--- a/apps/web/tests/commissions/metadata-filters.test.ts
+++ b/apps/web/tests/commissions/metadata-filters.test.ts
@@ -63,6 +63,46 @@ describe("parseCommissionMetadataQuery", () => {
});
});
+ it("keeps and/or inside quoted values as part of a single condition", () => {
+ expect(
+ parseCommissionMetadataQuery("metadata['name']='Smith and Jones'"),
+ ).toEqual({
+ logic: "AND",
+ filters: [{ key: "name", op: "equals", value: "Smith and Jones" }],
+ });
+ expect(parseCommissionMetadataQuery("metadata['label']=\"A or B\"")).toEqual(
+ {
+ logic: "AND",
+ filters: [{ key: "label", op: "equals", value: "A or B" }],
+ },
+ );
+ });
+
+ it("parses AND/OR when a quoted value contains and/or", () => {
+ expect(
+ parseCommissionMetadataQuery(
+ "metadata['name']='Smith and Jones' AND metadata['plan']='pro'",
+ ),
+ ).toEqual({
+ logic: "AND",
+ filters: [
+ { key: "name", op: "equals", value: "Smith and Jones" },
+ { key: "plan", op: "equals", value: "pro" },
+ ],
+ });
+ expect(
+ parseCommissionMetadataQuery(
+ "metadata['label']=\"A or B\" OR metadata['plan']='enterprise'",
+ ),
+ ).toEqual({
+ logic: "OR",
+ filters: [
+ { key: "label", op: "equals", value: "A or B" },
+ { key: "plan", op: "equals", value: "enterprise" },
+ ],
+ });
+ });
+
it("rejects nested metadata keys", () => {
expect(() =>
parseCommissionMetadataQuery("metadata['a']['b']='value'"),
@@ -80,13 +120,11 @@ describe("parseCommissionMetadataQuery", () => {
parseCommissionMetadataQuery("metadata['a.b']='value'"),
).toThrow(DubApiError);
- try {
- parseCommissionMetadataQuery("metadata['order-id']='123'");
- } catch (error) {
- expect((error as DubApiError).message).toBe(
- "Invalid metadata query. Metadata keys may only contain letters, numbers, and underscores.",
- );
- }
+ expect(() =>
+ parseCommissionMetadataQuery("metadata['order-id']='123'"),
+ ).toThrow(
+ "Invalid metadata query. Metadata keys may only contain letters, numbers, and underscores.",
+ );
});
it("rejects mixed AND and OR", () => {