* 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>
120 lines
5.2 KiB
PL/PgSQL
120 lines
5.2 KiB
PL/PgSQL
-- Multi-user paywall hardening (skeptic findings on 20260901081417):
|
|
--
|
|
-- 1. company_multi_user_state(): state-returning SECURITY DEFINER twin of
|
|
-- company_multi_user_ok. The capability_grants SELECT policy hides
|
|
-- team-scoped rows from users who are not on the team (byrå clients by
|
|
-- design, WL-08), so any app-side read through a user-scoped client
|
|
-- misreads a team-covered company as frozen. All app-side state checks go
|
|
-- through this function first; the raw grants read stays only as the
|
|
-- fallback for not-yet-migrated databases.
|
|
-- 2. Byrå teams get a standing team-scoped multi_user grant (backfill +
|
|
-- trigger): the codebase's WL-10 assumption is that byrå client companies
|
|
-- are entitled via the team agreement (their company-scoped trial is
|
|
-- deliberately suppressed), so a byrå team without grant rows would
|
|
-- freeze every consultant and client user. Billing for byrå partners is
|
|
-- out-of-band (partner agreement), matching seed_trial_capability_grants'
|
|
-- suppression rationale.
|
|
-- 3. Comped/manual companies (active company-scoped comp/manual grants on
|
|
-- the pre-existing PAID keys) extend to multi_user: a hand-comped
|
|
-- multi-member company must not read as paying while locking out its
|
|
-- second user.
|
|
|
|
-- ============================================================================
|
|
-- 1. company_multi_user_state(company, grace_days)
|
|
-- ============================================================================
|
|
CREATE OR REPLACE FUNCTION public.company_multi_user_state(p_company_id uuid, p_grace_days integer)
|
|
RETURNS TABLE(state text, grace_ends_at timestamptz)
|
|
LANGUAGE sql
|
|
STABLE SECURITY DEFINER
|
|
SET search_path TO 'public'
|
|
AS $function$
|
|
WITH grant_rows AS (
|
|
SELECT cg.expires_at
|
|
FROM public.capability_grants cg
|
|
WHERE cg.capability_key = 'multi_user'
|
|
AND (
|
|
cg.company_id = p_company_id
|
|
OR cg.team_id = (SELECT c.team_id FROM public.companies c WHERE c.id = p_company_id)
|
|
)
|
|
),
|
|
agg AS (
|
|
SELECT
|
|
COALESCE(bool_or(gr.expires_at IS NULL OR gr.expires_at > now()), false) AS entitled,
|
|
max(gr.expires_at) AS newest_expiry
|
|
FROM grant_rows gr
|
|
)
|
|
SELECT
|
|
CASE
|
|
WHEN a.entitled THEN 'entitled'
|
|
WHEN a.newest_expiry IS NOT NULL
|
|
AND a.newest_expiry + make_interval(days => GREATEST(p_grace_days, 0)) > now() THEN 'grace'
|
|
ELSE 'frozen'
|
|
END AS state,
|
|
CASE
|
|
WHEN NOT a.entitled
|
|
AND a.newest_expiry IS NOT NULL
|
|
AND a.newest_expiry + make_interval(days => GREATEST(p_grace_days, 0)) > now()
|
|
THEN a.newest_expiry + make_interval(days => GREATEST(p_grace_days, 0))
|
|
ELSE NULL
|
|
END AS grace_ends_at
|
|
FROM agg a;
|
|
$function$;
|
|
|
|
REVOKE ALL ON FUNCTION public.company_multi_user_state(uuid, integer) FROM PUBLIC, anon;
|
|
GRANT EXECUTE ON FUNCTION public.company_multi_user_state(uuid, integer) TO authenticated, service_role;
|
|
|
|
-- ============================================================================
|
|
-- 2. Byrå team standing grant: backfill + trigger for future teams
|
|
-- ============================================================================
|
|
INSERT INTO public.capability_grants (team_id, capability_key, source, expires_at, metadata)
|
|
SELECT t.id, 'multi_user', 'manual', NULL,
|
|
jsonb_build_object('reason', 'byra_team_default')
|
|
FROM public.teams t
|
|
WHERE t.kind = 'byra'
|
|
AND NOT EXISTS (
|
|
SELECT 1 FROM public.capability_grants g
|
|
WHERE g.team_id = t.id
|
|
AND g.capability_key = 'multi_user'
|
|
AND (g.expires_at IS NULL OR g.expires_at > now())
|
|
)
|
|
ON CONFLICT (company_id, team_id, capability_key, source) DO NOTHING;
|
|
|
|
CREATE OR REPLACE FUNCTION public.seed_byra_team_multi_user()
|
|
RETURNS trigger
|
|
LANGUAGE plpgsql
|
|
SECURITY DEFINER
|
|
SET search_path = public
|
|
AS $$
|
|
BEGIN
|
|
IF NEW.kind = 'byra' THEN
|
|
INSERT INTO public.capability_grants (team_id, capability_key, source, expires_at, metadata)
|
|
VALUES (NEW.id, 'multi_user', 'manual', NULL, jsonb_build_object('reason', 'byra_team_default'))
|
|
ON CONFLICT (company_id, team_id, capability_key, source) DO NOTHING;
|
|
END IF;
|
|
RETURN NEW;
|
|
END;
|
|
$$;
|
|
|
|
DROP TRIGGER IF EXISTS trg_seed_byra_team_multi_user ON public.teams;
|
|
CREATE TRIGGER trg_seed_byra_team_multi_user
|
|
AFTER INSERT OR UPDATE OF kind ON public.teams
|
|
FOR EACH ROW EXECUTE FUNCTION public.seed_byra_team_multi_user();
|
|
|
|
-- ============================================================================
|
|
-- 3. Comped/manual companies extend to multi_user
|
|
-- ============================================================================
|
|
INSERT INTO public.capability_grants (company_id, capability_key, source, expires_at, metadata)
|
|
SELECT cg.company_id, 'multi_user', 'comp',
|
|
CASE WHEN bool_or(cg.expires_at IS NULL) THEN NULL ELSE max(cg.expires_at) END,
|
|
jsonb_build_object('backfill', 'multi_user_launch_comp')
|
|
FROM public.capability_grants cg
|
|
WHERE cg.company_id IS NOT NULL
|
|
AND cg.source IN ('comp', 'manual')
|
|
AND cg.capability_key IN
|
|
('ai', 'bank_sync', 'skatteverket', 'email_send', 'stripe_payments', 'woocommerce_sync', 'shopify_sync')
|
|
GROUP BY cg.company_id
|
|
HAVING bool_or(cg.expires_at IS NULL OR cg.expires_at > now())
|
|
ON CONFLICT (company_id, team_id, capability_key, source) DO NOTHING;
|
|
|
|
NOTIFY pgrst, 'reload schema';
|