Merge pull request dubinc#2274 from dubinc/handle-next

Improve handling of `?next=` query param

Author: steven-tey

apps/web/lib/middleware/partners.ts

@@ -12,7 +12,7 @@ const AUTHENTICATED_PATHS = [
 ];
 
 export default async function PartnersMiddleware(req: NextRequest) {
-  const { path, fullPath } = parse(req);
+  const { path, fullPath, searchParamsObj } = parse(req);
 
   const user = await getUserViaToken(req);
 
@@ -41,7 +41,13 @@ export default async function PartnersMiddleware(req: NextRequest) {
 
     if (!defaultPartnerId && !path.startsWith("/onboarding")) {
       return NextResponse.redirect(new URL("/onboarding", req.url));
-    } else if (path === "/" || path.startsWith("/pn_")) {
+    }
+
+    if (searchParamsObj.next) {
+      return NextResponse.redirect(new URL(searchParamsObj.next, req.url));
+    }
+
+    if (path === "/" || path.startsWith("/pn_")) {
       return NextResponse.redirect(new URL("/programs", req.url));
     } else if (isLoginPath) {
       // if is custom program login or register path, redirect to /programs/:programSlug

apps/web/lib/middleware/utils/parse.ts

@@ -15,12 +15,21 @@ export const parse = (req: NextRequest) => {
 
   // fullPath is the full URL path (along with search params)
   const searchParams = req.nextUrl.searchParams.toString();
+  const searchParamsObj = Object.fromEntries(req.nextUrl.searchParams);
   const searchParamsString = searchParams.length > 0 ? `?${searchParams}` : "";
   const fullPath = `${path}${searchParamsString}`;
 
   // Here, we are using decodeURIComponent to handle foreign languages like Hebrew
   const key = decodeURIComponent(path.split("/")[1]); // key is the first part of the path (e.g. dub.sh/stats/github -> stats)
   const fullKey = decodeURIComponent(path.slice(1)); // fullKey is the full path without the first slash (to account for multi-level subpaths, e.g. d.to/github/repo -> github/repo)
 
-  return { domain, path, fullPath, key, fullKey, searchParamsString };
+  return {
+    domain,
+    path,
+    fullPath,
+    key,
+    fullKey,
+    searchParamsObj,
+    searchParamsString,
+  };
 };

apps/web/lib/middleware/workspaces.ts

@@ -8,7 +8,12 @@ export default async function WorkspacesMiddleware(
   req: NextRequest,
   user: UserProps,
 ) {
-  const { path, searchParamsString } = parse(req);
+  const { path, searchParamsObj, searchParamsString } = parse(req);
+
+  // special case for handling ?next= query param
+  if (searchParamsObj.next) {
+    return NextResponse.redirect(new URL(searchParamsObj.next, req.url));
+  }
 
   const defaultWorkspace = await getDefaultWorkspace(user);
 

packages/email/src/templates/connect-payout-reminder.tsx

@@ -106,7 +106,7 @@ export default function ConnectPayoutReminder({
 
             <Section className="mt-8 text-center">
               <Link
-                href="https://partners.dub.co/settings/payouts"
+                href="https://partners.dub.co/register?next=/settings/payouts"
                 className="box-border block w-full rounded-md bg-black px-0 py-4 text-center text-sm font-medium leading-none text-white no-underline"
               >
                 Connect payout details