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.

Land partners without an approved program on /programs

Rafibf2c8f67f31c
diff --git a/apps/web/lib/middleware/partners.ts b/apps/web/lib/middleware/partners.ts
index 9d6a47d800..166d444654 100644
--- a/apps/web/lib/middleware/partners.ts
+++ b/apps/web/lib/middleware/partners.ts
@@ -1,5 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import { getDefaultPartnerId } from "./utils/get-default-partner";
+import { getPartnerLandingPath } from "./utils/get-partner-landing-path";
import { getUserViaToken } from "./utils/get-user-via-token";
import { isValidInternalRedirect } from "./utils/is-valid-internal-redirect";
import { parse } from "./utils/parse";
@@ -104,7 +105,11 @@ export async function PartnersMiddleware(req: NextRequest) {
}
if (path === "/" || path.startsWith("/pn_")) {
- return NextResponse.redirect(new URL("/overview", req.url));
+ const landingPath = defaultPartnerId
+ ? await getPartnerLandingPath(defaultPartnerId)
+ : "/programs";
+
+ return NextResponse.redirect(new URL(landingPath, req.url));
} else if (isLoginPath) {
// if is custom program login or register path, redirect to /programs/:programSlug
const programSlugRegex = /^\/([^\/]+)\/(login|register)$/;
diff --git a/apps/web/lib/middleware/utils/get-partner-landing-path.ts b/apps/web/lib/middleware/utils/get-partner-landing-path.ts
new file mode 100644
index 0000000000..99bf8d5a56
--- /dev/null
+++ b/apps/web/lib/middleware/utils/get-partner-landing-path.ts
@@ -0,0 +1,20 @@
+import { prismaEdge } from "@/lib/prisma/edge";
+import { NETWORK_PROGRAM_ID } from "@dub/utils";
+
+// partners without an approved program land on /programs, where they can find and apply to programs
+export async function getPartnerLandingPath(partnerId: string) {
+ const approvedEnrollment = await prismaEdge.programEnrollment.findFirst({
+ where: {
+ partnerId,
+ status: "approved",
+ programId: {
+ not: NETWORK_PROGRAM_ID,
+ },
+ },
+ select: {
+ id: true,
+ },
+ });
+
+ return approvedEnrollment ? "/overview" : "/programs";
+}
diff --git a/apps/web/playwright/partners/login.spec.ts b/apps/web/playwright/partners/login.spec.ts
index a526e1a198..579ae2655b 100644
--- a/apps/web/playwright/partners/login.spec.ts
+++ b/apps/web/playwright/partners/login.spec.ts
@@ -45,7 +45,7 @@ test.describe("Partner Login", () => {
// Verify redirect to authenticated area
await page.waitForURL((url) =>
- /^\/(overview|onboarding)/.test(new URL(url).pathname),
+ /^\/(overview|programs|onboarding)/.test(new URL(url).pathname),
);
await expect(page).not.toHaveURL(/\/login/);
});
diff --git a/apps/web/playwright/partners/overview.spec.ts b/apps/web/playwright/partners/overview.spec.ts
index 748a260a8b..3e3072476c 100644
--- a/apps/web/playwright/partners/overview.spec.ts
+++ b/apps/web/playwright/partners/overview.spec.ts
@@ -1,9 +1,15 @@
+import { createId } from "@/lib/api/create-id";
import { testIds } from "@/lib/e2e/test-ids";
-import { expect, test } from "@playwright/test";
+import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
+import { expect, Page, test } from "@playwright/test";
+import { hashSync } from "bcryptjs";
+import { deletePartner } from "../api/partners/helpers";
+import { TEST_WORKSPACE } from "../api/setup-test-workspace";
import { env } from "../env";
// The shared partner storage state is a new signup that has not finished
-// onboarding, so these tests log in as the seeded partner instead
+// onboarding, so these tests log in with a password instead
test.use({
storageState: {
cookies: [],
@@ -11,24 +17,84 @@ test.use({
},
});
-test.describe("Partner All programs Overview", () => {
- test.beforeEach(async ({ page }) => {
- await page.goto("/login");
- await page.locator('input[name="email"]').fill(env.E2E_PARTNER_EMAIL);
- await page.getByTestId(testIds.auth.loginSubmit).click();
- await page.locator('input[type="password"]').fill(env.E2E_PARTNER_PASSWORD);
- await page.getByTestId(testIds.auth.loginSubmit).click();
- await page.waitForURL((url) => new URL(url).pathname === "/overview");
- });
+async function logIn(page: Page, email: string, password: string) {
+ await page.goto("/login");
+ await page.locator('input[name="email"]').fill(email);
+ await page.getByTestId(testIds.auth.loginSubmit).click();
+ await page.locator('input[type="password"]').fill(password);
+ await page.getByTestId(testIds.auth.loginSubmit).click();
+ await page.waitForURL((url) => !url.pathname.startsWith("/login"));
+}
+test.describe("Partner All programs Overview", () => {
test("renders every Overview card", async ({ page }) => {
+ await logIn(page, env.E2E_PARTNER_EMAIL, env.E2E_PARTNER_PASSWORD);
+ await page.goto("/overview");
+
for (const testId of Object.values(testIds.partnerOverview)) {
await expect(page.getByTestId(testId)).toBeVisible();
}
});
- test("the root path redirects to the Overview", async ({ page }) => {
- await page.goto("/");
- await expect(page).toHaveURL("/overview");
+ test("lands on /programs without an approved program, and on /overview with one", async ({
+ page,
+ }) => {
+ const email = `overview-landing-${nanoid(8).toLowerCase()}@dub-internal-test.com`;
+ const password = "Password123";
+ let partnerId: string | undefined;
+ let userId: string | undefined;
+
+ try {
+ const program = await prisma.program.findUniqueOrThrow({
+ where: { slug: TEST_WORKSPACE.workspace.slug },
+ select: { id: true, defaultGroupId: true },
+ });
+
+ const partner = await prisma.partner.create({
+ data: {
+ id: createId({ prefix: "pn_" }),
+ name: "Overview Landing Partner",
+ email,
+ country: "US",
+ },
+ });
+ partnerId = partner.id;
+
+ const user = await prisma.user.create({
+ data: {
+ id: createId({ prefix: "user_" }),
+ email,
+ emailVerified: new Date(),
+ passwordHash: hashSync(password, 10),
+ defaultPartnerId: partner.id,
+ partners: {
+ create: {
+ partnerId: partner.id,
+ role: "owner",
+ },
+ },
+ },
+ });
+ userId = user.id;
+
+ await logIn(page, email, password);
+ await expect(page).toHaveURL("/programs");
+
+ await prisma.programEnrollment.create({
+ data: {
+ id: createId({ prefix: "pge_" }),
+ partnerId: partner.id,
+ programId: program.id,
+ groupId: program.defaultGroupId,
+ status: "approved",
+ },
+ });
+
+ await page.goto("/");
+ await expect(page).toHaveURL("/overview");
+ } finally {
+ if (userId) await prisma.user.delete({ where: { id: userId } });
+ await deletePartner(partnerId);
+ }
});
});