feat: multi-tenant company refactor (GNU-19) (#153)
* feat: multi-tenant company refactor (GNU-19) Introduce companies table, company_members, and user_preferences to support multiple companies per user. All data scoping changes from user_id to company_id across the entire codebase. Key changes: - Database migration: new tables, company_id on 40+ tables, backfill, RLS rewrite from user_id to company-member-based, updated RPCs - Types: Company, CompanyMember, CompanyRole, UserPreferences types; company_id added to all entity interfaces; companyId on all events - Engine: all 7 core functions take companyId; storno, period, year-end services updated; 16 report generators updated - Middleware: company context resolution (cookie → prefs → first company) - API routes: ~120 routes updated with requireCompanyId() - Frontend: CompanyProvider context, layout/dashboard/onboarding updated - Extensions: context factory, 9 extensions, all lib files updated - Tests: 1880 tests passing, all helpers updated with company_id defaults Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add database migrations for multi-tenant company and team system (GNU-19) Adds company_invitations, company creation RPC, team_members, account deletion RPC, and teams table refactor migrations. Updates base multi-tenant migration with cascading FKs and onboarding_step column. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add team types and update core infrastructure for multi-tenancy (GNU-19) Adds TeamRole, MemberSource, and Team types. Refactors Supabase service client to be stateless, updates middleware for team-aware routing, extends CompanyContext with team/role fields, and updates extension service types to accept companyId. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: thread company_id through business logic functions (GNU-19) Replaces user_id scoping with company_id across all lib modules: bookkeeping, documents, transactions, invoices, reconciliation, tax, deadlines, and import. Updates corresponding tests. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: thread company_id through API routes and extensions (GNU-19) Updates all existing API routes to extract and pass companyId. Updates enable-banking and arcim-migration extensions for company-scoped transaction ingestion and sync. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add company and team management API routes (GNU-19) Adds CRUD endpoints for company members, company invitations, team members, and team invitations. Includes invite token utilities, email templates, and company switch server action. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add team/company UI components, pages, and dashboard updates (GNU-19) Adds CompanySwitcher, ConsultantEmptyState, Step0RoleChoice, company members and team management panels. Updates dashboard layout for team-aware routing, onboarding for multi-step role choice, and auth callback for team invite acceptance. Ignores supabase/.branches/. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add null guards for company in import page (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: move appUrl declaration to outer scope in invite route (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add optional chaining for company.name in members section (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add optional chaining for second company.name in members section (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add null guards for company in extension components (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: pass companyId to executeSIEImport in arcim-migration extension (GNU-19) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update tests to use companyId instead of userId and improve type handling --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Opus 4.6
Claude Opus 4.6
parent
1756af6c5e
commit
0dd1f5ebc1
@@ -0,0 +1,133 @@
|
||||
import { createClient, createServiceClient } from '@/lib/supabase/server'
|
||||
import { NextResponse, type NextRequest } from 'next/server'
|
||||
import { hashInviteToken } from '@/lib/auth/invite-tokens'
|
||||
|
||||
/**
|
||||
* GET /api/team/accept?token=xxx
|
||||
* Validates an invite token and returns invite info (for the invite page).
|
||||
* Only company invitations are supported — team invitations are disabled.
|
||||
* No auth required — this is a public endpoint.
|
||||
*/
|
||||
export async function GET(request: NextRequest) {
|
||||
const token = request.nextUrl.searchParams.get('token')
|
||||
if (!token) {
|
||||
return NextResponse.json({ error: 'Token saknas.' }, { status: 400 })
|
||||
}
|
||||
|
||||
const tokenHash = hashInviteToken(token)
|
||||
const serviceClient = createServiceClient()
|
||||
|
||||
const { data: companyInvite } = await serviceClient
|
||||
.from('company_invitations')
|
||||
.select('id, email, status, expires_at, company_id, companies:company_id(name)')
|
||||
.eq('token_hash', tokenHash)
|
||||
.single()
|
||||
|
||||
if (!companyInvite) {
|
||||
return NextResponse.json({ error: 'Inbjudan hittades inte eller är ogiltig.' }, { status: 404 })
|
||||
}
|
||||
|
||||
if (companyInvite.status !== 'pending') {
|
||||
return NextResponse.json({ error: 'Inbjudan har redan använts.' }, { status: 410 })
|
||||
}
|
||||
|
||||
const expired = new Date(companyInvite.expires_at) < new Date()
|
||||
|
||||
const { data: existingUsers } = await serviceClient.auth.admin.listUsers()
|
||||
const alreadyHasAccount = existingUsers?.users?.some(
|
||||
(u) => u.email?.toLowerCase() === companyInvite.email.toLowerCase()
|
||||
) ?? false
|
||||
|
||||
return NextResponse.json({
|
||||
data: {
|
||||
type: 'company',
|
||||
companyName: (companyInvite.companies as unknown as { name: string })?.name || 'Företag',
|
||||
email: companyInvite.email,
|
||||
expired,
|
||||
alreadyHasAccount,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* POST /api/team/accept
|
||||
* Accepts a company invite after the user has signed up.
|
||||
* Team invitations are disabled — teams are single-user.
|
||||
*/
|
||||
export async function POST(request: NextRequest) {
|
||||
const supabase = await createClient()
|
||||
const { data: { user } } = await supabase.auth.getUser()
|
||||
if (!user) {
|
||||
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
}
|
||||
|
||||
const body = await request.json()
|
||||
const token = body.token as string
|
||||
if (!token) {
|
||||
return NextResponse.json({ error: 'Token saknas.' }, { status: 400 })
|
||||
}
|
||||
|
||||
const tokenHash = hashInviteToken(token)
|
||||
const serviceClient = createServiceClient()
|
||||
|
||||
const { data: companyInvite, error: companyLookupError } = await serviceClient
|
||||
.from('company_invitations')
|
||||
.select('id, company_id, email, role, status, expires_at')
|
||||
.eq('token_hash', tokenHash)
|
||||
.single()
|
||||
|
||||
if (companyLookupError) {
|
||||
console.error('[team/accept] company lookup error:', companyLookupError.message)
|
||||
}
|
||||
|
||||
if (!companyInvite || companyInvite.status !== 'pending') {
|
||||
return NextResponse.json({ error: 'Inbjudan är ogiltig.' }, { status: 400 })
|
||||
}
|
||||
|
||||
if (new Date(companyInvite.expires_at) < new Date()) {
|
||||
await serviceClient
|
||||
.from('company_invitations')
|
||||
.update({ status: 'expired' })
|
||||
.eq('id', companyInvite.id)
|
||||
return NextResponse.json({ error: 'Inbjudan har gått ut.' }, { status: 410 })
|
||||
}
|
||||
|
||||
if (user.email?.toLowerCase() !== companyInvite.email.toLowerCase()) {
|
||||
return NextResponse.json({ error: 'E-postadressen matchar inte inbjudan.' }, { status: 403 })
|
||||
}
|
||||
|
||||
// Add user to company
|
||||
const { error: memberError } = await serviceClient
|
||||
.from('company_members')
|
||||
.insert({
|
||||
company_id: companyInvite.company_id,
|
||||
user_id: user.id,
|
||||
role: companyInvite.role,
|
||||
source: 'direct',
|
||||
})
|
||||
|
||||
if (memberError) {
|
||||
if (memberError.code === '23505') {
|
||||
return NextResponse.json({ error: 'Du är redan medlem.' }, { status: 409 })
|
||||
}
|
||||
return NextResponse.json({ error: 'Kunde inte lägga till medlem.' }, { status: 500 })
|
||||
}
|
||||
|
||||
// Set active company
|
||||
await serviceClient
|
||||
.from('user_preferences')
|
||||
.upsert({
|
||||
user_id: user.id,
|
||||
active_company_id: companyInvite.company_id,
|
||||
}, { onConflict: 'user_id' })
|
||||
|
||||
// Mark invite as accepted
|
||||
await serviceClient
|
||||
.from('company_invitations')
|
||||
.update({ status: 'accepted' })
|
||||
.eq('id', companyInvite.id)
|
||||
|
||||
return NextResponse.json({
|
||||
data: { type: 'company', companyId: companyInvite.company_id },
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
|
||||
/**
|
||||
* DELETE /api/team/invite/[id]
|
||||
* Team-level invitations are disabled.
|
||||
*/
|
||||
export async function DELETE() {
|
||||
return NextResponse.json(
|
||||
{ error: 'Teaminbjudningar är inaktiverade.' },
|
||||
{ status: 403 }
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
|
||||
/**
|
||||
* POST /api/team/invite
|
||||
* Team-level invitations are disabled.
|
||||
* Invitations should be made at the företag (company) level instead.
|
||||
*/
|
||||
export async function POST() {
|
||||
return NextResponse.json(
|
||||
{ error: 'Teaminbjudningar är inaktiverade. Bjud in via enskilda företag.' },
|
||||
{ status: 403 }
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
|
||||
/**
|
||||
* DELETE /api/team/members/[id]
|
||||
* Removing team members is disabled — teams are single-user.
|
||||
*/
|
||||
export async function DELETE() {
|
||||
return NextResponse.json(
|
||||
{ error: 'Team har bara en ägare och kan inte ändras.' },
|
||||
{ status: 403 }
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
import { createClient, createServiceClient } from '@/lib/supabase/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
|
||||
/**
|
||||
* GET /api/team/members
|
||||
* Returns team members (single-user teams — no invitations).
|
||||
*/
|
||||
export async function GET() {
|
||||
const supabase = await createClient()
|
||||
const { data: { user } } = await supabase.auth.getUser()
|
||||
if (!user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const serviceClient = await createServiceClient()
|
||||
|
||||
// Find the user's team membership
|
||||
const { data: myMembership } = await serviceClient
|
||||
.from('team_members')
|
||||
.select('team_id, role')
|
||||
.eq('user_id', user.id)
|
||||
.limit(1)
|
||||
.single()
|
||||
|
||||
if (!myMembership) {
|
||||
// User is not in any team — check if they own a company (could start a team)
|
||||
const { data: ownedCompany } = await serviceClient
|
||||
.from('company_members')
|
||||
.select('id')
|
||||
.eq('user_id', user.id)
|
||||
.eq('role', 'owner')
|
||||
.limit(1)
|
||||
.maybeSingle()
|
||||
|
||||
return NextResponse.json({
|
||||
data: {
|
||||
members: [],
|
||||
teamName: null,
|
||||
teamId: null,
|
||||
isOwner: false,
|
||||
hasTeam: false,
|
||||
ownsCompany: !!ownedCompany,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
const teamId = myMembership.team_id
|
||||
const isOwner = myMembership.role === 'owner'
|
||||
|
||||
// Fetch team name
|
||||
const { data: team } = await serviceClient
|
||||
.from('teams')
|
||||
.select('name')
|
||||
.eq('id', teamId)
|
||||
.single()
|
||||
|
||||
// Fetch all team members (owner is a real row now)
|
||||
const { data: members, error: membersError } = await serviceClient
|
||||
.from('team_members')
|
||||
.select('id, team_id, user_id, role, joined_at')
|
||||
.eq('team_id', teamId)
|
||||
.order('joined_at', { ascending: true })
|
||||
|
||||
if (membersError) {
|
||||
return NextResponse.json({ error: 'Kunde inte hämta teammedlemmar.' }, { status: 500 })
|
||||
}
|
||||
|
||||
// Fetch emails from profiles
|
||||
const userIds = (members || []).map((m) => m.user_id)
|
||||
const { data: profiles } = await serviceClient
|
||||
.from('profiles')
|
||||
.select('id, email')
|
||||
.in('id', userIds)
|
||||
|
||||
const emailMap = new Map((profiles || []).map((p) => [p.id, p.email]))
|
||||
|
||||
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,
|
||||
joined_at: m.joined_at,
|
||||
is_current_user: m.user_id === user.id,
|
||||
})),
|
||||
teamName: team?.name || null,
|
||||
teamId,
|
||||
isOwner,
|
||||
hasTeam: true,
|
||||
},
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user