feat(billing): multi-user paywall: multi_user capability, 20-day grace, owner-only dormancy (#2099)
* 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>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
ca12b1855e
commit
aabddb592f
@@ -0,0 +1,66 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useState } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { useTranslations } from 'next-intl'
|
||||
|
||||
/**
|
||||
* Multi-user grace countdown: shown to EVERYONE in a company whose
|
||||
* multi_user entitlement has lapsed but is still inside its 20-day grace
|
||||
* window, and only when the company actually has affected people (at least
|
||||
* one non-owner member). The affected member reads their own version; the
|
||||
* owner (and everyone else) reads which accounts pause and when.
|
||||
*
|
||||
* Server-gated: the dashboard layout renders this only in the grace state
|
||||
* with a non-empty affected list, so the component itself only formats.
|
||||
* Same chrome treatment as SandboxBanner: environment notice on secondary,
|
||||
* never a warning fill (status colors are data, not chrome).
|
||||
*/
|
||||
export function MultiUserGraceBanner({
|
||||
graceEndsAt,
|
||||
affectedEmails,
|
||||
isAffectedUser,
|
||||
companyName,
|
||||
}: {
|
||||
graceEndsAt: string
|
||||
affectedEmails: string[]
|
||||
/** True when the signed-in user is one of the accounts that will pause. */
|
||||
isAffectedUser: boolean
|
||||
companyName: string
|
||||
}) {
|
||||
const t = useTranslations('multi_user')
|
||||
|
||||
// Computed in an effect so server and client markup agree at hydration;
|
||||
// an hourly tick keeps a long-lived tab honest (same pattern as
|
||||
// SubscriptionTouchpoint).
|
||||
const [daysLeft, setDaysLeft] = useState<number | null>(null)
|
||||
useEffect(() => {
|
||||
const update = () => {
|
||||
const msLeft = new Date(graceEndsAt).getTime() - Date.now()
|
||||
setDaysLeft(Math.max(0, Math.ceil(msLeft / 86_400_000)))
|
||||
}
|
||||
update()
|
||||
const id = setInterval(update, 3_600_000)
|
||||
return () => clearInterval(id)
|
||||
}, [graceEndsAt])
|
||||
|
||||
if (daysLeft === null) return null
|
||||
|
||||
const message = isAffectedUser
|
||||
? t('banner_affected', { companyName, days: daysLeft })
|
||||
: t('banner_owner', { emails: affectedEmails.join(', '), days: daysLeft })
|
||||
|
||||
return (
|
||||
<div className="relative z-50 flex flex-wrap items-center justify-center gap-x-3 gap-y-1 border-b border-border bg-secondary px-4 py-2 text-sm text-secondary-foreground">
|
||||
<span className="text-center text-xs font-medium sm:text-sm">{message}</span>
|
||||
<Link
|
||||
href="/settings/billing"
|
||||
className="shrink-0 rounded-full bg-foreground/10 px-3 py-0.5 text-xs font-semibold transition-colors hover:bg-foreground/15"
|
||||
>
|
||||
{t('banner_cta')}
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default MultiUserGraceBanner
|
||||
@@ -8,10 +8,10 @@ import { cn } from '@/lib/utils'
|
||||
import { useCompany } from '@/contexts/CompanyContext'
|
||||
import { performCompanySwitch } from '@/lib/company/switch-client'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { Check, ChevronsUpDown, Plus, Loader2 } from 'lucide-react'
|
||||
import { Check, ChevronsUpDown, Plus, Loader2, Lock } from 'lucide-react'
|
||||
|
||||
export default function CompanySwitcher() {
|
||||
const { company, companies, isSandbox, foreignCompanies = [] } = useCompany()
|
||||
const { company, companies, isSandbox, foreignCompanies = [], lockedCompanyIds = [] } = useCompany()
|
||||
const t = useTranslations('company_switcher')
|
||||
const { toast } = useToast()
|
||||
const [open, setOpen] = useState(false)
|
||||
@@ -87,7 +87,13 @@ export default function CompanySwitcher() {
|
||||
if (result?.error) {
|
||||
setIsPending(false)
|
||||
toast({
|
||||
title: t(result.error === 'not_member' ? 'error_no_access' : 'error_switch_failed'),
|
||||
title: t(
|
||||
result.error === 'not_member'
|
||||
? 'error_no_access'
|
||||
: result.error === 'company_locked'
|
||||
? 'error_locked'
|
||||
: 'error_switch_failed',
|
||||
),
|
||||
variant: 'destructive',
|
||||
})
|
||||
}
|
||||
@@ -146,7 +152,23 @@ export default function CompanySwitcher() {
|
||||
)}
|
||||
|
||||
<div className="max-h-48 overflow-y-auto px-1">
|
||||
{companies.map(({ company: c, role }) => (
|
||||
{companies.map(({ company: c, role }) =>
|
||||
lockedCompanyIds.includes(c.id) ? (
|
||||
// Multi-user seat gate: frozen for this user until the
|
||||
// company pays. Shown, not hidden: the membership exists
|
||||
// and the row explains why it cannot be entered.
|
||||
<div
|
||||
key={c.id}
|
||||
className="flex items-center gap-2 w-full px-2.5 py-2 text-left text-[13px] leading-snug text-muted-foreground/60 rounded-sm md:whitespace-nowrap"
|
||||
aria-disabled="true"
|
||||
>
|
||||
<span className="flex-1 min-w-0">
|
||||
<span className="block truncate">{c.name}</span>
|
||||
<span className="block truncate text-[10px]">{t('locked_note')}</span>
|
||||
</span>
|
||||
<Lock className="h-3 w-3 flex-shrink-0" aria-hidden="true" />
|
||||
</div>
|
||||
) : (
|
||||
<button
|
||||
key={c.id}
|
||||
onClick={() => handleSwitch(c.id)}
|
||||
@@ -174,7 +196,8 @@ export default function CompanySwitcher() {
|
||||
<Loader2 className="h-3 w-3 animate-spin text-muted-foreground flex-shrink-0" />
|
||||
)}
|
||||
</button>
|
||||
))}
|
||||
),
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useEffect, useCallback } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { useLocale, useTranslations } from 'next-intl'
|
||||
import { AttnLine } from '@/components/ui/attn-line'
|
||||
import { Button } from '@/components/ui/button'
|
||||
@@ -81,6 +82,10 @@ export function CompanyMembersSection() {
|
||||
const [removingId, setRemovingId] = useState<string | null>(null)
|
||||
const [revokingId, setRevokingId] = useState<string | null>(null)
|
||||
const [canInvite, setCanInvite] = useState(false)
|
||||
// Multi-user seat gate: true when inviting requires the paid plan
|
||||
// (multi_user frozen). The form is swapped for the upsell line; the POST's
|
||||
// own 403 stays the real enforcement.
|
||||
const [inviteRequiresUpgrade, setInviteRequiresUpgrade] = useState(false)
|
||||
const [shareInvite, setShareInvite] = useState<ShareableInvite | null>(null)
|
||||
|
||||
const fetchMembers = useCallback(async () => {
|
||||
@@ -118,6 +123,7 @@ export function CompanyMembersSection() {
|
||||
setMembers(parsed.members)
|
||||
setInvitations(parsed.invitations)
|
||||
setCanInvite(parsed.canInvite)
|
||||
setInviteRequiresUpgrade(parsed.inviteRequiresUpgrade)
|
||||
} catch {
|
||||
setMembers(null)
|
||||
setInvitations(null)
|
||||
@@ -374,8 +380,22 @@ export function CompanyMembersSection() {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Multi-user seat gate: no invite form without the paid plan. One
|
||||
muted sentence with the billing link, not a dead form. */}
|
||||
{canInvite && inviteRequiresUpgrade && (
|
||||
<p className="px-1 pt-3 text-[12.5px] leading-5 text-muted-foreground">
|
||||
{t('members_invite_upgrade')}{' '}
|
||||
<Link
|
||||
href="/settings/billing"
|
||||
className="underline underline-offset-2 hover:text-foreground"
|
||||
>
|
||||
{t('members_invite_upgrade_cta')}
|
||||
</Link>
|
||||
</p>
|
||||
)}
|
||||
|
||||
{/* Inline invite: the list's own last row instead of a separate card. */}
|
||||
{canInvite && (
|
||||
{canInvite && !inviteRequiresUpgrade && (
|
||||
<form onSubmit={handleInvite} className="flex flex-col gap-3 px-1 pt-3 sm:flex-row sm:items-center">
|
||||
<label htmlFor="company-invite-email" className="sr-only">
|
||||
{t('members_invite_email_label')}
|
||||
|
||||
@@ -23,13 +23,14 @@ describe('parseCompanyMembersPayload', () => {
|
||||
members: [{ id: 'm1', email: 'anna@example.se' }],
|
||||
invitations: [{ id: 'i1', email: 'bo@example.se' }],
|
||||
canInvite: true,
|
||||
inviteRequiresUpgrade: false,
|
||||
})
|
||||
})
|
||||
|
||||
it('accepts a confirmed-empty roster (that is data, not a failure)', () => {
|
||||
expect(
|
||||
parseCompanyMembersPayload({ data: { members: [], invitations: [], canInvite: false } }),
|
||||
).toEqual({ members: [], invitations: [], canInvite: false })
|
||||
).toEqual({ members: [], invitations: [], canInvite: false, inviteRequiresUpgrade: false })
|
||||
})
|
||||
|
||||
it('rejects a 200 with no data envelope instead of fabricating an empty roster', () => {
|
||||
@@ -50,7 +51,22 @@ describe('parseCompanyMembersPayload', () => {
|
||||
// A truthy non-boolean must not unlock the invite form.
|
||||
expect(
|
||||
parseCompanyMembersPayload({ data: { members: [], invitations: [], canInvite: 'yes' } }),
|
||||
).toEqual({ members: [], invitations: [], canInvite: false })
|
||||
).toEqual({ members: [], invitations: [], canInvite: false, inviteRequiresUpgrade: false })
|
||||
})
|
||||
|
||||
it('only swaps the invite form for the upsell on an explicit boolean true', () => {
|
||||
// Multi-user seat gate: an older server without the field (or junk) keeps
|
||||
// the form; the invite POST's own 403 is the real enforcement.
|
||||
expect(
|
||||
parseCompanyMembersPayload({
|
||||
data: { members: [], invitations: [], canInvite: true, inviteRequiresUpgrade: 'yes' },
|
||||
}),
|
||||
).toEqual({ members: [], invitations: [], canInvite: true, inviteRequiresUpgrade: false })
|
||||
expect(
|
||||
parseCompanyMembersPayload({
|
||||
data: { members: [], invitations: [], canInvite: true, inviteRequiresUpgrade: true },
|
||||
}),
|
||||
).toEqual({ members: [], invitations: [], canInvite: true, inviteRequiresUpgrade: true })
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -17,19 +17,29 @@ export interface CompanyMembersPayload<M, I> {
|
||||
members: M[]
|
||||
invitations: I[]
|
||||
canInvite: boolean
|
||||
/** Multi-user seat gate: swap the invite form for the paid-plan upsell. */
|
||||
inviteRequiresUpgrade: boolean
|
||||
}
|
||||
|
||||
export function parseCompanyMembersPayload<M, I>(body: unknown): CompanyMembersPayload<M, I> | null {
|
||||
if (typeof body !== 'object' || body === null) return null
|
||||
const data = (body as { data?: unknown }).data
|
||||
if (typeof data !== 'object' || data === null) return null
|
||||
const d = data as { members?: unknown; invitations?: unknown; canInvite?: unknown }
|
||||
const d = data as {
|
||||
members?: unknown
|
||||
invitations?: unknown
|
||||
canInvite?: unknown
|
||||
inviteRequiresUpgrade?: unknown
|
||||
}
|
||||
if (!Array.isArray(d.members) || !Array.isArray(d.invitations)) return null
|
||||
return {
|
||||
members: d.members as M[],
|
||||
invitations: d.invitations as I[],
|
||||
// Only an explicit boolean true unlocks the invite form.
|
||||
canInvite: d.canInvite === true,
|
||||
// Only an explicit true swaps the form for the upsell: an older server
|
||||
// without the field keeps the form, and the POST's own 403 still guards.
|
||||
inviteRequiresUpgrade: d.inviteRequiresUpgrade === true,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import { useBranding } from '@/lib/branding/brand-context'
|
||||
// capability in lib/entitlements/keys.ts (ai, bank_sync, skatteverket,
|
||||
// email_send, stripe_payments, woocommerce_sync + shopify_sync as one
|
||||
// "webshop" item). Keep in step with PAID_CAPABILITIES when a key is added.
|
||||
const UNLOCK_KEYS = ['unlock_ai', 'unlock_bank', 'unlock_skv', 'unlock_email', 'unlock_payments', 'unlock_webshop'] as const
|
||||
const UNLOCK_KEYS = ['unlock_ai', 'unlock_bank', 'unlock_skv', 'unlock_email', 'unlock_payments', 'unlock_webshop', 'unlock_users'] as const
|
||||
|
||||
// Mirrors the checkout route's deferred-first-charge condition (Stripe's 48h
|
||||
// trial_end floor plus clock margin). Above this, checkout collects the card
|
||||
|
||||
Reference in New Issue
Block a user