fix

Author: ianmaccallum

src/app/(onboarding)/layout.tsx

@@ -13,7 +13,17 @@ export default async function OnboardingLayout({
     redirect("/signin");
   }
 
-  const workspaceId = session.user.workspaceId;
+  // The session JWT may not yet reflect a workspace that was just linked.
+  // Fall back to a direct DB lookup for email auth users.
+  let workspaceId = session.user.workspaceId;
+
+  if (!workspaceId && session.user.authType === "email") {
+    const dbUser = await prisma.user.findUnique({
+      where: { id: session.user.id },
+      select: { workspaceId: true },
+    });
+    workspaceId = dbUser?.workspaceId ?? undefined;
+  }
 
   if (workspaceId) {
     const workspace = await prisma.workspace.findUnique({

src/app/(onboarding)/onboarding/page.tsx

@@ -1,5 +1,6 @@
 import { auth } from "@/lib/auth";
 import { redirect } from "next/navigation";
+import prisma from "@/lib/prisma";
 import { OnboardingWizard } from "./onboarding-wizard";
 
 export default async function OnboardingPage() {
@@ -9,11 +10,23 @@ export default async function OnboardingPage() {
     redirect("/signin");
   }
 
+  // The session JWT may not yet reflect a workspace that was just linked
+  // (e.g. after the Slack OAuth callback). Fall back to a direct DB lookup.
+  let workspaceId = session.user.workspaceId;
+
+  if (!workspaceId && session.user.authType === "email") {
+    const dbUser = await prisma.user.findUnique({
+      where: { id: session.user.id },
+      select: { workspaceId: true },
+    });
+    workspaceId = dbUser?.workspaceId ?? undefined;
+  }
+
   return (
     <OnboardingWizard
       authType={session.user.authType}
       userId={session.user.id}
-      workspaceId={session.user.workspaceId}
+      workspaceId={workspaceId}
     />
   );
 }