Merge pull request dubinc#2272 from dubinc/links-redirect

Use middleware for /links redirect

Author: steven-tey

apps/web/app/api/workspaces/[idOrSlug]/exists/route.ts

@@ -1,13 +1,12 @@
 import { withSession } from "@/lib/auth";
-import { isReservedKey } from "@/lib/edge-config";
 import { prisma } from "@dub/prisma";
-import { DEFAULT_REDIRECTS } from "@dub/utils";
+import { DEFAULT_REDIRECTS, RESERVED_SLUGS } from "@dub/utils";
 import { NextResponse } from "next/server";
 
 // GET /api/workspaces/[idOrSlug]/exists – check if a project exists
 export const GET = withSession(async ({ params }) => {
   const { idOrSlug: slug } = params;
-  if ((await isReservedKey(slug)) || DEFAULT_REDIRECTS[slug]) {
+  if (RESERVED_SLUGS.includes(slug) || DEFAULT_REDIRECTS[slug]) {
     return NextResponse.json(1);
   }
   const project = await prisma.project.findUnique({

apps/web/app/app.dub.co/(onboarding)/onboarding/page.tsx

@@ -1,15 +1,12 @@
 import { DubApiError } from "@/lib/api/errors";
-import {
-  isBlacklistedKey,
-  isReservedKey,
-  isReservedUsername,
-} from "@/lib/edge-config";
+import { isBlacklistedKey, isReservedUsername } from "@/lib/edge-config";
 import { checkIfKeyExists } from "@/lib/planetscale";
 import { WorkspaceProps } from "@/lib/types";
 import {
   DEFAULT_REDIRECTS,
   isDubDomain,
   isReservedKeyGlobal,
+  RESERVED_SLUGS,
 } from "@dub/utils";
 
 export async function keyChecks({
@@ -46,7 +43,7 @@ export async function keyChecks({
 
   if (isDubDomain(domain) && process.env.NEXT_PUBLIC_IS_DUB) {
     if (domain === "dub.sh" || domain === "dub.link") {
-      if (DEFAULT_REDIRECTS[key] || (await isReservedKey(key))) {
+      if (DEFAULT_REDIRECTS[key] || RESERVED_SLUGS.includes(key)) {
         return {
           error: "Duplicate key: This short link already exists.",
           code: "conflict",

apps/web/app/app.dub.co/(redirects)/[slug]/page.tsx

@@ -3,6 +3,5 @@ export * from "./is-blacklisted-domain";
 export * from "./is-blacklisted-email";
 export * from "./is-blacklisted-key";
 export * from "./is-blacklisted-referrer";
-export * from "./is-reserved-key";
 export * from "./is-reserved-username";
 export * from "./update";

apps/web/lib/api/links/utils/key-checks.ts

@@ -96,7 +96,9 @@ export default async function AppMiddleware(req: NextRequest) {
     ) {
       return WorkspacesMiddleware(req, user);
     } else if (appRedirect(path)) {
-      return NextResponse.redirect(new URL(appRedirect(path), req.url));
+      return NextResponse.redirect(
+        new URL(`${appRedirect(path)}${searchParamsString}`, req.url),
+      );
     }
   }
 

apps/web/lib/edge-config/index.ts

@@ -17,7 +17,7 @@ export default async function NewLinkMiddleware(
   if (defaultWorkspace) {
     return NextResponse.redirect(
       new URL(
-        `/${defaultWorkspace}?newLink=${searchParams.get("link") || true}${searchParams.has("domain") ? `&newLinkDomain=${searchParams.get("domain")}` : ""}`,
+        `/${defaultWorkspace}/links?newLink=${searchParams.get("link") || true}${searchParams.has("domain") ? `&newLinkDomain=${searchParams.get("domain")}` : ""}`,
         req.url,
       ),
     );

apps/web/lib/edge-config/is-reserved-key.ts

@@ -1,13 +1,20 @@
+import { RESERVED_SLUGS } from "@dub/utils";
+
 const APP_REDIRECTS = {
   "/account": "/account/settings",
   "/referrals": "/account/settings/referrals",
-  "/welcome": "/onboarding",
+  "/onboarding": "/onboarding/welcome",
+  "/welcome": "/onboarding/welcome",
 };
 
 export const appRedirect = (path: string) => {
   if (APP_REDIRECTS[path]) {
     return APP_REDIRECTS[path];
   }
+  // Redirect "/[slug]" to "/[slug]/links"
+  const rootRegex = /^\/([^\/]+)$/;
+  if (rootRegex.test(path) && !RESERVED_SLUGS.includes(path.split("/")[1]))
+    return path.replace(rootRegex, "/$1/links");
 
   // Redirect "programs/[programId]/settings" to "programs/[programId]/settings/rewards" (first tab)
   const programSettingsRegex = /\/programs\/([^\/]+)\/settings$/;

apps/web/lib/middleware/app.ts

@@ -21,7 +21,7 @@ export default async function WorkspacesMiddleware(
     }
     return NextResponse.redirect(
       new URL(
-        `/${defaultWorkspace}${redirectPath}${searchParamsString}`,
+        `/${defaultWorkspace}${redirectPath || "/links"}${searchParamsString}`,
         req.url,
       ),
     );