* feat(billing): multi-user seat gate: multi_user capability, 20-day grace, owner-only dormancy Multiple people in one company becomes a paid capability (multi_user, the eighth PAID key). Derived at access time from capability_grants, no status column, no enforcement cron: - entitled: active grant (trial/stripe/team/manual/comp), everyone works - grace: newest grant expired < 20 days ago; countdown banner for everyone in companies with > 1 user; invites still allowed - frozen: only role=owner resolves; other memberships go dormant (rows untouched, paying reactivates instantly); invites 403 with paid-plan upsell Enforcement: new resolve_active_company_gated RPC (zero-arg RPC and RLS twin untouched: they also run on self-hosts, where the gate never bites), gated query fallback for service-role/API-key paths, setActiveCompany guard, MCP company-access check, invite route. Middleware routes all-frozen users to a new /paused page; the switcher greys locked companies. Migration 20260901081417 (applied to staging): trial trigger seeds multi_user, backfills for mid-trial companies, active Stripe subs, team agreements, and a grandfather grant (expires now, i.e. grace = deploy + 20 days) for existing unpaid multi-member companies. Daily cron mails owners at grace start and last day. Strings in sv+en; pg-real + unit tests included. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L4tNt8wRG3a5iuU1JE2pnP * fix(billing): multi-user seat gate hardening from skeptic review - Stripe cancel now EXPIRES the multi_user stripe grant instead of deleting it: the 20-day grace window hangs on an expired row, so a deleted one froze churned payers' staff instantly with no banner and no mail. Other stripe grants keep the freeze-and-retain delete. - New SECURITY DEFINER company_multi_user_state() RPC (migration 20260901083726, applied to staging) and RPC-first getMultiUserState: capability_grants RLS hides team-scoped rows from non-team users, so user-client reads misread byra-covered companies as frozen (switch refusal, wrong switcher locks). - Byra-kind teams get a standing team-scoped multi_user grant (backfill + teams trigger): byra client companies have no company-scoped trial by design, so a grantless byra team would freeze every consultant and client user. - Comped/manual companies with active PAID-key grants extend to multi_user (a comped company must not read as paying while locking out user two). - /api/v1 gets the same dormancy gate as MCP (frozen non-owner -> 403). - PGRST202 on resolution fails OPEN (pre-migration DB has zero multi_user rows; the gated fallback would have frozen every non-owner mid-deploy). - Grace cron: covers team-scoped lapses (byra agreement ending) and skips the start mail for the hand-mailed grandfather cohort. - Tests updated/added across all touched surfaces; pg tests for the new RPC and byra trigger; trial-suppression pg test extended to 8 keys. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L4tNt8wRG3a5iuU1JE2pnP * fix(billing): decouple seat-gate env check and fail open on gate read throws CI round 1 on #2099: - isMultiUserEnforced no longer imports has-capability: several route test suites partially mock that module and the vitest mock guard threw from inside the v1 seat gate, turning expected 4xx responses into 500s. multi_user is never a connector capability, so the bypass reduces to the same env reads, now inlined. - getMultiUserState wraps its resolution in a fail-open try/catch: a client without .rpc or a thrown network error must never lock users out. - no-phantom-columns ceiling 391 -> 393 with reasons: the seat gate's .or() scope filter (server-resolved UUIDs) and the Stripe cancel expiry update's timestamp .or(); all columns in both strings are literals. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L4tNt8wRG3a5iuU1JE2pnP * fix(billing): membership-guard the multi-user entitlement RPCs (Superagent P3) company_multi_user_ok and company_multi_user_state are SECURITY DEFINER and were granted to authenticated with a caller-supplied company UUID: any logged-in user could probe an arbitrary company's billing state and grace deadline across tenants. Migration 20260901091752 (applied to staging) requires an auth.uid() membership in the target company when a JWT is present, keeps service-role/definer contexts unrestricted, and clamps the grace window to [0, 20] days. pg tests: stranger gets false/NULL, member reads normally, oversized p_grace_days cannot widen the probe. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L4tNt8wRG3a5iuU1JE2pnP --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
178 lines
5.9 KiB
TypeScript
178 lines
5.9 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { eventBus } from '@/lib/events/bus'
|
|
|
|
const DEFAULT_COMPANY_ID = '11111111-1111-4111-8111-111111111111'
|
|
const OTHER_COMPANY_ID = '22222222-2222-4222-8222-222222222222'
|
|
|
|
const mocks = vi.hoisted(() => ({
|
|
membership: {
|
|
data: {
|
|
company_id: '22222222-2222-4222-8222-222222222222',
|
|
role: 'owner',
|
|
} as Record<string, unknown> | null,
|
|
error: null as { message: string } | null,
|
|
},
|
|
companyIds: [] as string[],
|
|
hasCapability: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('@/lib/supabase/server', () => ({
|
|
createClient: vi.fn(),
|
|
createServiceClient: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('@/lib/auth/api-keys', async (importOriginal) => {
|
|
const actual = await importOriginal<typeof import('@/lib/auth/api-keys')>()
|
|
return {
|
|
...actual,
|
|
extractBearerToken: vi.fn().mockReturnValue('test-token'),
|
|
validateApiKey: vi.fn().mockResolvedValue({
|
|
userId: 'user-1',
|
|
companyId: '11111111-1111-4111-8111-111111111111',
|
|
scopes: ['companies:read', 'invoices:write', 'reports:read'],
|
|
apiKeyId: 'key-1',
|
|
apiKeyName: 'Test Key',
|
|
}),
|
|
createServiceClientNoCookies: vi.fn(() => ({
|
|
from: vi.fn((table: string) => {
|
|
if (table !== 'company_members') throw new Error(`Unexpected table: ${table}`)
|
|
const chain: Record<string, ReturnType<typeof vi.fn>> = {
|
|
select: vi.fn(() => chain),
|
|
eq: vi.fn((column: string, value: string) => {
|
|
if (column === 'company_id') mocks.companyIds.push(value)
|
|
return chain
|
|
}),
|
|
is: vi.fn(() => chain),
|
|
maybeSingle: vi.fn(async () => mocks.membership),
|
|
}
|
|
return chain
|
|
}),
|
|
})),
|
|
}
|
|
})
|
|
|
|
vi.mock('@/lib/entitlements/has-capability', async (importOriginal) => {
|
|
const actual = await importOriginal<typeof import('@/lib/entitlements/has-capability')>()
|
|
return { ...actual, hasCapability: mocks.hasCapability }
|
|
})
|
|
|
|
// Multi-user seat gate: entitled here, so the strict company_members-only
|
|
// table mock above stays valid for non-owner roles (the gate would otherwise
|
|
// read companies + capability_grants). Gate behavior is covered in
|
|
// company-routing.test.ts and lib/entitlements/__tests__/multi-user.test.ts.
|
|
vi.mock('@/lib/entitlements/multi-user', async (importOriginal) => {
|
|
const actual = await importOriginal<typeof import('@/lib/entitlements/multi-user')>()
|
|
return {
|
|
...actual,
|
|
getMultiUserState: vi.fn().mockResolvedValue({ state: 'entitled', graceEndsAt: null }),
|
|
}
|
|
})
|
|
|
|
import { handleMcpRequest } from '../server'
|
|
|
|
function toolCall(args: Record<string, unknown>): Request {
|
|
return new Request('http://localhost:3000/api/extensions/ext/mcp-server/mcp', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json', Authorization: 'Bearer test-token' },
|
|
body: JSON.stringify({
|
|
jsonrpc: '2.0',
|
|
id: 1,
|
|
method: 'tools/call',
|
|
params: { name: 'gnubok_send_invoice', arguments: args },
|
|
}),
|
|
})
|
|
}
|
|
|
|
async function parseToolResult(response: Response) {
|
|
const json = await response.json()
|
|
const result = json.result as { isError?: boolean; content: Array<{ text: string }> }
|
|
return {
|
|
isError: result.isError === true,
|
|
payload: JSON.parse(result.content[0].text) as Record<string, unknown>,
|
|
}
|
|
}
|
|
|
|
describe('MCP multi-company dispatch', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
eventBus.clear()
|
|
mocks.companyIds.length = 0
|
|
mocks.membership = {
|
|
data: { company_id: OTHER_COMPANY_ID, role: 'owner' },
|
|
error: null,
|
|
}
|
|
mocks.hasCapability.mockResolvedValue(false)
|
|
})
|
|
|
|
it('routes a tool call to an accessible requested company', async () => {
|
|
const result = await parseToolResult(
|
|
await handleMcpRequest(
|
|
toolCall({ invoice_id: 'invoice-1', company_id: OTHER_COMPANY_ID })
|
|
)
|
|
)
|
|
|
|
expect(result.isError).toBe(true)
|
|
expect((result.payload.error as Record<string, unknown>).capability_blocked).toBe(true)
|
|
expect(mocks.companyIds).toEqual([OTHER_COMPANY_ID])
|
|
expect(mocks.hasCapability).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
OTHER_COMPANY_ID,
|
|
'email_send'
|
|
)
|
|
})
|
|
|
|
it('revalidates and uses the API key default company when company_id is omitted', async () => {
|
|
mocks.membership.data = { company_id: DEFAULT_COMPANY_ID, role: 'admin' }
|
|
|
|
await handleMcpRequest(toolCall({ invoice_id: 'invoice-1' }))
|
|
|
|
expect(mocks.companyIds).toEqual([DEFAULT_COMPANY_ID])
|
|
expect(mocks.hasCapability).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
DEFAULT_COMPANY_ID,
|
|
'email_send'
|
|
)
|
|
})
|
|
|
|
it('rejects a company the user does not belong to before capability or execution', async () => {
|
|
mocks.membership.data = null
|
|
|
|
const result = await parseToolResult(
|
|
await handleMcpRequest(
|
|
toolCall({ invoice_id: 'invoice-1', company_id: OTHER_COMPANY_ID })
|
|
)
|
|
)
|
|
|
|
expect(result.isError).toBe(true)
|
|
expect((result.payload.error as Record<string, unknown>).code).toBe('NOT_FOUND')
|
|
expect(mocks.hasCapability).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects writes for a viewer in the selected company', async () => {
|
|
mocks.membership.data = { company_id: OTHER_COMPANY_ID, role: 'viewer' }
|
|
|
|
const result = await parseToolResult(
|
|
await handleMcpRequest(
|
|
toolCall({ invoice_id: 'invoice-1', company_id: OTHER_COMPANY_ID })
|
|
)
|
|
)
|
|
|
|
expect(result.isError).toBe(true)
|
|
expect((result.payload.error as Record<string, unknown>).code).toBe('FORBIDDEN')
|
|
expect(mocks.hasCapability).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects malformed company_id before querying membership', async () => {
|
|
const result = await parseToolResult(
|
|
await handleMcpRequest(
|
|
toolCall({ invoice_id: 'invoice-1', company_id: 'not-a-uuid' })
|
|
)
|
|
)
|
|
|
|
expect(result.isError).toBe(true)
|
|
expect((result.payload.error as Record<string, unknown>).code).toBe('VALIDATION_ERROR')
|
|
expect(mocks.companyIds).toEqual([])
|
|
expect(mocks.hasCapability).not.toHaveBeenCalled()
|
|
})
|
|
})
|