aabddb592f
* 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>
245 lines
9.8 KiB
TypeScript
245 lines
9.8 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useRef, useEffect, useCallback } from 'react'
|
|
import { createPortal } from 'react-dom'
|
|
import Link from 'next/link'
|
|
import { useTranslations } from 'next-intl'
|
|
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, Lock } from 'lucide-react'
|
|
|
|
export default function CompanySwitcher() {
|
|
const { company, companies, isSandbox, foreignCompanies = [], lockedCompanyIds = [] } = useCompany()
|
|
const t = useTranslations('company_switcher')
|
|
const { toast } = useToast()
|
|
const [open, setOpen] = useState(false)
|
|
const [isPending, setIsPending] = useState(false)
|
|
const triggerRef = useRef<HTMLButtonElement>(null)
|
|
const dropdownRef = useRef<HTMLDivElement>(null)
|
|
const [dropdownPos, setDropdownPos] = useState({ top: 0, left: 0 })
|
|
|
|
const updatePosition = useCallback(() => {
|
|
if (!triggerRef.current || !dropdownRef.current) return
|
|
const triggerRect = triggerRef.current.getBoundingClientRect()
|
|
const dropdownRect = dropdownRef.current.getBoundingClientRect()
|
|
const margin = 8
|
|
|
|
let top = triggerRect.bottom + 4
|
|
let left = triggerRect.left
|
|
|
|
// Clamp right edge to viewport
|
|
if (left + dropdownRect.width > window.innerWidth - margin) {
|
|
left = Math.max(margin, window.innerWidth - dropdownRect.width - margin)
|
|
}
|
|
|
|
// If dropdown would go below viewport, show above trigger
|
|
if (top + dropdownRect.height > window.innerHeight - margin) {
|
|
top = Math.max(margin, triggerRect.top - dropdownRect.height - 4)
|
|
}
|
|
|
|
setDropdownPos({ top, left })
|
|
}, [])
|
|
|
|
// Update position when opening (run twice: once to render, once to measure)
|
|
useEffect(() => {
|
|
if (!open) return
|
|
const raf = requestAnimationFrame(() => updatePosition())
|
|
return () => cancelAnimationFrame(raf)
|
|
}, [open, updatePosition])
|
|
|
|
// Close on outside click
|
|
useEffect(() => {
|
|
if (!open) return
|
|
function handleClick(e: MouseEvent) {
|
|
const target = e.target as Node
|
|
if (
|
|
(!triggerRef.current || !triggerRef.current.contains(target)) &&
|
|
(!dropdownRef.current || !dropdownRef.current.contains(target))
|
|
) {
|
|
setOpen(false)
|
|
}
|
|
}
|
|
document.addEventListener('mousedown', handleClick)
|
|
return () => document.removeEventListener('mousedown', handleClick)
|
|
}, [open])
|
|
|
|
// Close on Escape
|
|
useEffect(() => {
|
|
if (!open) return
|
|
function handleKey(e: KeyboardEvent) {
|
|
if (e.key === 'Escape') setOpen(false)
|
|
}
|
|
document.addEventListener('keydown', handleKey)
|
|
return () => document.removeEventListener('keydown', handleKey)
|
|
}, [open])
|
|
|
|
const handleSwitch = async (companyId: string) => {
|
|
if (company && companyId === company.id) {
|
|
setOpen(false)
|
|
return
|
|
}
|
|
setIsPending(true)
|
|
// Shared switch-and-reload mechanism (lib/company/switch-client), same
|
|
// path as the sidebar user-menu flyout.
|
|
const result = await performCompanySwitch(companyId)
|
|
if (result?.error) {
|
|
setIsPending(false)
|
|
toast({
|
|
title: t(
|
|
result.error === 'not_member'
|
|
? 'error_no_access'
|
|
: result.error === 'company_locked'
|
|
? 'error_locked'
|
|
: 'error_switch_failed',
|
|
),
|
|
variant: 'destructive',
|
|
})
|
|
}
|
|
}
|
|
|
|
// Always allow opening the dropdown (to show "Lägg till företag")
|
|
const hasMultiple = companies.length > 1
|
|
|
|
// No companies yet: show a direct "Lägg till företag" link instead of
|
|
// the switcher so the user can still create one. Hidden in sandbox mode.
|
|
if (!company && companies.length === 0) {
|
|
if (isSandbox) return null
|
|
return (
|
|
<Link
|
|
href="/select-company?choose=1"
|
|
className="flex items-center gap-2 w-full text-left rounded-lg border border-dashed border-border/60 hover:border-foreground/30 hover:bg-muted/40 -mx-1 px-2 py-1.5 transition-colors duration-150"
|
|
>
|
|
<Plus className="h-3.5 w-3.5 text-muted-foreground flex-shrink-0" />
|
|
<span className="text-[13px] text-muted-foreground truncate">{t('add_company')}</span>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<div>
|
|
<button
|
|
ref={triggerRef}
|
|
onClick={() => setOpen(!open)}
|
|
className="flex items-center gap-1.5 w-full text-left rounded-lg border border-transparent hover:border-border/60 hover:bg-muted/40 -mx-1 px-2 py-1.5 transition-colors duration-150"
|
|
aria-expanded={open}
|
|
aria-haspopup="listbox"
|
|
>
|
|
<div className="flex-1 min-w-0">
|
|
<p className="text-[10px] text-muted-foreground/60 uppercase tracking-[0.06em] leading-none mb-1">{t('company_label')}</p>
|
|
<p className="text-[13px] font-semibold text-foreground truncate tracking-[-0.01em]">
|
|
{company?.name || t('default_company_name')}
|
|
</p>
|
|
</div>
|
|
<ChevronsUpDown className="h-3 w-3 text-muted-foreground flex-shrink-0" />
|
|
</button>
|
|
|
|
{open && createPortal(
|
|
<div
|
|
ref={dropdownRef}
|
|
className="fixed min-w-56 w-max max-w-[calc(100vw-1rem)] bg-card border border-border/60 rounded-lg shadow-lg z-[60] py-1 animate-in fade-in slide-in-from-top-1 duration-150"
|
|
style={{ top: dropdownPos.top, left: dropdownPos.left }}
|
|
>
|
|
{companies.length > 0 && (
|
|
<>
|
|
{hasMultiple && (
|
|
<div className="px-2 py-1.5">
|
|
<p className="text-[10px] font-semibold text-muted-foreground uppercase tracking-[0.08em] px-1.5">
|
|
{t('company_label')}
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="max-h-48 overflow-y-auto px-1">
|
|
{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)}
|
|
disabled={isPending}
|
|
className={cn(
|
|
'flex items-center gap-2 w-full px-2.5 py-2 text-left text-[13px] leading-snug transition-colors rounded-sm md:whitespace-nowrap',
|
|
c.id === company?.id
|
|
? 'text-foreground bg-muted/40'
|
|
: 'text-muted-foreground hover:text-foreground hover:bg-muted/40',
|
|
isPending && 'opacity-50',
|
|
)}
|
|
role="option"
|
|
aria-selected={c.id === company?.id}
|
|
>
|
|
<span className="flex-1 min-w-0">{c.name}</span>
|
|
{role !== 'owner' && (
|
|
<span className="text-[10px] text-muted-foreground/60 flex-shrink-0">
|
|
{role}
|
|
</span>
|
|
)}
|
|
{c.id === company?.id && (
|
|
<Check className="h-3.5 w-3.5 text-primary flex-shrink-0" />
|
|
)}
|
|
{isPending && c.id !== company?.id && (
|
|
<Loader2 className="h-3 w-3 animate-spin text-muted-foreground flex-shrink-0" />
|
|
)}
|
|
</button>
|
|
),
|
|
)}
|
|
</div>
|
|
</>
|
|
)}
|
|
|
|
{/* Companies homed on another domain (home-domain rule, WL-01):
|
|
non-clickable signposts; the company is worked in over there. */}
|
|
{foreignCompanies.length > 0 && (
|
|
<div className="border-t border-border/40 mt-1 pt-1 px-1">
|
|
<p className="px-2.5 pt-1 pb-0.5 text-[10px] font-semibold text-muted-foreground/60 uppercase tracking-[0.08em]">
|
|
{t('managed_elsewhere')}
|
|
</p>
|
|
{foreignCompanies.map((entry) => (
|
|
<div
|
|
key={entry.id}
|
|
className="px-2.5 py-1.5 text-[12px] leading-snug text-muted-foreground/60"
|
|
aria-disabled="true"
|
|
>
|
|
<span className="block truncate">{entry.name}</span>
|
|
<span className="block truncate text-[10px]">
|
|
{t('managed_via', { domain: entry.domain })}
|
|
</span>
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{!isSandbox && (
|
|
<div className={cn((companies.length > 0 || foreignCompanies.length > 0) && 'border-t border-border/40 mt-1 pt-1', 'px-1')}>
|
|
<Link
|
|
href="/select-company?choose=1"
|
|
onClick={() => setOpen(false)}
|
|
className="flex items-center gap-2 px-2.5 py-2 text-[13px] text-muted-foreground hover:text-foreground hover:bg-muted/40 rounded-sm transition-colors md:whitespace-nowrap"
|
|
>
|
|
<Plus className="h-3.5 w-3.5" />
|
|
{t('add_company')}
|
|
</Link>
|
|
</div>
|
|
)}
|
|
</div>,
|
|
document.body
|
|
)}
|
|
</div>
|
|
)
|
|
}
|