* feat(mcp-oauth): let an account with no company connect and sign up from the OAuth popup Identity unlock for agent-first onboarding (#1814, shape B+). A person with no Accounted account can now connect from an MCP client, create the account inside the Connect popup and finish the OAuth dance. - authorize/token no longer require a company: consent renders a companyless variant and the key is minted with company_id NULL. - validateApiKey returns companyId string|null and binds an unbound key to the user's first company on the first validation after it exists. - MCP server: company-dependent tools and data resources answer with a structured NO_COMPANY_YET error; the company-independent tools still run; telemetry skips when there is no company scope. - /api/events fails closed instead of throwing for an unbound key. - authorize forces TOTP enrollment (not just verification) for password accounts with no factor, since the middleware skips enrollment for zero-company users; BankID-linked accounts stay exempt. - /login forwards next to /register; register, GoogleAuthButton and /auth/callback carry it back to the consent page (callback honours only /api/mcp-oauth/authorize, via safeReturnTo); /mfa/enroll hard-navigates to /api/* destinations like /mfa/verify. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018wCdzRTatKiDByKB8hCNT6 * refactor(company): move getActiveCompanyId out of the next/headers module lib/auth/api-keys.ts needs the resolver for unbound-key binding, but lib/company/context.ts imports next/headers for the legacy company cookie and Turbopack refuses that import on some of api-keys' import paths (the preview build failed). The resolver and CompanyContextError now live in lib/company/active-company.ts; context.ts re-exports them so every caller and test mock is unchanged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018wCdzRTatKiDByKB8hCNT6 * fix(mcp-oauth): fail closed on a failed assurance lookup; enroll Back aborts instead of looping Review findings on #1855: requireAal2 let consent through at AAL1 when getAuthenticatorAssuranceLevel() returned nothing and a verified factor existed. Only a positive AAL2 answer passes now; a failed lookup and the inconsistent verified-factor-at-AAL1 case both step up to /mfa/verify. Back on /mfa/enroll with the consent page as returnTo went straight back into the redirect loop; it now aborts to the app. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018wCdzRTatKiDByKB8hCNT6 --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
277 lines
11 KiB
TypeScript
277 lines
11 KiB
TypeScript
import { createServerClient } from '@supabase/ssr'
|
|
import { type NextRequest, NextResponse } from 'next/server'
|
|
import { hashInviteToken } from '@/lib/auth/invite-tokens'
|
|
import { INVITE_COOKIE_NAME } from '@/lib/auth/consume-invite-cookie'
|
|
import { safeReturnTo } from '@/lib/auth/safe-return-to'
|
|
|
|
/**
|
|
* The one `next` destination this callback honours for a fresh session: the
|
|
* MCP OAuth consent page. A signup that started from an MCP client's Connect
|
|
* popup (issue #1814) confirms its e-mail or completes Google OAuth here, and
|
|
* has to land back on consent instead of the dashboard. Consent handles the
|
|
* zero-company state itself, which is why this is safe where an arbitrary
|
|
* deep link would not be (a brand-new account has no membership to spend a
|
|
* deep link on). Same-origin only, via safeReturnTo.
|
|
*/
|
|
function oauthResumePath(next: string): string | null {
|
|
const safe = safeReturnTo(next, '/')
|
|
return safe.startsWith('/api/mcp-oauth/authorize?') ? safe : null
|
|
}
|
|
|
|
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') ?? '/'
|
|
const resumeOAuth = oauthResumePath(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
|
|
}
|
|
|
|
// Admin-provisioned invite (auth.admin.inviteUserByEmail, used when the
|
|
// installation runs with signups disabled): the invited user now has a
|
|
// verified session but no password. Reuse the recovery surface so they
|
|
// set one before anything else. The company invite token travels in
|
|
// `next` (/invite/<token>); persist it as the pre-auth invite cookie so
|
|
// the reset-password invite handoff accepts the membership right after
|
|
// the password is saved.
|
|
if (type === 'invite') {
|
|
const response = NextResponse.redirect(new URL('/reset-password', origin))
|
|
for (const { name, value, options } of pendingCookies) {
|
|
response.cookies.set({ name, value, ...options })
|
|
}
|
|
const inviteTokenMatch = next.match(/^\/invite\/([A-Za-z0-9_-]+)$/)
|
|
if (inviteTokenMatch) {
|
|
// Mirrors buildInviteCookie in app/invite/[token]/page.tsx: readable
|
|
// by the client auth surfaces (not httpOnly), lifetime matching the
|
|
// 7-day invite TTL that the server re-checks on every acceptance.
|
|
response.cookies.set(INVITE_COOKIE_NAME, inviteTokenMatch[1], {
|
|
path: '/',
|
|
httpOnly: false,
|
|
secure: process.env.NODE_ENV === 'production',
|
|
sameSite: 'lax',
|
|
maxAge: 7 * 24 * 60 * 60,
|
|
})
|
|
}
|
|
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 verifyUrl = new URL('/mfa/verify', origin)
|
|
if (resumeOAuth) verifyUrl.searchParams.set('returnTo', resumeOAuth)
|
|
const response = NextResponse.redirect(verifyUrl)
|
|
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)
|
|
}
|
|
}
|
|
|
|
// Redirect to the dashboard (it handles zero-company and incomplete
|
|
// states), unless the session was created to resume an MCP OAuth
|
|
// consent flow: that page handles the zero-company state too.
|
|
redirectPath = resumeOAuth ?? '/'
|
|
}
|
|
|
|
// 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, and OAuth
|
|
// by the flow=oauth marker that GoogleAuthButton puts in redirectTo
|
|
// (provider denials arrive here with ?error and no code); everything
|
|
// else defaults to the signup/confirmation framing.
|
|
const failedFlow =
|
|
searchParams.get('flow') === 'oauth'
|
|
? 'oauth'
|
|
: 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)
|
|
}
|