Files
accounted/app/(onboarding)/select-company/page.tsx
T
Jakob WennbergandClaude Fable 5 15300aa8e2 fix(invites): accept invite on BankID signup, recover missed invites on onboarding surfaces (#1157)
An invited user who registered via BankID was funneled into creating a
company instead of joining the one they were invited to: the register
page's BankID path never processed the gnubok-invite-token cookie
(unlike the login, MFA-verify, and auth-callback paths). Observed in
production 2026-07-24.

- register: BankID signup now accepts the pending invite before routing
  to /select-company, mirroring the login page's BankID path.
- lib/company/pending-invites: acceptPendingInviteByToken retries a
  missed acceptance from the cookie (pending + unexpired + email match,
  same rules as POST /api/team/accept); hasPendingInviteForEmail detects
  a stranded invitee whose cookie is gone.
- /onboarding and /select-company retry acceptance from the cookie and
  redirect to the dashboard on success, making the auth callback's
  long-promised fallback real; with no cookie but a pending invitation,
  both surfaces show a 'join via the link in the invitation email' hint
  instead of silently asking the invitee to create a company.
- No new accept path without the token: the hint deliberately points
  back to the mailed link, so mailbox possession stays required and no
  company name is leaked to unverified emails.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-07-24 19:36:09 +02:00

196 lines
6.8 KiB
TypeScript

import { cookies } from 'next/headers'
import { redirect } from 'next/navigation'
import { createClient, createServiceClient } from '@/lib/supabase/server'
import {
acceptPendingInviteByToken,
hasPendingInviteForEmail,
} from '@/lib/company/pending-invites'
import type { EnrichmentCompanyRole } from '@/lib/company-lookup/types'
import BankIdCompanyPicker, {
type MemberCompany,
type TicPickerCompany,
} from '@/components/onboarding/BankIdCompanyPicker'
export const dynamic = 'force-dynamic'
const ENRICHMENT_TTL_DAYS = 7
export default async function SelectCompanyPage() {
const supabase = await createClient()
const { data: { user } } = await supabase.auth.getUser()
if (!user) {
redirect('/login')
}
// Invite recovery, same as /onboarding: BankID users land here, so a missed
// invite acceptance (e.g. a register flow that dropped the cookie handling)
// gets retried before the picker funnels the invitee into creating a company.
const inviteToken = (await cookies()).get('gnubok-invite-token')?.value
if (inviteToken && (await acceptPendingInviteByToken(user, inviteToken))) {
redirect('/')
}
// All lookups key only on user.id/email, one parallel batch instead of
// serial round-trips on the post-BankID-login landing page.
const [
// Existing Accounted memberships.
{ data: memberships },
{ data: teamMembership },
// Greeting name.
{ data: profile },
// BankID enrichment (CompanyRoles from Bolagsverket via TIC). Stored
// user-keyed in `bankid_enrichment` because it lands before company
// selection, see fetchAndStoreEnrichment in the tic extension.
{ data: enrichmentRow },
// Pending invitation for this email with no cookie to accept it from:
// rendered as a "check your invite email" hint in the picker.
hasPendingInvite,
] = await Promise.all([
supabase
.from('company_members')
.select(`
role,
company:company_id (
id,
name,
org_number,
entity_type,
archived_at
)
`)
.eq('user_id', user.id)
.order('joined_at', { ascending: true }),
supabase
.from('team_members')
.select('team_id')
.eq('user_id', user.id)
.limit(1)
.maybeSingle(),
supabase.from('profiles').select('full_name').eq('id', user.id).single(),
supabase
.from('bankid_enrichment')
.select('company_roles, created_at, updated_at')
.eq('user_id', user.id)
.maybeSingle(),
user.email ? hasPendingInviteForEmail(user.email) : Promise.resolve(false),
])
type CompanyRow = {
id: string
name: string
org_number: string | null
entity_type: string | null
archived_at: string | null
}
const memberCompanies: MemberCompany[] = ((memberships ?? []) as unknown as Array<{
role: string
// Supabase's generated types can express this as either a single object
// or an array depending on the relationship graph; handle both shapes.
company: CompanyRow | CompanyRow[] | null
}>)
.map((m) => ({
role: m.role,
company: Array.isArray(m.company) ? m.company[0] ?? null : m.company,
}))
.filter((m): m is { role: string; company: CompanyRow } => !!m.company && !m.company.archived_at)
.map((m) => ({
id: m.company.id,
name: m.company.name,
orgNumber: m.company.org_number,
entityType: m.company.entity_type,
role: m.role,
}))
const memberOrgNumbers = new Set(
memberCompanies
.map((c) => (c.orgNumber ? c.orgNumber.replace(/[\s-]/g, '') : null))
.filter((n): n is string => !!n),
)
// Ensure the user has a team (same pattern as /onboarding).
let teamId = teamMembership?.team_id
if (!teamId) {
const { data: ensured } = await supabase.rpc('ensure_user_team')
teamId = ensured ?? null
}
if (!teamId) {
redirect('/login')
}
const firstName = profile?.full_name?.split(' ')[0] ?? null
const enrichmentValue = enrichmentRow
? { companyRoles: enrichmentRow.company_roles as EnrichmentCompanyRole[] }
: null
// "Currently a director" = no position end date. We deliberately do NOT
// also require companyStatus === 'Aktivt': real TIC payloads have been
// observed with other values (locale/tenant variants), and filtering too
// strictly silently hides the user's real directorships.
//
// Ceased/struck-off companies would still render here, but two later
// guards block provisioning:
// 1. BankIdCompanyPicker calls TIC /lookup before provisioning and
// short-circuits with a toast when isCeased=true.
// 2. createCompanyFromTicRole refuses to provision when lookup.isCeased.
// Both guards are required: don't remove one without removing both.
//
// Loose `== null` on purpose: TIC payloads have been observed returning
// `undefined` for open-ended positions, which `=== null` would miss.
const activeRoles = (enrichmentValue?.companyRoles ?? []).filter(
(r) => r.positionEnd == null,
)
// Drop TIC roles that already appear in the user's Accounted memberships:
// those render via the "Your Accounted companies" section above instead.
const rolesNotAlreadyMine = activeRoles.filter(
(r) => !memberOrgNumbers.has(r.companyRegistrationNumber.replace(/[\s-]/g, '')),
)
// Cross-reference remaining TIC org numbers against the global companies
// table to detect "exists in Accounted, user not a member" cases. Use the
// service client: RLS filters out companies the user isn't a member of,
// which is exactly the data we need. Scoped to the specific org numbers.
let externallyOwnedOrgs = new Set<string>()
if (rolesNotAlreadyMine.length > 0) {
const service = createServiceClient()
const orgNumbers = rolesNotAlreadyMine.map((r) =>
r.companyRegistrationNumber.replace(/[\s-]/g, ''),
)
const { data: rows } = await service
.from('companies')
.select('org_number')
.in('org_number', orgNumbers)
.is('archived_at', null)
externallyOwnedOrgs = new Set(
(rows ?? []).map((r: { org_number: string | null }) => r.org_number ?? '').filter(Boolean),
)
}
const ticCompanies: TicPickerCompany[] = rolesNotAlreadyMine.map((role) => {
const cleaned = role.companyRegistrationNumber.replace(/[\s-]/g, '')
return {
role,
status: externallyOwnedOrgs.has(cleaned) ? 'exists' : 'new',
}
})
const enrichmentTimestamp = enrichmentRow?.updated_at ?? enrichmentRow?.created_at ?? null
const enrichmentStale = enrichmentTimestamp
? Date.now() - new Date(enrichmentTimestamp).getTime() > ENRICHMENT_TTL_DAYS * 24 * 60 * 60 * 1000
: false
return (
<BankIdCompanyPicker
firstName={firstName}
teamId={teamId}
memberCompanies={memberCompanies}
ticCompanies={ticCompanies}
enrichmentStale={enrichmentStale}
hasPendingInvite={hasPendingInvite}
/>
)
}