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.

Fix program invite crash when signed in as a different partner (#4675)

Pedro Ladeiradd159697b0c0
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/continue-as-invited-button.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/continue-as-invited-button.tsx
new file mode 100644
index 0000000000..4c89e5b3fd
--- /dev/null
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/continue-as-invited-button.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import { Button } from "@dub/ui";
+import { signOut } from "next-auth/react";
+import { useState } from "react";
+
+export function ContinueAsInvitedButton({
+ programSlug,
+ invitedEmail,
+}: {
+ programSlug: string;
+ invitedEmail: string;
+}) {
+ const [isLoading, setIsLoading] = useState(false);
+
+ return (
+ <Button
+ text={`Continue as ${invitedEmail}`}
+ loading={isLoading}
+ className="mt-6 h-9 w-full max-w-sm rounded-lg"
+ onClick={() => {
+ setIsLoading(true);
+ signOut({
+ callbackUrl: `/${programSlug}/register?${new URLSearchParams({
+ email: invitedEmail,
+ next: `/programs/${programSlug}/invite?${new URLSearchParams({
+ email: invitedEmail,
+ })}`,
+ })}`,
+ });
+ }}
+ />
+ );
+}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
index e4fcc39fa5..01b0d9404d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/page.tsx
@@ -2,6 +2,7 @@ import { serializeReward } from "@/lib/api/partners/serialize-reward";
import { getSession } from "@/lib/auth";
import { getGroupBountySummaries } from "@/lib/bounty/api/get-group-bounty-summaries";
import { prisma } from "@/lib/prisma";
+import { emailSchema } from "@/lib/zod/schemas/auth";
import { programLanderSchema } from "@/lib/zod/schemas/program-lander";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
@@ -14,18 +15,90 @@ import { OG_AVATAR_URL, cn } from "@dub/utils";
import { Reward } from "@prisma/client";
import { redirect } from "next/navigation";
import { AcceptProgramInviteButton } from "./accept-program-invite-button";
+import { ContinueAsInvitedButton } from "./continue-as-invited-button";
import { DeclineProgramInviteButton } from "./decline-program-invite-button";
import { ProgramInviteConfetti } from "./program-invite-confetti";
export default async function ProgramInvitePage(props: {
params: Promise<{ programSlug: string }>;
+ searchParams: Promise<{ email?: string | string[] }>;
}) {
const params = await props.params;
+ const searchParams = await props.searchParams;
const { programSlug } = params;
- const { user } = await getSession();
+ const session = await getSession();
+ const user = session?.user;
if (!user) redirect(`/login?next=/programs/${programSlug}/invite`);
+ const invitedEmailResult = emailSchema.safeParse(
+ Array.isArray(searchParams.email)
+ ? searchParams.email[0]
+ : searchParams.email,
+ );
+ const invitedEmail = invitedEmailResult.success
+ ? invitedEmailResult.data
+ : undefined;
+
+ let partnerId = user.defaultPartnerId;
+
+ // The session can still say there is no partner after the account was linked.
+ if (!partnerId) {
+ const refreshedUser = await prisma.user.findUnique({
+ where: {
+ id: user.id,
+ },
+ select: {
+ defaultPartnerId: true,
+ },
+ });
+ partnerId = refreshedUser?.defaultPartnerId ?? undefined;
+ }
+
+ if (invitedEmail && invitedEmail !== user.email?.toLowerCase()) {
+ const enrollment = partnerId
+ ? await prisma.programEnrollment.findFirst({
+ where: {
+ partnerId,
+ program: {
+ slug: programSlug,
+ },
+ },
+ select: {
+ id: true,
+ },
+ })
+ : null;
+
+ if (!enrollment) {
+ return (
+ <PageContent>
+ <div className="flex w-full flex-col items-center justify-center px-4 py-16">
+ <div className="flex w-full max-w-[400px] flex-col items-center text-center">
+ <h2 className="text-content-default text-pretty text-lg font-semibold">
+ This invitation is for {invitedEmail}
+ </h2>
+ <p className="text-content-subtle mt-2 text-pretty text-base font-medium">
+ You&apos;re signed in as {user.email}. Sign in with the invited
+ email to view this program invitation.
+ </p>
+ <ContinueAsInvitedButton
+ programSlug={programSlug}
+ invitedEmail={invitedEmail}
+ />
+ </div>
+ </div>
+ </PageContent>
+ );
+ }
+ }
+
+ if (!partnerId) {
+ redirect(
+ `/onboarding?next=${encodeURIComponent(`/programs/${programSlug}/invite`)}`,
+ );
+ }
+
const program = await prisma.program.findUnique({
where: {
slug: programSlug,
@@ -33,7 +106,7 @@ export default async function ProgramInvitePage(props: {
include: {
partners: {
where: {
- partnerId: user.defaultPartnerId,
+ partnerId,
},
include: {
partnerGroup: true,
diff --git a/apps/web/lib/middleware/partners.ts b/apps/web/lib/middleware/partners.ts
index 166d444654..d7a29ea0ad 100644
--- a/apps/web/lib/middleware/partners.ts
+++ b/apps/web/lib/middleware/partners.ts
@@ -28,7 +28,6 @@ export async function PartnersMiddleware(req: NextRequest) {
const { path, fullPath, searchParamsObj, searchParamsString } = parse(req);
const user = await getUserViaToken(req);
- const isPartnerInvite = req.nextUrl.pathname.endsWith("/invite");
// match whole path segments, so program slugs like "overviewai" stay public
const isAuthenticatedPath = AUTHENTICATED_PATHS.some(
@@ -80,7 +79,9 @@ export async function PartnersMiddleware(req: NextRequest) {
if (
!defaultPartnerId &&
- !isPartnerInvite &&
+ // /invite is the partner-profile team invite and can be accepted before a
+ // profile exists. Program invites (/programs/:slug/invite) need a profile.
+ path !== "/invite" &&
!["/onboarding", "/account"].some((p) => path.startsWith(p))
) {
return NextResponse.redirect(
@@ -101,7 +102,13 @@ export async function PartnersMiddleware(req: NextRequest) {
}) &&
!path.startsWith("/onboarding")
) {
- return NextResponse.redirect(new URL(searchParamsObj.next, req.url));
+ const nextUrl = new URL(searchParamsObj.next, req.url);
+ // Keep the invited email on the destination so a signed-in account can
+ // be compared with the address the invitation was sent to.
+ if (searchParamsObj.email && !nextUrl.searchParams.has("email")) {
+ nextUrl.searchParams.set("email", searchParamsObj.email);
+ }
+ return NextResponse.redirect(nextUrl);
}
if (path === "/" || path.startsWith("/pn_")) {
diff --git a/packages/email/src/templates/program-invite.tsx b/packages/email/src/templates/program-invite.tsx
index c4282e3814..a831dd045e 100644
--- a/packages/email/src/templates/program-invite.tsx
+++ b/packages/email/src/templates/program-invite.tsx
@@ -271,7 +271,10 @@ export default function ProgramInvite({
)}
<Link
className="mt-5 block rounded-lg bg-neutral-900 px-4 py-3 text-center text-xs font-semibold text-white no-underline"
- href={`https://partners.dub.co/${program.slug}/register?email=${encodeURIComponent(email)}&next=/programs/${program.slug}/invite`}
+ href={`https://partners.dub.co/${program.slug}/register?${new URLSearchParams({
+ email,
+ next: `/programs/${program.slug}/invite?${new URLSearchParams({ email })}`,
+ })}`}
>
View invite
</Link>