The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Use program emailDomains for invite email
Steven Tey45e0caf20d17
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.tsindex 44e58da4ab..8e46158212 100644--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts@@ -38,6 +38,9 @@ export const POST = withWorkspace(getProgramOrThrow({programId,workspaceId: workspace.id,+ include: {+ emailDomains: true,+ },}),getCampaignOrThrow({@@ -46,6 +49,19 @@ export const POST = withWorkspace(}),]);+ // check if from email is a valid email domain+ if (+ from &&+ !program.emailDomains.some((domain) =>+ emailAddresses.some((email) => email.endsWith(`@${domain.slug}`)),+ )+ ) {+ throw new DubApiError({+ code: "bad_request",+ message: "Invalid `from` email address.",+ });+ }+const { data, error } = await sendBatchEmail(emailAddresses.map((email) => ({variant: campaign.type === "marketing" ? "marketing" : "notifications",diff --git a/apps/web/app/(ee)/api/programs/[programId]/route.ts b/apps/web/app/(ee)/api/programs/[programId]/route.tsindex 5a7dfca3e3..21a66e6bc0 100644--- a/apps/web/app/(ee)/api/programs/[programId]/route.ts+++ b/apps/web/app/(ee)/api/programs/[programId]/route.ts@@ -7,7 +7,9 @@ export const GET = withWorkspace(async ({ workspace, params }) => {const program = await getProgramOrThrow({workspaceId: workspace.id,programId: params.programId,- includeCategories: true,+ include: {+ categories: true,+ },});return NextResponse.json(program);diff --git a/apps/web/lib/actions/partners/invite-partner.ts b/apps/web/lib/actions/partners/invite-partner.tsindex be684734f3..beaa5c2c15 100644--- a/apps/web/lib/actions/partners/invite-partner.ts+++ b/apps/web/lib/actions/partners/invite-partner.ts@@ -24,6 +24,9 @@ export const invitePartnerAction = authActionClientgetProgramOrThrow({workspaceId: workspace.id,programId,+ include: {+ emailDomains: true,+ },}),prisma.programEnrollment.findFirst({@@ -85,6 +88,11 @@ export const invitePartnerAction = authActionClientinviteEmailData?.subject ||`${program.name} invited you to join Dub Partners`,variant: "notifications",+ // use the first email domain as the from email address+ from:+ program.emailDomains.length > 0+ ? `${program.name} <partners@${program.emailDomains[0].slug}>`+ : undefined,to: email,replyTo: program.supportEmail || "noreply",react: ProgramInvite({diff --git a/apps/web/lib/api/programs/get-program-or-throw.ts b/apps/web/lib/api/programs/get-program-or-throw.tsindex 24ecdab086..6c8d6d0753 100644--- a/apps/web/lib/api/programs/get-program-or-throw.ts+++ b/apps/web/lib/api/programs/get-program-or-throw.ts@@ -1,26 +1,43 @@import { programInviteEmailDataSchema } from "@/lib/zod/schemas/program-invite-email";import { ProgramSchema } from "@/lib/zod/schemas/programs";import { prisma } from "@dub/prisma";+import { Prisma } from "@dub/prisma/client";+import { z } from "zod";import { DubApiError } from "../errors";-export const getProgramOrThrow = async ({+// Extended schema with inviteEmailData+const ProgramWithInviteEmailSchema = ProgramSchema.extend({+ inviteEmailData: programInviteEmailDataSchema,+});++// Type that combines Zod schema inference with Prisma include payload+type ProgramWithInclude<T extends Prisma.ProgramInclude = {}> = z.infer<+ typeof ProgramWithInviteEmailSchema+> &+ Prisma.ProgramGetPayload<{ include: T }>;++// Type-safe version that accepts an include object directly+export async function getProgramOrThrow<T extends Prisma.ProgramInclude = {}>({workspaceId,programId,- includeCategories = false,+ include,}: {workspaceId: string;programId: string;- includeCategories?: boolean;-}) => {+ include?: T;+}): Promise<ProgramWithInclude<T>> {+ const finalInclude = include+ ? ({+ ...include,+ categories: include.categories ? true : false,+ } as T)+ : undefined;+const program = await prisma.program.findUnique({where: {id: programId,},- ...(includeCategories && {- include: {- categories: true,- },- }),+ ...(finalInclude && { include: finalInclude }),});if (!program || program.workspaceId !== workspaceId) {@@ -30,15 +47,17 @@ export const getProgramOrThrow = async ({});}- return ProgramSchema.extend({- inviteEmailData: programInviteEmailDataSchema,- }).parse(- includeCategories+ // Transform categories if included+ const transformedProgram =+ include?.categories && "categories" in program? {...program,- // @ts-ignore conditionally including categories+ // @ts-ignore conditionally transforming categoriescategories: program.categories?.map(({ category }) => category) ?? [],}- : program,- );-};+ : program;++ return ProgramWithInviteEmailSchema.parse(+ transformedProgram,+ ) as ProgramWithInclude<T>;+}