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.

add partnersProgramRedirects, other small fixes

Steven Tey9e79276a1aba
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
index d21f599197..44e58da4ab 100644
--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
@@ -46,7 +46,7 @@ export const POST = withWorkspace(
}),
]);
- const { error } = await sendBatchEmail(
+ const { data, error } = await sendBatchEmail(
emailAddresses.map((email) => ({
variant: campaign.type === "marketing" ? "marketing" : "notifications",
to: email,
@@ -74,6 +74,7 @@ export const POST = withWorkspace(
}),
})),
);
+ console.log("Resend response:", data);
if (error) {
throw new DubApiError({
diff --git a/apps/web/app/(ee)/api/cron/partners/ban/process/route.ts b/apps/web/app/(ee)/api/cron/partners/ban/process/route.ts
index 86c6530d68..61659e1c60 100644
--- a/apps/web/app/(ee)/api/cron/partners/ban/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/ban/process/route.ts
@@ -20,7 +20,6 @@ import { cancelCommissions } from "./cancel-commissions";
const schema = z.object({
programId: z.string(),
partnerId: z.string(),
- userId: z.string(),
});
// POST /api/cron/partners/ban/process - do the post-ban processing
@@ -33,7 +32,7 @@ export async function POST(req: Request) {
rawBody,
});
- const { programId, partnerId, userId } = schema.parse(JSON.parse(rawBody));
+ const { programId, partnerId } = schema.parse(JSON.parse(rawBody));
console.info(`Banning partner ${partnerId} from program ${programId}...`);
diff --git a/apps/web/lib/actions/partners/ban-partner.ts b/apps/web/lib/actions/partners/ban-partner.ts
index ae83a7f872..ca450f4e47 100644
--- a/apps/web/lib/actions/partners/ban-partner.ts
+++ b/apps/web/lib/actions/partners/ban-partner.ts
@@ -119,7 +119,6 @@ export const banPartner = async ({
body: {
programId,
partnerId,
- userId: user.id,
},
}),
]),
diff --git a/apps/web/lib/actions/partners/bulk-ban-partners.ts b/apps/web/lib/actions/partners/bulk-ban-partners.ts
index b46764c794..09ffc62cf7 100644
--- a/apps/web/lib/actions/partners/bulk-ban-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-ban-partners.ts
@@ -105,7 +105,6 @@ export const bulkBanPartnersAction = authActionClient
body: {
programId,
partnerId,
- userId: user.id,
},
})),
),
diff --git a/apps/web/lib/middleware/partners.ts b/apps/web/lib/middleware/partners.ts
index ee7d50ad85..78de35e81e 100644
--- a/apps/web/lib/middleware/partners.ts
+++ b/apps/web/lib/middleware/partners.ts
@@ -3,7 +3,10 @@ import { getDefaultPartnerId } from "./utils/get-default-partner";
import { getUserViaToken } from "./utils/get-user-via-token";
import { isValidInternalRedirect } from "./utils/is-valid-internal-redirect";
import { parse } from "./utils/parse";
-import { partnersRedirect } from "./utils/partners-redirect";
+import {
+ partnersProgramRedirects,
+ partnersRedirect,
+} from "./utils/partners-redirect";
const AUTHENTICATED_PATHS = [
"/programs",
@@ -31,7 +34,17 @@ export async function PartnersMiddleware(req: NextRequest) {
(p) => path.startsWith(p) || path.endsWith(p),
);
- if (!user && isAuthenticatedPath) {
+ if (partnersProgramRedirects(path)) {
+ return NextResponse.redirect(
+ new URL(
+ `${partnersProgramRedirects(path)}${searchParamsString}`,
+ req.url,
+ ),
+ {
+ status: 301,
+ },
+ );
+ } else if (!user && isAuthenticatedPath) {
if (path.startsWith("/programs/")) {
const programSlug = path.split("/")[2];
return NextResponse.redirect(new URL(`/${programSlug}/login`, req.url));
diff --git a/apps/web/lib/middleware/utils/partners-redirect.ts b/apps/web/lib/middleware/utils/partners-redirect.ts
index f266103b1e..37f4402dc8 100644
--- a/apps/web/lib/middleware/utils/partners-redirect.ts
+++ b/apps/web/lib/middleware/utils/partners-redirect.ts
@@ -11,3 +11,21 @@ export const partnersRedirect = (path: string) => {
return null;
};
+
+const PARTNERS_PROGRAM_REDIRECTS = {
+ "ship-30": "dwp",
+ supercutai: "supercut",
+};
+
+export const partnersProgramRedirects = (path: string) => {
+ const programRedirect = Object.keys(PARTNERS_PROGRAM_REDIRECTS).find(
+ (redirect) => path === `/${redirect}` || path.includes(`/${redirect}/`),
+ );
+ if (programRedirect) {
+ return path.replace(
+ programRedirect,
+ PARTNERS_PROGRAM_REDIRECTS[programRedirect],
+ );
+ }
+ return null;
+};
diff --git a/packages/email/src/templates/campaign-email.tsx b/packages/email/src/templates/campaign-email.tsx
index 5aa632b745..741ab5ab3f 100644
--- a/packages/email/src/templates/campaign-email.tsx
+++ b/packages/email/src/templates/campaign-email.tsx
@@ -75,7 +75,10 @@ export default function CampaignEmail({
</Section>
<Section>
- <div dangerouslySetInnerHTML={{ __html: styledHtml }} />
+ <div
+ style={{ fontSize: "14px" }}
+ dangerouslySetInnerHTML={{ __html: styledHtml }}
+ />
</Section>
{program?.messagingEnabledAt &&