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.

Return null for unrelated partners in network activity and scope webhook socials

Kiran Kd8bec83c49bd
diff --git a/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts b/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
index d2ea3dc4ba..115d5ebeaf 100644
--- a/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
+++ b/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
@@ -1,4 +1,3 @@
-import { DubApiError } from "@/lib/api/errors";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
@@ -40,10 +39,7 @@ export const GET = withWorkspace(
// Prevent fetching the network activity summary if the partner has neither applied to nor enrolled in the program
if (!programApplication && !programEnrollment) {
- throw new DubApiError({
- code: "not_found",
- message: `Partner ${partnerId} has not applied to or enrolled in program.`,
- });
+ return NextResponse.json(null);
}
const programEnrollments = await prisma.programEnrollment.groupBy({
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 39cd904380..8adb746bd6 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -19,6 +19,7 @@ import {
formatWebsiteAndSocialsFields,
} from "@/lib/partners/format-application-form-data";
import { prisma } from "@/lib/prisma";
+import { polyfillSocialMediaFields } from "@/lib/social-utils";
import {
ProgramApplicationFormData,
ProgramApplicationFormDataWithValues,
@@ -346,7 +347,6 @@ async function createApplicationAndEnrollment({
...partner,
...programEnrollment,
id: partner.id,
- ...formatWebsiteAndSocialsFields(application),
},
};
@@ -375,14 +375,26 @@ async function createApplicationAndEnrollment({
sendWorkspaceWebhook({
workspace,
trigger: "partner.application_submitted",
- data: partnerApplicationWebhookSchema.parse(webhookData),
+ data: partnerApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ ...formatWebsiteAndSocialsFields(application),
+ },
+ }),
}),
// Send "program_application.created" webhook
sendWorkspaceWebhook({
workspace,
trigger: "program_application.created",
- data: programApplicationWebhookSchema.parse(webhookData),
+ data: programApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ ...polyfillSocialMediaFields(partner.platforms),
+ },
+ }),
}),
// Detect and record fraud events for the partner when they apply to a program
diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.ts
index cb4906586f..73b906e726 100644
--- a/apps/web/lib/partners/complete-program-applications.ts
+++ b/apps/web/lib/partners/complete-program-applications.ts
@@ -8,7 +8,10 @@ import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-syn
import { markApplicationEventSubmitted } from "../application-events/update-application-event";
import { autoApprovePartnerJob } from "../jobs/handlers/auto-approve-partner-job";
import { autoRejectPartnerJob } from "../jobs/handlers/auto-reject-partner-job";
-import { buildSocialPlatformLookup } from "../social-utils";
+import {
+ buildSocialPlatformLookup,
+ polyfillSocialMediaFields,
+} from "../social-utils";
import { sendWorkspaceWebhook } from "../webhook/publish";
import {
partnerApplicationWebhookSchema,
@@ -226,7 +229,6 @@ export async function completeProgramApplications(userEmail: string) {
...programEnrollment,
id: partner.id,
status: "pending",
- ...formatWebsiteAndSocialsFields(application),
},
};
@@ -258,7 +260,13 @@ export async function completeProgramApplications(userEmail: string) {
sendWorkspaceWebhook({
workspace: workspacesByProgramId.get(program.id)!,
trigger: "partner.application_submitted",
- data: partnerApplicationWebhookSchema.parse(webhookData),
+ data: partnerApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ ...formatWebsiteAndSocialsFields(application),
+ },
+ }),
}),
// Send "program_application.created" webhook
@@ -266,7 +274,13 @@ export async function completeProgramApplications(userEmail: string) {
sendWorkspaceWebhook({
workspace: workspacesByProgramId.get(program.id)!,
trigger: "program_application.created",
- data: programApplicationWebhookSchema.parse(webhookData),
+ data: programApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ ...polyfillSocialMediaFields(partner.platforms),
+ },
+ }),
}),
]
: [
diff --git a/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx b/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
index 1fcc003c2b..c96f99af9b 100644
--- a/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
+++ b/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
@@ -23,7 +23,7 @@ function usePartnerNetworkActivitySummary(
const { id: workspaceId, error: workspaceError } = useWorkspace();
const { data, error, isLoading } = useSWR<
- NetworkActivitySummary,
+ NetworkActivitySummary | null,
Error & { status: number }
>(
workspaceId &&
@@ -36,9 +36,9 @@ function usePartnerNetworkActivitySummary(
},
);
- const isUnrelatedPartner = error?.status === 404;
+ const isUnrelatedPartner = !error && data === null;
- // A partner with neither an application nor an enrollment in the program 404s. Missing data here is an empty result, not a request still loading.
+ // A partner with neither an application nor an enrollment in the program returns null. Missing data here is an empty result, not a request still loading.
if (!partnerId || isUnrelatedPartner) {
return {
status: "empty",