fix: enforce onboarding gate for applicants and observers
All checks were successful
Build and Push Docker Image / build (push) Successful in 9m37s

Applicants could bypass onboarding and land directly on the dashboard.
Added onboardingCompletedAt check + redirect to /onboarding in both
the applicant and observer layouts (jury/mentor already had this gate).
Also removed premature status ACTIVE on magic-link first login — now
only completeOnboarding sets ACTIVE.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-04 17:00:19 +01:00
parent f0d5599167
commit b1a994a9d6
3 changed files with 32 additions and 12 deletions

View File

@@ -1,5 +1,6 @@
import { redirect } from 'next/navigation' import { redirect } from 'next/navigation'
import { auth } from '@/lib/auth' import { prisma } from '@/lib/prisma'
import { requireRole } from '@/lib/auth-redirect'
import { ApplicantNav } from '@/components/layouts/applicant-nav' import { ApplicantNav } from '@/components/layouts/applicant-nav'
export const dynamic = 'force-dynamic' export const dynamic = 'force-dynamic'
@@ -9,14 +10,20 @@ export default async function ApplicantLayout({
}: { }: {
children: React.ReactNode children: React.ReactNode
}) { }) {
const session = await auth() const session = await requireRole('APPLICANT')
if (!session?.user) { // Check if user has completed onboarding
const user = await prisma.user.findUnique({
where: { id: session.user.id },
select: { onboardingCompletedAt: true },
})
if (!user) {
redirect('/login') redirect('/login')
} }
if (session.user.role !== 'APPLICANT') { if (!user.onboardingCompletedAt) {
redirect('/login') redirect('/onboarding')
} }
return ( return (

View File

@@ -1,7 +1,11 @@
import { redirect } from 'next/navigation'
import { prisma } from '@/lib/prisma'
import { requireRole } from '@/lib/auth-redirect' import { requireRole } from '@/lib/auth-redirect'
import { ObserverNav } from '@/components/layouts/observer-nav' import { ObserverNav } from '@/components/layouts/observer-nav'
import { EditionProvider } from '@/components/observer/observer-edition-context' import { EditionProvider } from '@/components/observer/observer-edition-context'
export const dynamic = 'force-dynamic'
export default async function ObserverLayout({ export default async function ObserverLayout({
children, children,
}: { }: {
@@ -9,6 +13,20 @@ export default async function ObserverLayout({
}) { }) {
const session = await requireRole('OBSERVER') const session = await requireRole('OBSERVER')
// Check if user has completed onboarding
const user = await prisma.user.findUnique({
where: { id: session.user.id },
select: { onboardingCompletedAt: true },
})
if (!user) {
redirect('/login')
}
if (!user.onboardingCompletedAt) {
redirect('/onboarding')
}
return ( return (
<div className="min-h-screen bg-background"> <div className="min-h-screen bg-background">
<EditionProvider> <EditionProvider>

View File

@@ -273,13 +273,8 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
return false // Block suspended users return false // Block suspended users
} }
// Update status to ACTIVE on first login (from NONE or INVITED) // Note: status stays INVITED/NONE until onboarding completes.
if (dbUser?.status === 'INVITED' || dbUser?.status === 'NONE') { // The completeOnboarding mutation sets status to ACTIVE.
await prisma.user.update({
where: { email: user.email! },
data: { status: 'ACTIVE' },
})
}
// Add user data for JWT callback // Add user data for JWT callback
if (dbUser) { if (dbUser) {