* fix(mcp): explain the Claude-side steps after "Anslut till Claude" and tick the checklist on a real connection (#2133) Lazy auth is by design: Claude lists the tools before any sign-in and the first company-scoped call answers 401, which opens the Accounted sign-in. Nothing told the user, so a "connected" status with an unanswered first question read as a broken connection (Axel, Discord). - Settings -> API & MCP: one sentence of expectation under the button, and the step-by-step guide link moved from under two disclosures to directly under the button. - Docs (connect-claude / anslut-claude): new "What happens after you click" section for Path A covering the connector dialog, the tools appearing before sign-in, the first-call login + consent screen, "ask again", and the "Required when the server asks" auth setting that only the manual path mentioned. - Hem checklist step "Anslut till Claude": deep link now carries client=claude-connector like the settings button (claudeConnectorLink), the footnote carries the same expectation line plus the guide link, and the done-signal is an unrevoked api_keys row minted by the MCP OAuth token route (OAUTH_MCP_KEY_NAME) instead of the in-app AI-profile flag, which never meant "connected to Claude". - Tests: claudeStepDone with/without a key row, deep-link snapshot. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W7iJQwKiRTDWSMnRm4WM4L * fix(mcp): correct consent-page claims, stop the completion PATCH loop, count OAuth keys past RLS (#2133) Three skeptic refutations on PR #2147, fixed in one pass: - Docs (EN + SV): the consent page shows the company active in the app and pre-selects every scope for Claude's connector (founder decision 2026-08-26); it has no company picker and nothing to tick. Steps 3-4 of the new section, the "Read-only by default" paragraph above it, the sandbox note and the 10-minute test now describe Endast läs under Behörigheter instead. - Checklist completion: users with initial_setup_path NULL (skipped the books question, then imported) hit the route's "Välj först hur du vill komma igång" 400 and, with saving as an effect dependency, retried it forever with a toast. completionPatchBody() records path=migration when none was chosen, and a rejected PATCH is not retried within the session. - hasMcpKey: api_keys' SELECT policy is company-scoped, so the user client could not see companyless (NULL company_id) or archived-company keys and the step stayed open for the user who had just connected. The head count now runs through the service client with an explicit user_id filter. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W7iJQwKiRTDWSMnRm4WM4L * fix(mcp): surface a failed OAuth-key count and reserve the marker name (#2133) CodeRabbit round on PR #2147: - app/(dashboard)/page.tsx: a failed api_keys count answered count null, which claudeStepDone read as "never connected". Throw to the error boundary like the settings fetch does instead of guessing. - app/api/settings/api-keys: reject a hand-minted key named MCP-klient (OAuth) (400 VALIDATION_ERROR): that name is the marker the Hem checklist reads as "connected to Claude", so a manual key with it would tick the step without any connection. Test added. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W7iJQwKiRTDWSMnRm4WM4L --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
263 lines
8.9 KiB
TypeScript
263 lines
8.9 KiB
TypeScript
import { NextResponse } from 'next/server'
|
|
import { decryptAuthCode, verifyPkce, hashAuthCode } from '@/lib/auth/oauth-codes'
|
|
import {
|
|
generateApiKey,
|
|
OAUTH_MCP_KEY_NAME,
|
|
generateRefreshToken,
|
|
hashRefreshToken,
|
|
createServiceClientNoCookies,
|
|
validateScopes,
|
|
DEFAULT_OAUTH_SCOPES,
|
|
type ApiKeyScope,
|
|
} from '@/lib/auth/api-keys'
|
|
import { getActiveCompanyId } from '@/lib/company/context'
|
|
|
|
const ACCESS_TOKEN_TTL_SECONDS = 3600
|
|
|
|
// Grace window (seconds) during which a just-superseded access token and refresh
|
|
// token stay valid after a rotation. Lets a client that cannot reliably persist
|
|
// the rotated refresh token, or that fires concurrent refreshes: recover via
|
|
// idempotent replay instead of being forced into a re-auth loop (issue #710).
|
|
// Reuse of a previous refresh token AFTER this window revokes the grant.
|
|
const REFRESH_GRACE_SECONDS = 120
|
|
|
|
/**
|
|
* OAuth 2.0 Token Endpoint.
|
|
*
|
|
* Supports two grant types:
|
|
* - authorization_code: exchange a PKCE-protected auth code for a fresh
|
|
* api_key (access_token) plus a refresh_token.
|
|
* - refresh_token: rotate the refresh_token and return the same api_key
|
|
* with a fresh expires_in. The api_key itself does not expire
|
|
* server-side; expires_in is a hint so clients refresh on a cadence.
|
|
*/
|
|
export async function POST(request: Request) {
|
|
let params: URLSearchParams
|
|
|
|
const contentType = request.headers.get('content-type') || ''
|
|
if (contentType.includes('application/x-www-form-urlencoded')) {
|
|
const text = await request.text()
|
|
params = new URLSearchParams(text)
|
|
} else if (contentType.includes('application/json')) {
|
|
const json = await request.json()
|
|
params = new URLSearchParams(json as Record<string, string>)
|
|
} else {
|
|
return NextResponse.json({ error: 'unsupported_content_type' }, { status: 400 })
|
|
}
|
|
|
|
const grantType = params.get('grant_type')
|
|
|
|
if (grantType === 'authorization_code') {
|
|
return handleAuthorizationCodeGrant(params)
|
|
}
|
|
|
|
if (grantType === 'refresh_token') {
|
|
return handleRefreshTokenGrant(params)
|
|
}
|
|
|
|
return NextResponse.json(
|
|
{
|
|
error: 'unsupported_grant_type',
|
|
error_description: 'Only authorization_code and refresh_token are supported',
|
|
},
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
async function handleAuthorizationCodeGrant(params: URLSearchParams) {
|
|
const code = params.get('code')
|
|
const codeVerifier = params.get('code_verifier')
|
|
const redirectUri = params.get('redirect_uri')
|
|
|
|
if (!code) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'Missing code parameter' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const payload = decryptAuthCode(code)
|
|
if (!payload) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Invalid or expired authorization code' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (redirectUri && redirectUri !== payload.redirectUri) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'redirect_uri mismatch' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (!codeVerifier) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'code_verifier is required' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (!verifyPkce(codeVerifier, payload.codeChallenge)) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'PKCE verification failed' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const codeHash = hashAuthCode(code)
|
|
const supabase = createServiceClientNoCookies()
|
|
|
|
const { error: replayError } = await supabase
|
|
.from('oauth_used_codes')
|
|
.insert({ code_hash: codeHash })
|
|
|
|
if (replayError) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Authorization code already used' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Clean up expired codes (non-blocking, best-effort)
|
|
supabase
|
|
.from('oauth_used_codes')
|
|
.delete()
|
|
.lt('created_at', new Date(Date.now() - 10 * 60 * 1000).toISOString())
|
|
.then(() => {})
|
|
|
|
// null for an account that has no company yet (signed up from the OAuth
|
|
// popup, issue #1814). The key is minted unbound; validateApiKey binds it
|
|
// to the user's first company on the first call after one exists.
|
|
const companyId = await getActiveCompanyId(supabase, payload.userId)
|
|
|
|
const { key, hash, prefix } = generateApiKey()
|
|
const refresh = generateRefreshToken()
|
|
|
|
// Use the scopes the user consented to during /authorize. Re-validate
|
|
// every value against API_KEY_SCOPES even though /authorize already did:
|
|
// the auth code is AEAD-encrypted but we treat the boundary as
|
|
// hostile by default (V9.2.1, defense-in-depth).
|
|
let grantedScopes: ApiKeyScope[]
|
|
if (payload.scopes && Array.isArray(payload.scopes) && payload.scopes.length > 0) {
|
|
const revalidated = validateScopes(payload.scopes)
|
|
if (!revalidated) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Authorization code carried no valid scopes' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
grantedScopes = revalidated
|
|
} else {
|
|
// Code minted with no scope (Claude's existing flow). Fall back to the
|
|
// read-only OAuth defaults: destructive scopes must be requested
|
|
// explicitly (GDPR Art. 25(2)).
|
|
grantedScopes = DEFAULT_OAUTH_SCOPES
|
|
}
|
|
|
|
const { error: insertError } = await supabase
|
|
.from('api_keys')
|
|
.insert({
|
|
user_id: payload.userId,
|
|
company_id: companyId,
|
|
key_hash: hash,
|
|
key_prefix: prefix,
|
|
name: OAUTH_MCP_KEY_NAME,
|
|
scopes: grantedScopes,
|
|
refresh_token_hash: refresh.hash,
|
|
})
|
|
|
|
if (insertError) {
|
|
// This 500 was silent while api_keys.company_id was NOT NULL and every
|
|
// companyless signup died here (2026-08-26): always log the DB error.
|
|
console.error('[mcp-oauth/token] api key insert failed', {
|
|
code: insertError.code,
|
|
message: insertError.message,
|
|
companyless: companyId === null,
|
|
})
|
|
return NextResponse.json(
|
|
{ error: 'server_error', error_description: 'Failed to create API key' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
|
|
return NextResponse.json({
|
|
access_token: key,
|
|
token_type: 'Bearer',
|
|
expires_in: ACCESS_TOKEN_TTL_SECONDS,
|
|
refresh_token: refresh.token,
|
|
scope: grantedScopes.join(' '),
|
|
})
|
|
}
|
|
|
|
async function handleRefreshTokenGrant(params: URLSearchParams) {
|
|
const refreshToken = params.get('refresh_token')
|
|
if (!refreshToken) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'refresh_token is required' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const supabase = createServiceClientNoCookies()
|
|
const presentedHash = hashRefreshToken(refreshToken)
|
|
|
|
// Pre-generate the candidate credentials; the RPC decides whether to use them
|
|
// (rotate / idempotent replay) or ignore them (reuse / revoked / invalid).
|
|
// Doing lookup + rotate + demote in ONE SECURITY DEFINER RPC closes the
|
|
// TOCTOU gap the old SELECT-then-CAS had, and lets a just-superseded refresh
|
|
// token stay valid for a grace window so a client that cannot persist the
|
|
// rotated token, or fires concurrent refreshes: recovers instead of being
|
|
// forced into a re-auth loop (issue #710). Reuse AFTER the grace window
|
|
// revokes the grant (RFC 9700 §4.14.2 reuse detection).
|
|
const rotated = generateRefreshToken()
|
|
const { key: newKey, hash: newKeyHash, prefix: newKeyPrefix } = generateApiKey()
|
|
|
|
const { data, error } = await supabase.rpc('rotate_mcp_refresh_token', {
|
|
p_presented_hash: presentedHash,
|
|
p_new_refresh_hash: rotated.hash,
|
|
p_new_key_hash: newKeyHash,
|
|
p_new_key_prefix: newKeyPrefix,
|
|
p_grace_seconds: REFRESH_GRACE_SECONDS,
|
|
})
|
|
|
|
if (error) {
|
|
console.error('[mcp-oauth/token] refresh rotation failed', { code: error.code, message: error.message })
|
|
return NextResponse.json(
|
|
{ error: 'server_error', error_description: 'Failed to rotate refresh token' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
|
|
const result = (Array.isArray(data) ? data[0] : data) as
|
|
| { outcome: string; scopes: string[] | null }
|
|
| undefined
|
|
const outcome = result?.outcome
|
|
|
|
// 'rotated' (normal) and 'replayed' (idempotent in-grace retry/concurrent)
|
|
// both succeed and return the freshly minted pair. Everything else maps to
|
|
// invalid_grant; for 'reuse_revoked' the grant was already revoked in the RPC.
|
|
if (outcome !== 'rotated' && outcome !== 'replayed') {
|
|
return NextResponse.json(
|
|
{
|
|
error: 'invalid_grant',
|
|
error_description:
|
|
outcome === 'revoked' ? 'Refresh token revoked' : 'Invalid or expired refresh token',
|
|
},
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Carry the granular scopes the key was minted with (read-only OAuth defaults
|
|
// for legacy keys with null scopes) so clients don't re-authorize on refresh.
|
|
const persistedScopes = validateScopes(result?.scopes ?? null) ?? DEFAULT_OAUTH_SCOPES
|
|
|
|
return NextResponse.json({
|
|
access_token: newKey,
|
|
token_type: 'Bearer',
|
|
expires_in: ACCESS_TOKEN_TTL_SECONDS,
|
|
refresh_token: rotated.token,
|
|
scope: persistedScopes.join(' '),
|
|
})
|
|
}
|