Files
accounted/app/(auth)/auth/callback/route.ts
T
Jakob WennbergandClaude Fable 5 15300aa8e2 fix(invites): accept invite on BankID signup, recover missed invites on onboarding surfaces (#1157)
An invited user who registered via BankID was funneled into creating a
company instead of joining the one they were invited to: the register
page's BankID path never processed the gnubok-invite-token cookie
(unlike the login, MFA-verify, and auth-callback paths). Observed in
production 2026-07-24.

- register: BankID signup now accepts the pending invite before routing
  to /select-company, mirroring the login page's BankID path.
- lib/company/pending-invites: acceptPendingInviteByToken retries a
  missed acceptance from the cookie (pending + unexpired + email match,
  same rules as POST /api/team/accept); hasPendingInviteForEmail detects
  a stranded invitee whose cookie is gone.
- /onboarding and /select-company retry acceptance from the cookie and
  redirect to the dashboard on success, making the auth callback's
  long-promised fallback real; with no cookie but a pending invitation,
  both surfaces show a 'join via the link in the invitation email' hint
  instead of silently asking the invitee to create a company.
- No new accept path without the token: the hint deliberately points
  back to the mailed link, so mailbox possession stays required and no
  company name is leaked to unverified emails.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-07-24 19:36:09 +02:00

222 lines
8.7 KiB
TypeScript

import { createServerClient } from '@supabase/ssr'
import { type NextRequest, NextResponse } from 'next/server'
import { hashInviteToken } from '@/lib/auth/invite-tokens'
export async function GET(request: NextRequest) {
const { searchParams, origin } = new URL(request.url)
const code = searchParams.get('code')
const token_hash = searchParams.get('token_hash')
const type = searchParams.get('type')
const next = searchParams.get('next') ?? '/'
// Collect cookies that Supabase sets during auth so we can
// explicitly forward them on the redirect response.
const pendingCookies: { name: string; value: string; options: Record<string, unknown> }[] = []
const supabase = createServerClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
{
cookies: {
getAll() {
return request.cookies.getAll()
},
setAll(cookiesToSet) {
pendingCookies.length = 0
cookiesToSet.forEach((cookie) => {
// Mirror the cookie into request.cookies so subsequent getAll()
// calls within this request lifecycle return the updated values
// (matches the pattern used in proxy.ts).
request.cookies.set(cookie.name, cookie.value)
pendingCookies.push(cookie)
})
},
},
}
)
let authenticated = false
// Handle PKCE flow (code exchange)
if (code) {
const { error } = await supabase.auth.exchangeCodeForSession(code)
authenticated = !error
}
// Handle token hash flow (email verification / magic link)
else if (token_hash && type) {
const { error } = await supabase.auth.verifyOtp({
token_hash,
type: type as 'signup' | 'invite' | 'magiclink' | 'recovery' | 'email_change' | 'email',
})
authenticated = !error
}
if (authenticated) {
let redirectPath = next
// Password recovery flow: the user just exchanged a recovery token, so they
// have a fresh session whose only purpose is to call updateUser({ password })
// on /reset-password. Skip onboarding / team setup / dashboard redirect.
// The token-hash flow signals this via type=recovery; PKCE has no type, so
// also gate on next === '/reset-password' (only the reset request sets it).
if (type === 'recovery' || next === '/reset-password') {
const response = NextResponse.redirect(new URL('/reset-password', origin))
for (const { name, value, options } of pendingCookies) {
response.cookies.set({ name, value, ...options })
}
return response
}
const { data: { user } } = await supabase.auth.getUser()
if (user) {
// Check MFA status: redirect to verify if factor is enrolled but session is AAL1
const { data: aal } = await supabase.auth.mfa.getAuthenticatorAssuranceLevel()
if (aal?.nextLevel === 'aal2' && aal?.currentLevel === 'aal1') {
const response = NextResponse.redirect(new URL('/mfa/verify', origin))
for (const { name, value, options } of pendingCookies) {
response.cookies.set({ name, value, ...options })
}
return response
}
// Check for pending invite token (set by invite page before redirecting to register)
const inviteToken = request.cookies.get('gnubok-invite-token')?.value
if (inviteToken) {
try {
const tokenHash = hashInviteToken(inviteToken)
// Use the service role client to bypass RLS for invite acceptance
const serviceClient = createServerClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.SUPABASE_SERVICE_ROLE_KEY!,
{ cookies: { getAll: () => [], setAll: () => {} } }
)
// Look up company invitation
const { data: invite } = await serviceClient
.from('company_invitations')
.select('id, company_id, email, role, status, expires_at')
.eq('token_hash', tokenHash)
.single()
if (
invite &&
invite.status === 'pending' &&
new Date(invite.expires_at) > new Date() &&
user.email?.toLowerCase() === invite.email.toLowerCase()
) {
// Add user to company
await serviceClient.from('company_members').insert({
company_id: invite.company_id,
user_id: user.id,
role: invite.role,
source: 'direct',
})
// Set active company. Non-fatal on failure (middleware falls
// back to the membership created above) but log so silent
// persistence failures (#701) are observable.
const { error: prefError } = await serviceClient.from('user_preferences').upsert({
user_id: user.id,
active_company_id: invite.company_id,
}, { onConflict: 'user_id' })
if (prefError) {
console.error('[auth/callback] failed to set active company', prefError)
}
// Mark invite as accepted
await serviceClient
.from('company_invitations')
.update({ status: 'accepted' })
.eq('id', invite.id)
// Invited user goes straight to dashboard: no onboarding needed
redirectPath = '/'
// Clear invite cookie and set company cookie on response
const response = NextResponse.redirect(new URL(redirectPath, origin))
for (const { name, value, options } of pendingCookies) {
response.cookies.set({ name, value, ...options })
}
response.cookies.set('gnubok-company-id', invite.company_id, {
path: '/',
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: 'lax',
maxAge: 60 * 60 * 24 * 365,
})
response.cookies.delete('gnubok-invite-token')
return response
}
} catch (err) {
console.error('[auth/callback] invite acceptance failed:', err)
// Fall through to normal onboarding check
}
}
// Ensure user has a silent team (for new signups and existing users without one)
const { data: teamMembership } = await supabase
.from('team_members')
.select('team_id')
.eq('user_id', user.id)
.limit(1)
.maybeSingle()
if (!teamMembership) {
// Create team via service client (RPC requires auth.uid() which isn't available here).
// Non-fatal: a failure here must not turn a successfully confirmed session into a
// 500 that reads as "signup verification failed". The dashboard / onboarding path
// recreates the silent team when it is missing, so log and continue.
try {
const serviceClient = createServerClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.SUPABASE_SERVICE_ROLE_KEY!,
{ cookies: { getAll: () => [], setAll: () => {} } }
)
const teamId = crypto.randomUUID()
await serviceClient.from('teams').insert({
id: teamId,
name: 'Personal',
created_by: user.id,
})
await serviceClient.from('team_members').insert({
team_id: teamId,
user_id: user.id,
role: 'owner',
})
} catch (err) {
console.error('[auth/callback] silent team creation failed:', err)
}
}
// Always redirect to dashboard: it handles zero-company and incomplete states
redirectPath = '/'
}
// Create redirect and explicitly set auth cookies on the response
const response = NextResponse.redirect(new URL(redirectPath, origin))
for (const { name, value, options } of pendingCookies) {
response.cookies.set({ name, value, ...options })
}
// Keep the invite cookie alive so the /onboarding and /select-company
// pages can retry acceptance via acceptPendingInviteByToken (only clear
// it when successfully processed above).
return response
}
// Authentication failed: redirect to login with error. Forward a coarse
// flow hint so the login page can show the right copy: a failed signup
// confirmation must not be framed as a failed password reset. On the PKCE
// (?code=) path there is no `type`, so recovery is identified by the
// next=/reset-password marker that resetPasswordForEmail sets; everything
// else defaults to the signup/confirmation framing.
const failedFlow =
type === 'recovery' || next === '/reset-password' ? 'recovery' : 'signup'
const loginUrl = new URL('/login', origin)
loginUrl.searchParams.set('error', 'auth_error')
loginUrl.searchParams.set('flow', failedFlow)
return NextResponse.redirect(loginUrl)
}