Files
accounted/app/api/mcp-oauth/token/__tests__/route.test.ts
T
a717f03898 feat(mcp-oauth): let an account with no company connect and sign up from the OAuth popup (#1814 PR 1) (#1855)
* 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>
2026-08-25 11:25:42 +02:00

476 lines
17 KiB
TypeScript

import { describe, it, expect, vi, beforeEach } from 'vitest'
import { createQueuedMockSupabase } from '@/tests/helpers'
const mocks = vi.hoisted(() => ({
supabaseFactory: vi.fn(),
getActiveCompanyId: vi.fn().mockResolvedValue('company-1'),
}))
vi.mock('@/lib/auth/api-keys', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/auth/api-keys')>()
return {
...actual,
createServiceClientNoCookies: () => mocks.supabaseFactory(),
}
})
vi.mock('@/lib/auth/oauth-codes', () => ({
decryptAuthCode: vi.fn(),
verifyPkce: vi.fn(),
hashAuthCode: vi.fn(() => 'auth-code-hash'),
}))
vi.mock('@/lib/company/context', () => ({
getActiveCompanyId: (...args: unknown[]) => mocks.getActiveCompanyId(...args),
}))
import { POST } from '../route'
import { decryptAuthCode, verifyPkce } from '@/lib/auth/oauth-codes'
import { generateRefreshToken } from '@/lib/auth/api-keys'
function formRequest(body: Record<string, string>) {
return new Request('http://localhost/api/mcp-oauth/token', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams(body).toString(),
})
}
describe('POST /api/mcp-oauth/token', () => {
beforeEach(() => {
vi.clearAllMocks()
})
describe('grant_type validation', () => {
it('rejects unknown grant types', async () => {
const res = await POST(formRequest({ grant_type: 'password' }))
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('unsupported_grant_type')
})
it('rejects unsupported content type', async () => {
const req = new Request('http://localhost/api/mcp-oauth/token', {
method: 'POST',
headers: { 'Content-Type': 'text/plain' },
body: 'grant_type=authorization_code',
})
const res = await POST(req)
expect(res.status).toBe(400)
})
})
describe('authorization_code grant', () => {
it('returns access_token, refresh_token, and expires_in on success', async () => {
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
const { supabase, enqueueMany } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueueMany([
{ data: null, error: null }, // insert into oauth_used_codes
{ data: null, error: null }, // delete expired codes (best-effort)
{ data: null, error: null }, // insert into api_keys
])
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.access_token).toMatch(/^gnubok_sk_/)
expect(body.refresh_token).toMatch(/^gnubok_rt_/)
expect(body.token_type).toBe('Bearer')
expect(body.expires_in).toBe(3600)
})
it('mints an unbound key (company_id null) when the user has no company yet', async () => {
// Signup inside the OAuth popup (issue #1814): the account exists, the
// company does not. The key is stored unbound and validateApiKey binds
// it on the first call after the company is created.
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
mocks.getActiveCompanyId.mockResolvedValueOnce(null)
const { supabase, enqueueMany, findCall } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueueMany([
{ data: null, error: null }, // insert into oauth_used_codes
{ data: null, error: null }, // delete expired codes (best-effort)
{ data: null, error: null }, // insert into api_keys
])
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.access_token).toMatch(/^gnubok_sk_/)
const inserted = findCall('api_keys', 'insert')?.[0] as Record<string, unknown>
expect(inserted).toBeDefined()
expect(inserted.user_id).toBe('user-1')
expect(inserted.company_id).toBeNull()
})
it('rejects an already-used auth code (replay)', async () => {
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: null, error: { message: 'unique violation' } })
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
})
it('rejects when PKCE verification fails', async () => {
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(false)
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'wrong',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
expect(body.error_description).toContain('PKCE')
})
})
describe('refresh_token grant', () => {
it('rotates both tokens and returns a fresh access_token', async () => {
const { token: refreshToken } = generateRefreshToken()
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
// rotate_mcp_refresh_token RPC → normal rotation
enqueue({ data: [{ outcome: 'rotated', scopes: null }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: refreshToken,
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.access_token).toMatch(/^gnubok_sk_/)
expect(body.refresh_token).toMatch(/^gnubok_rt_/)
expect(body.refresh_token).not.toBe(refreshToken) // rotated
expect(body.expires_in).toBe(3600)
})
it('returns 400 when refresh_token is missing', async () => {
const res = await POST(formRequest({ grant_type: 'refresh_token' }))
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_request')
})
it('returns 400 when refresh_token is unknown', async () => {
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: [{ outcome: 'invalid', scopes: null }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_unknown',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
})
it('returns 400 when the api_key is revoked', async () => {
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: [{ outcome: 'revoked', scopes: null }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
expect(body.error_description).toContain('revoked')
})
it('returns 500 when the rotation RPC fails with a DB error', async () => {
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: null, error: { message: 'connection reset' } })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(500)
const body = await res.json()
expect(body.error).toBe('server_error')
})
it('returns 400 invalid_grant when a refresh token is reused after its grace window (reuse_revoked)', async () => {
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
// The RPC detected reuse of a previous refresh token past its grace
// window and already revoked the grant family (RFC 9700 §4.14.2).
enqueue({ data: [{ outcome: 'reuse_revoked', scopes: null }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
})
it('returns a fresh pair on idempotent in-grace replay instead of 400 (issue #710 regression)', async () => {
// A retried / mis-persisted / concurrent refresh presents the previous
// refresh token within the grace window. The old code returned 400
// "already used", stranding Claude Code into a re-auth loop; the RPC now
// replays idempotently and the client gets a working pair.
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: [{ outcome: 'replayed', scopes: ['transactions:read'] }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.access_token).toMatch(/^gnubok_sk_/)
expect(body.refresh_token).toMatch(/^gnubok_rt_/)
expect(body.expires_in).toBe(3600)
expect(body.scope).toBe('transactions:read')
})
})
describe('scope plumbing', () => {
it('falls back to read-only DEFAULT_OAUTH_SCOPES when the auth code carries no scopes', async () => {
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
const { supabase, enqueueMany } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueueMany([
{ data: null, error: null },
{ data: null, error: null },
{ data: null, error: null },
])
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(200)
const body = await res.json()
// DEFAULT_OAUTH_SCOPES is read-only by design. Write and approval scopes
// must be requested explicitly by the client AND ticked by the user on
// the consent screen, GDPR Art. 25(2), ISO 27001:2022 A.5.18 / A.8.2,
// SOC 2 CC6.3, ASVS V8.1.1 / V10.2.1.
const granted = body.scope.split(' ')
expect(granted).toContain('transactions:read')
expect(granted).toContain('invoices:read')
expect(granted).toContain('suppliers:read')
expect(granted).toContain('reports:read')
// No silent write or approval grants:
expect(granted).not.toContain('transactions:write')
expect(granted).not.toContain('invoices:write')
expect(granted).not.toContain('suppliers:write')
expect(granted).not.toContain('customers:write')
expect(granted).not.toContain('documents:write')
expect(granted).not.toContain('pending_operations:approve')
expect(granted).not.toContain('bookkeeping:write')
expect(granted).not.toContain('payroll:write')
expect(granted).not.toContain('webhooks:manage')
})
it('honours scopes from the auth code when present', async () => {
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
scopes: ['transactions:read', 'invoices:read'],
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
const { supabase, enqueueMany } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueueMany([
{ data: null, error: null },
{ data: null, error: null },
{ data: null, error: null },
])
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.scope).toBe('transactions:read invoices:read')
})
it('rejects a code whose embedded scopes are all unknown', async () => {
// V9.2.1 defense-in-depth: even though /authorize already filters
// unknown scopes, the token endpoint must not silently mint a
// key with empty scopes: the auth code payload boundary is
// treated as hostile.
vi.mocked(decryptAuthCode).mockReturnValue({
userId: 'user-1',
codeChallenge: 'challenge',
redirectUri: 'https://claude.ai/api/cb',
scopes: ['unknown:scope', 'definitely:not:real'] as unknown as string[],
exp: Date.now() + 60_000,
})
vi.mocked(verifyPkce).mockReturnValue(true)
const { supabase, enqueueMany } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueueMany([
{ data: null, error: null }, // insert into oauth_used_codes
{ data: null, error: null }, // delete expired codes
])
const res = await POST(
formRequest({
grant_type: 'authorization_code',
code: 'ciphertext',
code_verifier: 'verifier',
redirect_uri: 'https://claude.ai/api/cb',
})
)
expect(res.status).toBe(400)
const body = await res.json()
expect(body.error).toBe('invalid_grant')
})
})
describe('refresh_token scope response', () => {
it('returns the granular scopes the api_key was minted with', async () => {
// Greptile P1: refresh response previously hardcoded scope:'mcp',
// causing OAuth 2.1 clients to think they had lost their grant.
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({
data: [
{
outcome: 'rotated',
scopes: ['transactions:read', 'invoices:read', 'invoices:write'],
},
],
error: null,
})
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(200)
const body = await res.json()
expect(body.scope.split(' ').sort()).toEqual(
['transactions:read', 'invoices:read', 'invoices:write'].sort()
)
})
it('falls back to read-only DEFAULT_OAUTH_SCOPES for legacy keys with null scopes', async () => {
const { supabase, enqueue } = createQueuedMockSupabase()
mocks.supabaseFactory.mockReturnValue(supabase)
enqueue({ data: [{ outcome: 'rotated', scopes: null }], error: null })
const res = await POST(
formRequest({
grant_type: 'refresh_token',
refresh_token: 'gnubok_rt_anything',
})
)
expect(res.status).toBe(200)
const body = await res.json()
const granted = body.scope.split(' ')
expect(granted).toContain('transactions:read')
// No silent grant of write or approval scopes (GDPR Art. 25(2),
// SoD per findStageApproveConflict, see lib/auth/api-keys.ts).
expect(granted).not.toContain('transactions:write')
expect(granted).not.toContain('pending_operations:approve')
expect(granted).not.toContain('bookkeeping:write')
expect(granted).not.toContain('payroll:write')
})
})
})