* 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>
88 lines
3.2 KiB
TypeScript
88 lines
3.2 KiB
TypeScript
import { createServiceClient } from '@/lib/supabase/server'
|
|
import { NextResponse } from 'next/server'
|
|
import { withRouteContext } from '@/lib/api/with-route-context'
|
|
import { getMultiUserState } from '@/lib/entitlements/multi-user'
|
|
|
|
/**
|
|
* GET /api/company/members
|
|
* Returns members and pending invitations for the current company.
|
|
* Service client on purpose: profiles/emails of other members aren't readable
|
|
* through the caller's RLS context; every query still scopes by companyId.
|
|
*/
|
|
export const GET = withRouteContext('company_members.list', async (_request, ctx) => {
|
|
const { companyId, user } = ctx
|
|
const serviceClient = await createServiceClient()
|
|
|
|
// Fetch members (source column may not exist if migration not yet applied)
|
|
let members: { id: string; user_id: string; role: string; source?: string; joined_at: string }[] | null = null
|
|
|
|
const { data: membersWithSource, error: membersError } = await serviceClient
|
|
.from('company_members')
|
|
.select('id, user_id, role, source, joined_at')
|
|
.eq('company_id', companyId)
|
|
.order('joined_at', { ascending: true })
|
|
|
|
if (membersError) {
|
|
// Fallback: query without source column
|
|
const { data: membersFallback, error: fallbackError } = await serviceClient
|
|
.from('company_members')
|
|
.select('id, user_id, role, joined_at')
|
|
.eq('company_id', companyId)
|
|
.order('joined_at', { ascending: true })
|
|
|
|
if (fallbackError) {
|
|
return NextResponse.json({ error: 'Kunde inte hämta medlemmar.' }, { status: 500 })
|
|
}
|
|
members = (membersFallback || []).map((m) => ({ ...m, source: 'direct' as const }))
|
|
} else {
|
|
members = membersWithSource
|
|
}
|
|
|
|
// Fetch emails from profiles
|
|
const userIds = (members || []).map((m) => m.user_id)
|
|
const { data: profiles } = userIds.length > 0
|
|
? await serviceClient
|
|
.from('profiles')
|
|
.select('id, email')
|
|
.in('id', userIds)
|
|
: { data: [] }
|
|
|
|
const emailMap = new Map((profiles || []).map((p) => [p.id, p.email]))
|
|
|
|
// Fetch pending company invitations
|
|
const { data: invitations } = await serviceClient
|
|
.from('company_invitations')
|
|
.select('id, email, role, status, expires_at, created_at')
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'pending')
|
|
.order('created_at', { ascending: false })
|
|
|
|
// Get current user's role
|
|
const currentMember = members?.find((m) => m.user_id === user.id)
|
|
const canInvite = currentMember?.role === 'owner' || currentMember?.role === 'admin'
|
|
|
|
// Multi-user seat gate: when the company is frozen (no multi_user grant
|
|
// active or in grace), the invite POST answers 403, so the UI swaps the
|
|
// invite form for the paid-plan upsell instead of a dead form.
|
|
const multiUserAccess = canInvite
|
|
? await getMultiUserState(serviceClient, companyId)
|
|
: null
|
|
|
|
return NextResponse.json({
|
|
data: {
|
|
members: (members || []).map((m) => ({
|
|
id: m.id,
|
|
user_id: m.user_id,
|
|
email: emailMap.get(m.user_id) || '',
|
|
role: m.role,
|
|
source: m.source,
|
|
joined_at: m.joined_at,
|
|
is_current_user: m.user_id === user.id,
|
|
})),
|
|
invitations: invitations || [],
|
|
canInvite,
|
|
inviteRequiresUpgrade: multiUserAccess?.state === 'frozen',
|
|
},
|
|
})
|
|
})
|