The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Fix missing links in `partner.enrolled` webhook (#3714)
Steven Tey39d156568054
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.tsindex df06ccd497..eb3a902692 100644--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts@@ -10,6 +10,7 @@ import { polyfillSocialMediaFields } from "@/lib/social-utils";import { PlanProps } from "@/lib/types";import { sendWorkspaceWebhook } from "@/lib/webhook/publish";import { EnrolledPartnerSchema } from "@/lib/zod/schemas/partners";+import { ProgramPartnerLinkSchema } from "@/lib/zod/schemas/programs";import { sendBatchEmail } from "@dub/email";import PartnerApplicationApproved from "@dub/email/templates/partner-application-approved";import { prisma } from "@dub/prisma";@@ -60,19 +61,26 @@ export const { POST } = serve<Payload>(workflowRunId: context.workflowRunId,});- const { program, partner, links, ...programEnrollment } =- await getProgramEnrollmentOrThrow({- programId,- partnerId,- include: {- program: true,- partner: true,- links: true,- },- });+ const {+ program,+ partner,+ links: existingPartnerLinks,+ ...programEnrollment+ } = await getProgramEnrollmentOrThrow({+ programId,+ partnerId,+ include: {+ program: true,+ partner: true,+ links: true,+ },+ });const { groupId } = programEnrollment;+ const allPartnerLinks =+ ProgramPartnerLinkSchema.array().parse(existingPartnerLinks);+// Step 1: Create partner default linksawait context.run("create-default-links", async () => {logger.info({@@ -105,8 +113,8 @@ export const { POST } = serve<Payload>(return;}- // Skip existing default links- for (const link of links) {+ // Skip existing default links (should never happen since it's a new partner, but just in case)+ for (const link of existingPartnerLinks) {if (link.partnerGroupDefaultLinkId) {partnerGroupDefaultLinks = partnerGroupDefaultLinks.filter((defaultLink) => defaultLink.id !== link.partnerGroupDefaultLinkId,@@ -156,6 +164,8 @@ export const { POST } = serve<Payload>(})),});+ allPartnerLinks.push(...partnerLinks);+return;});@@ -355,7 +365,7 @@ export const { POST } = serve<Payload>(...polyfillSocialMediaFields(partnerPlatforms),id: partner.id,status: programEnrollment.status,- links,+ links: allPartnerLinks,});const workspace = await prisma.project.findUniqueOrThrow({diff --git a/apps/web/lib/api/partners/create-partner-default-links.ts b/apps/web/lib/api/partners/create-partner-default-links.tsindex 0662470eaa..786f11f2a3 100644--- a/apps/web/lib/api/partners/create-partner-default-links.ts+++ b/apps/web/lib/api/partners/create-partner-default-links.ts@@ -89,6 +89,7 @@ export async function createPartnerDefaultLinks({).filter(isFulfilled).map(({ value }) => value);+return await bulkCreateLinks({links: processedLinks,skipRedisCache: true,diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.tsindex fa61078cef..ef4530f7ad 100644--- a/apps/web/lib/zod/schemas/partners.ts+++ b/apps/web/lib/zod/schemas/partners.ts@@ -1,3 +1,4 @@+import { processKey } from "@/lib/api/links/utils";import { MAX_PARTNERS_INVITES_PER_REQUEST } from "@/lib/constants/program";import {IdentityVerificationStatus,@@ -627,6 +628,12 @@ export const createPartnerSchema = z.object({.string().max(100).nullish()+ .refine(+ (v) => (v ? processKey({ domain: "d.to", key: v }) !== null : true),+ {+ message: "Invalid username. Must be a URL-friendly string.",+ },+ ).describe("The partner's unique username in your system (max 100 characters). This will be used to create a short link for the partner using your program's default domain. If not provided, Dub will try to generate a username from the partner's name or email.",),diff --git a/apps/web/tests/partners/create-partner.test.ts b/apps/web/tests/partners/create-partner.test.tsindex c1e5fc40fa..c27250c583 100644--- a/apps/web/tests/partners/create-partner.test.ts+++ b/apps/web/tests/partners/create-partner.test.ts@@ -1,6 +1,6 @@import { generateRandomName } from "@/lib/names";import { EnrolledPartnerSchema as EnrolledPartnerSchemaDate } from "@/lib/zod/schemas/partners";-import { Link, Partner } from "@dub/prisma/client";+import { Partner } from "@dub/prisma/client";import { R2_URL } from "@dub/utils";import slugify from "@sindresorhus/slugify";import { describe, expect, test } from "vitest";@@ -28,7 +28,7 @@ describe.sequential("POST /partners", async () => {groupId: E2E_PARTNER_GROUP.id,};- const { data, status } = await http.post<Link>({+ const { data, status } = await http.post<Partner>({path: "/partners",body: partner,});@@ -49,7 +49,7 @@ describe.sequential("POST /partners", async () => {country: "US",};- const { data, status } = await http.post<Link>({+ const { data, status } = await http.post<Partner>({path: "/partners",body: {...partner,@@ -77,7 +77,7 @@ describe.sequential("POST /partners", async () => {);});- test("with link props", async () => {+ test("with partner.username field", async () => {const username = randomId();const partner = {@@ -86,7 +86,7 @@ describe.sequential("POST /partners", async () => {groupId: E2E_PARTNER_GROUP.id,};- const { data, status } = await http.post<Link>({+ const { data, status } = await http.post<Partner>({path: "/partners",body: {username,@@ -119,6 +119,26 @@ describe.sequential("POST /partners", async () => {);});+ test("with invalid partner.username field", async () => {+ const { status, data } = await http.post<Partner>({+ path: "/partners",+ body: {+ email: randomPartnerEmail(),+ username: "invalid username",+ },+ });+ expect(status).toEqual(422);+ expect(data).toStrictEqual({+ error: {+ code: "unprocessable_entity",+ message:+ "custom: username: Invalid username. Must be a URL-friendly string.",+ doc_url:+ "https://dub.co/docs/api-reference/errors#unprocessable-entity",+ },+ });+ });+test("with linkProps.prefix on default link", async () => {const id = randomId();const email = `prefix-e2e-${id}@example.com`;@@ -127,7 +147,7 @@ describe.sequential("POST /partners", async () => {`^c/${reEscape(identitySlug)}(-[a-z0-9]{4})?$`,);- const { data, status } = await http.post<Link>({+ const { data, status } = await http.post<Partner>({path: "/partners",body: {email,