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.

Merge branch 'main' into program-application-reapply-group

Kiran Kf1351f37ec21
diff --cc apps/web/app/(ee)/api/program-applications/approve/route.ts
index 0000000000,9872802089..a6014c837e
mode 000000,100644..100644
--- a/apps/web/app/(ee)/api/program-applications/approve/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/approve/route.ts
@@@ -1,0 -1,32 +1,32 @@@
+ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+ import { parseRequestBody } from "@/lib/api/utils";
+ import { withWorkspace } from "@/lib/auth";
+ import { approveProgramApplication } from "@/lib/program-applications/approve-program-application";
+ import { approveProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
+ import { NextResponse } from "next/server";
+
+ // POST /api/program-applications/approve – Approve a pending partner
+ export const POST = withWorkspace(
+ async ({ workspace, req, session }) => {
- const { partnerId, groupId } = approveProgramApplicationSchema.parse(
- await parseRequestBody(req),
- );
++ const { partnerId, groupId, applicationId } =
++ approveProgramApplicationSchema.parse(await parseRequestBody(req));
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ await approveProgramApplication({
+ programId,
+ partnerId,
+ groupId,
++ applicationId,
+ userId: session.user.id,
+ });
+
+ return NextResponse.json({
+ partnerId,
+ });
+ },
+ {
+ requiredPlan: ["business", "advanced", "enterprise"],
+ requiredRoles: ["owner", "member"],
+ },
+ );
diff --cc apps/web/app/(ee)/api/program-applications/reject/route.ts
index 0000000000,8f23843bfe..235c28dcb2
mode 000000,100644..100644
--- a/apps/web/app/(ee)/api/program-applications/reject/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/reject/route.ts
@@@ -1,0 -1,38 +1,40 @@@
+ import { parseRequestBody } from "@/lib/api/utils";
+ import { withWorkspace } from "@/lib/auth";
+ import { rejectProgramApplication } from "@/lib/program-applications/reject-program-application";
+ import { rejectProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
+ import { NextResponse } from "next/server";
+
+ // POST /api/program-applications/reject – Reject a pending partner application
+ export const POST = withWorkspace(
+ async ({ workspace, req, session }) => {
+ const {
+ partnerId,
++ applicationId,
+ rejectionReason,
+ rejectionNote,
+ reapplicationTimeframe,
+ flagForFraud,
+ flagForFraudReason,
+ } = rejectProgramApplicationSchema.parse(await parseRequestBody(req));
+
+ await rejectProgramApplication({
+ workspace,
+ partnerId,
++ applicationId,
+ rejectionReason,
+ rejectionNote,
+ reapplicationTimeframe,
+ flagForFraud,
+ flagForFraudReason,
+ userId: session.user.id,
+ });
+
+ return NextResponse.json({
+ partnerId,
+ });
+ },
+ {
+ requiredPlan: ["business", "advanced", "enterprise"],
+ requiredRoles: ["owner", "member"],
+ },
+ );
diff --cc apps/web/lib/actions/partners/reject-program-application.ts
index 2f8dcbdab7,ce4a5fdfa3..693a45a409
--- a/apps/web/lib/actions/partners/reject-program-application.ts
+++ b/apps/web/lib/actions/partners/reject-program-application.ts
@@@ -30,10 -29,9 +30,10 @@@ export const rejectProgramApplicationAc
requiredRoles: ["owner", "member"],
});
- await rejectPartner({
+ await rejectProgramApplication({
workspace,
partnerId,
+ applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
diff --cc apps/web/lib/zod/schemas/program-application.ts
index 6d7e87cb38,d923be0b8c..e9a6891189
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@@ -115,3 -106,79 +106,91 @@@ export const getProgramApplicationsCoun
.extend({
groupBy: z.enum(["country", "groupId"]).optional(),
});
+
+ export const approveProgramApplicationSchema = z.object({
+ partnerId: z.string().describe("The ID of the partner to approve."),
+ groupId: z
+ .string()
+ .nullish()
+ .describe(
+ "The ID of the group to assign the partner to. If not provided, the partner will be assigned to the group they applied to, or the program's default group if no application group is set.",
+ ),
++ applicationId: z
++ .string()
++ .nullish()
++ .describe(
++ "The ID of the application to approve. Only used for group applications from partners who are already enrolled; defaults to their pending application.",
++ ),
+ });
+
+ export const bulkApproveProgramApplicationsSchema = z.object({
+ workspaceId: z.string(),
+ groupId: z.string().nullish().default(null),
+ partnerIds: z
+ .array(z.string())
+ .max(100)
+ .min(1)
+ .transform((v) => [...new Set(v)]),
+ });
+
+ export const bulkRejectProgramApplicationsSchema = z.object({
+ workspaceId: z.string(),
+ partnerIds: z
+ .array(z.string())
+ .max(100)
+ .min(1)
+ .transform((v) => [...new Set(v)]),
+ });
+
+ // Max length for optional `rejectionNote` on `ProgramApplication`
+ export const PROGRAM_APPLICATION_REJECTION_NOTE_MAX_LENGTH = 500;
+
+ export const rejectProgramApplicationSchema = z.object({
+ partnerId: z.string().describe("The ID of the partner to reject."),
++ applicationId: z
++ .string()
++ .nullish()
++ .describe(
++ "The ID of the application to reject. Only used for group applications from partners who are already enrolled; defaults to their pending application.",
++ ),
+ rejectionReason: z
+ .enum(ProgramApplicationRejectionReason)
+ .optional()
+ .describe(
+ "The reason for rejecting the partner application. This will be shared with the partner via email.",
+ ),
+ rejectionNote: z
+ .string()
+ .max(PROGRAM_APPLICATION_REJECTION_NOTE_MAX_LENGTH)
+ .optional()
+ .transform((s) => {
+ const t = s?.trim();
+ return t === "" ? undefined : t;
+ })
+ .describe(
+ "Additional details about the rejection. This will be shared with the partner via email.",
+ ),
+ reapplicationTimeframe: z
+ .enum(["instant", "standard", "never"])
+ .default("standard")
+ .describe(
+ "The mode for reapplying for the program. `instant`: The partner can reapply immediately. `standard`: The partner can reapply after 30 days. `never`: The partner can never reapply for the program. Defaults to `standard` if undefined.",
+ ),
+ flagForFraud: z
+ .boolean()
+ .optional()
+ .describe(
+ "Whether to flag the partner for fraud review by the Dub team. Cannot be combined with `reapplicationTimeframe: instant`.",
+ ),
+ flagForFraudReason: z
+ .string()
+ .max(MAX_FRAUD_REASON_LENGTH)
+ .optional()
+ .transform((s) => {
+ const t = s?.trim();
+ return t === "" ? undefined : t;
+ })
+ .describe(
+ "The reason for flagging the partner for fraud. Required when flagForFraud is true.",
+ ),
+ });
diff --cc apps/web/ui/modals/reject-program-application-modal.tsx
index a23ddb434d,ea9922158d..b053ca668a
--- a/apps/web/ui/modals/reject-program-application-modal.tsx
+++ b/apps/web/ui/modals/reject-program-application-modal.tsx
@@@ -57,17 -55,10 +55,17 @@@ const REAPPLICATION_TIMEFRAME_DESCRIPTI
never: "The partner can never reapply for the program.",
};
+type ApplicationPartner = Pick<
+ PartnerProps,
+ "id" | "name" | "email" | "image"
+> & {
+ applicationId?: string | null;
+};
+
- interface RejectPartnerApplicationModalProps {
- showRejectPartnerApplicationModal: boolean;
- setShowRejectPartnerApplicationModal: Dispatch<SetStateAction<boolean>>;
+ interface RejectProgramApplicationModalProps {
+ showRejectProgramApplicationModal: boolean;
+ setShowRejectProgramApplicationModal: Dispatch<SetStateAction<boolean>>;
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ partner: ApplicationPartner;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
modal?: boolean;
@@@ -139,10 -130,9 +137,10 @@@ export function RejectProgramApplicatio
reapplicationTimeframeOutcomeRef.current = reapplicationTimeframe;
- await rejectPartnerApplication({
+ await rejectProgramApplication({
workspaceId,
partnerId: partner.id,
+ applicationId: partner.applicationId ?? undefined,
reapplicationTimeframe,
...(flagForFraud
? { flagForFraud: true, flagForFraudReason: flagForFraudReason.trim() }