From fc66211dd2a9b2cd64063ca3ddef8c4d37326910 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Fri, 14 Aug 2026 02:11:43 +0200
Subject: [PATCH] fix(onboarding): preserve restored board login target

---
 .../nextjs/src/app/[locale]/boards/(content)/_creator.tsx | 8 +++++++-
 packages/onboarding/src/finish.tsx                        | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
index 66c3819c1..f134be76d 100644
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
@@ -52,7 +52,13 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
         if (error instanceof TRPCError && error.code === "NOT_FOUND") {
           if (!session) {
             logger.debug("No home board found for anonymous user, redirecting to login");
-            redirect("/auth/login");
+            const requestedBoardName =
+              typeof resolvedParams.name === "string" ? `/boards/${encodeURIComponent(resolvedParams.name)}` : null;
+            redirect(
+              requestedBoardName
+                ? `/auth/login?callbackUrl=${encodeURIComponent(requestedBoardName)}`
+                : "/auth/login",
+            );
           }
 
           notFound();
diff --git a/packages/onboarding/src/finish.tsx b/packages/onboarding/src/finish.tsx
index 7e1e64e92..a9a108919 100644
--- a/packages/onboarding/src/finish.tsx
+++ b/packages/onboarding/src/finish.tsx
@@ -21,7 +21,9 @@ export const Finish = ({ environment }: OnboardingStudioProps) => {
   const primaryColor = environment.initialBoard?.primaryColor ?? "#fa5252";
   const secondaryColor = environment.initialBoard?.secondaryColor ?? "#fd7e14";
   const boardHref = `/boards/${encodeURIComponent(environment.initialBoard?.name ?? "dashboard")}`;
-  const destination = environment.canConfigurePrivileged ? boardHref : "/auth/login?callbackUrl=%2Finit";
+  const destination = environment.canConfigurePrivileged
+    ? boardHref
+    : `/auth/login?callbackUrl=${encodeURIComponent(boardHref)}`;
   const openBoard = (event: ReactMouseEvent<HTMLAnchorElement>) => {
     sounds.success();
     if (