* 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>
201 lines
6.7 KiB
TypeScript
201 lines
6.7 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type { ApiKeyScope } from '@/lib/auth/api-keys'
|
|
import { getMultiUserState, isMembershipDormant } from '@/lib/entitlements/multi-user'
|
|
import type { CompanyRole } from '@/types'
|
|
|
|
const UUID_PATTERN =
|
|
/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
|
|
|
|
const COMPANY_INDEPENDENT_TOOLS = new Set([
|
|
'gnubok_search_tools',
|
|
'gnubok_list_skills',
|
|
'gnubok_load_skill',
|
|
'gnubok_list_companies',
|
|
// Creates the company: by definition it runs before one exists.
|
|
'gnubok_create_company',
|
|
// Public-registry lookup that feeds gnubok_create_company: same pre-company
|
|
// stage of onboarding, no company data touched at all.
|
|
'gnubok_lookup_company',
|
|
])
|
|
|
|
/**
|
|
* Company-independent tools that still USE a company when one is available:
|
|
* they run without one (anonymous or not-yet-onboarded callers, issue #1814)
|
|
* but accept an explicit company_id, which is then membership-checked like
|
|
* on any company-dependent tool. gnubok_list_skills filters skills by the
|
|
* company's entity type, employees and VAT registration.
|
|
*/
|
|
const OPTIONAL_COMPANY_TOOLS = new Set(['gnubok_list_skills'])
|
|
|
|
export function isOptionalCompanyTool(toolName: string): boolean {
|
|
return OPTIONAL_COMPANY_TOOLS.has(toolName)
|
|
}
|
|
|
|
export const COMPANY_ID_INPUT_PROPERTY = {
|
|
type: 'string',
|
|
format: 'uuid',
|
|
description: 'Target company ID. Omit for default.',
|
|
} as const
|
|
|
|
export interface McpCompanyContext {
|
|
companyId: string
|
|
role: CompanyRole
|
|
isDefault: boolean
|
|
}
|
|
|
|
interface ToolSchemaSource {
|
|
name: string
|
|
inputSchema: Record<string, unknown>
|
|
}
|
|
|
|
export function codedError(
|
|
code: 'VALIDATION_ERROR' | 'NOT_FOUND' | 'FORBIDDEN' | 'INTERNAL_ERROR' | 'NO_COMPANY_YET',
|
|
message: string
|
|
) {
|
|
return Object.assign(new Error(message), { code })
|
|
}
|
|
|
|
/**
|
|
* Thrown when a company-scoped operation runs on a key whose user has no
|
|
* company at all (minted from the OAuth popup before onboarding, issue
|
|
* #1814). Maps to the NO_COMPANY_YET structured error with its remediation.
|
|
*/
|
|
export function noCompanyYetError(): Error {
|
|
return codedError(
|
|
'NO_COMPANY_YET',
|
|
'This account has no company yet. Create the company in the web app, then retry.'
|
|
)
|
|
}
|
|
|
|
function isCompanyRole(value: unknown): value is CompanyRole {
|
|
return value === 'owner' || value === 'admin' || value === 'member' || value === 'viewer'
|
|
}
|
|
|
|
export function isCompanyDependentTool(toolName: string): boolean {
|
|
return !COMPANY_INDEPENDENT_TOOLS.has(toolName)
|
|
}
|
|
|
|
export function isTenantWriteScope(scope: ApiKeyScope | undefined): boolean {
|
|
return (
|
|
scope?.endsWith(':write') === true ||
|
|
scope?.endsWith(':approve') === true ||
|
|
scope?.endsWith(':manage') === true ||
|
|
// Sign-off attests on the company's behalf: a write for the role guard
|
|
// even though the scope is deliberately not `:write` (linking rows must
|
|
// not imply the right to attest).
|
|
scope?.endsWith(':signoff') === true
|
|
)
|
|
}
|
|
|
|
export function projectToolInputSchema(tool: ToolSchemaSource): Record<string, unknown> {
|
|
if (!isCompanyDependentTool(tool.name) && !isOptionalCompanyTool(tool.name)) return tool.inputSchema
|
|
|
|
const properties =
|
|
tool.inputSchema.properties && typeof tool.inputSchema.properties === 'object'
|
|
? (tool.inputSchema.properties as Record<string, unknown>)
|
|
: {}
|
|
|
|
return {
|
|
...tool.inputSchema,
|
|
properties: {
|
|
...properties,
|
|
company_id: COMPANY_ID_INPUT_PROPERTY,
|
|
},
|
|
}
|
|
}
|
|
|
|
export function extractRequestedCompany(
|
|
rawArgs: Record<string, unknown>
|
|
): { requestedCompanyId: string | undefined; toolArgs: Record<string, unknown> } {
|
|
const { company_id: rawCompanyId, ...toolArgs } = rawArgs
|
|
if (rawCompanyId === undefined) return { requestedCompanyId: undefined, toolArgs }
|
|
if (typeof rawCompanyId !== 'string' || !UUID_PATTERN.test(rawCompanyId)) {
|
|
throw codedError('VALIDATION_ERROR', 'company_id must be a valid UUID')
|
|
}
|
|
return { requestedCompanyId: rawCompanyId, toolArgs }
|
|
}
|
|
|
|
export async function resolveMcpCompanyContext(args: {
|
|
supabase: SupabaseClient
|
|
userId: string
|
|
/** null while the key's user has no company (see validateApiKey). */
|
|
defaultCompanyId: string | null
|
|
requestedCompanyId?: string
|
|
}): Promise<McpCompanyContext> {
|
|
const companyId = args.requestedCompanyId ?? args.defaultCompanyId
|
|
if (!companyId) {
|
|
throw noCompanyYetError()
|
|
}
|
|
|
|
const { data: membership, error } = await args.supabase
|
|
.from('company_members')
|
|
.select('company_id, role, companies!inner(archived_at)')
|
|
.eq('user_id', args.userId)
|
|
.eq('company_id', companyId)
|
|
.is('companies.archived_at', null)
|
|
.maybeSingle()
|
|
|
|
if (error) {
|
|
throw codedError('INTERNAL_ERROR', `Failed to resolve company membership: ${error.message}`)
|
|
}
|
|
if (!membership) {
|
|
throw codedError('NOT_FOUND', 'Company not found')
|
|
}
|
|
if (!isCompanyRole(membership.role)) {
|
|
throw codedError('FORBIDDEN', 'Company membership has an unsupported role')
|
|
}
|
|
|
|
// Multi-user seat gate: the MCP surface is a chokepoint like the HTTP
|
|
// routes, so a non-owner membership in a frozen company (multi_user lapsed
|
|
// past its 20-day grace) is refused here, before any tool touches tenant
|
|
// data. Owners always pass; self-hosted/dev return 'entitled' outright.
|
|
if (membership.role !== 'owner') {
|
|
const access = await getMultiUserState(args.supabase, companyId)
|
|
if (isMembershipDormant(membership.role, access.state)) {
|
|
throw codedError(
|
|
'FORBIDDEN',
|
|
'This company is paused for your account: multiple users require a paid plan. Ask the company owner to upgrade.'
|
|
)
|
|
}
|
|
}
|
|
|
|
return {
|
|
companyId,
|
|
role: membership.role,
|
|
isDefault: companyId === args.defaultCompanyId,
|
|
}
|
|
}
|
|
|
|
export function assertMcpCompanyWriteAccess(
|
|
context: McpCompanyContext,
|
|
scope: ApiKeyScope | undefined
|
|
): void {
|
|
if (context.role === 'viewer' && isTenantWriteScope(scope)) {
|
|
throw codedError('FORBIDDEN', 'Write permission required for this company')
|
|
}
|
|
}
|
|
|
|
export function addCompanyToNextHint(next: unknown, companyId: string): unknown {
|
|
if (!next || typeof next !== 'object' || Array.isArray(next)) return next
|
|
const hint = next as Record<string, unknown>
|
|
if (typeof hint.tool !== 'string' || !isCompanyDependentTool(hint.tool)) return next
|
|
const args =
|
|
hint.args && typeof hint.args === 'object' && !Array.isArray(hint.args)
|
|
? (hint.args as Record<string, unknown>)
|
|
: {}
|
|
return {
|
|
...hint,
|
|
args: { ...args, company_id: companyId },
|
|
}
|
|
}
|
|
|
|
export function addCompanyToTopLevelNext(result: unknown, companyId: string): unknown {
|
|
if (!result || typeof result !== 'object' || Array.isArray(result)) return result
|
|
const record = result as Record<string, unknown>
|
|
if (!record.next) return result
|
|
return {
|
|
...record,
|
|
next: addCompanyToNextHint(record.next, companyId),
|
|
}
|
|
}
|