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.

Apply metadata query on invoiceId lookup and clarify invalid key errors.

Kiran Kd00672b2ee43
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index 0e820e404f..128f17dd38 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -53,12 +53,17 @@ export async function getCommissions(filters: CommissionsFilters) {
query,
} = filters;
+ // Metadata filter
+ const parsedMetadataQuery = parseCommissionMetadataQuery(query);
+ const metadataWhere = buildCommissionMetadataWhere(parsedMetadataQuery);
+
// InvoiceId is unique within a program
if (invoiceId) {
return await prisma.commission.findMany({
where: {
invoiceId,
programId,
+ ...metadataWhere,
},
include: {
...commissionIncludes,
@@ -159,10 +164,6 @@ export async function getCommissions(filters: CommissionsFilters) {
}),
};
- // Metadata filter
- const parsedMetadataQuery = parseCommissionMetadataQuery(query);
- const metadataWhere = buildCommissionMetadataWhere(parsedMetadataQuery);
-
return await prisma.commission.findMany({
where: {
earnings: {
diff --git a/apps/web/lib/api/commissions/metadata-filters.ts b/apps/web/lib/api/commissions/metadata-filters.ts
index f42b5d234a..2e137e68cf 100644
--- a/apps/web/lib/api/commissions/metadata-filters.ts
+++ b/apps/web/lib/api/commissions/metadata-filters.ts
@@ -38,6 +38,18 @@ function parseCondition(condition: string): CommissionMetadataFilter {
);
if (!match) {
+ const invalidKeyMatch = condition.match(
+ /^metadata\[['"]([^'"]+)['"]\]\s*(!=|>=|<=|:|=|>|<)\s*(.+)$/,
+ );
+
+ if (invalidKeyMatch && !/^[A-Za-z0-9_]+$/.test(invalidKeyMatch[1])) {
+ throw new DubApiError({
+ code: "unprocessable_entity",
+ message:
+ "Invalid metadata query. Metadata keys may only contain letters, numbers, and underscores.",
+ });
+ }
+
throw new DubApiError({
code: "unprocessable_entity",
message:
diff --git a/apps/web/tests/commissions/metadata-filters.test.ts b/apps/web/tests/commissions/metadata-filters.test.ts
index 03a23fae2d..2e760ff461 100644
--- a/apps/web/tests/commissions/metadata-filters.test.ts
+++ b/apps/web/tests/commissions/metadata-filters.test.ts
@@ -75,10 +75,18 @@ describe("parseCommissionMetadataQuery", () => {
}
});
- it("rejects dotted metadata keys", () => {
+ it("rejects dotted metadata keys with a charset message", () => {
expect(() =>
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.",
+ );
+ }
});
it("rejects mixed AND and OR", () => {