Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/reject-empty-network.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@agentcommercekit/ack-pay": patch
---

Reject an empty `network` on payment options when the field is present.
37 changes: 37 additions & 0 deletions packages/ack-pay/src/schemas/payment-option.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,40 @@ describe("paymentOptionSchema amount", () => {
},
)
})

describe.each([
[
"valibot",
(input: unknown) => v.safeParse(valibotPaymentOptionSchema, input).success,
],
["zod", (input: unknown) => zodPaymentOptionSchema.safeParse(input).success],
] as const)("%s paymentOptionSchema network", (_, accepts) => {
it("accepts a payment option with network omitted", () => {
expect(
accepts({
...paymentOption,
amount: 1,
}),
).toBe(true)
})

it("accepts a payment option with a non-empty network", () => {
expect(
accepts({
...paymentOption,
amount: 1,
network: "eip155:8453",
}),
).toBe(true)
})

it("rejects a payment option with an empty network", () => {
expect(
accepts({
...paymentOption,
amount: 1,
network: "",
}),
).toBe(false)
})
})
3 changes: 2 additions & 1 deletion packages/ack-pay/src/schemas/valibot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as v from "valibot"

const urlOrDidUri = v.union([v.pipe(v.string(), v.url()), didUriSchema])
const positiveIntegerString = v.pipe(v.string(), v.regex(/^[1-9]\d*$/))
const nonEmptyString = v.pipe(v.string(), v.minLength(1))

const timestampSchema = v.pipe(
v.union([v.date(), v.string()]),
Expand All @@ -20,7 +21,7 @@ export const paymentOptionSchema = v.object({
decimals: v.pipe(v.number(), v.integer(), v.toMinValue(0)),
currency: v.string(),
recipient: v.string(),
network: v.optional(v.string()),
network: v.optional(nonEmptyString),
paymentService: v.optional(urlOrDidUri),
receiptService: v.optional(urlOrDidUri),
})
Expand Down
2 changes: 1 addition & 1 deletion packages/ack-pay/src/schemas/zod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const paymentOptionSchema = z.object({
decimals: z.number().int().nonnegative(),
currency: z.string(),
recipient: z.string(),
network: z.string().optional(),
network: z.string().min(1).optional(),
paymentService: urlOrDidUri.optional(),
receiptService: urlOrDidUri.optional(),
})
Expand Down