Files
accounted/extensions/general/skatteverket/lib/vat-submit.ts
T
18c20e68e6 fix(scoping): Skatteverket per företag + nåbara startkort + företags-scopade val (#1610)
* fix(scoping): skatteverket per company + true pristine gates + scoped dismissals

Skatteverket connections become per (user, company): the token table
carried BOTH UNIQUE(user_id) and UNIQUE(company_id) (two stacked half
migrations), so one connection leaked "connected" onto every company the
user belongs to, sync ran the token against the wrong orgnr (behorighet
403), and reconnecting from another company silently moved the row and
went dark on the first company's crons. Token reads/writes are now scoped
by company through the whole chain (token-store, api-client refresh
coalescing, skvRequest and its 21 call sites, resolve-auth, crons, MCP),
/skattekonto/saldo answers 401 NOT_CONNECTED for companies without their
own row (which is what the page's startkort keys on), and the dashboard
connect-nudge counts only the active company's row.

Bookkeeping's pristine start card now keys on all-years emptiness via a
count probe instead of "no active filters": the default fiscal-year
selection counted as a filter, which made the card unreachable on
brand-new companies (it showed "inga traffar" instead).

Two browser-global localStorage keys become company-scoped with legacy
fallbacks: the inbox onboarding dismissal (dismissing on one company hid
the card everywhere) and the periodisering auto-detect toggle.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(scoping): dedupe cron work per (user, company) + guard the ledger probe

CodeRabbit findings on #1610: the skattekonto sync cron still deduped
token rows by user_id alone, which would drop every company but one for
multi-company operators (the exact scenario the PR fixes); and the
all-years ledger probe could leave a stale false behind on a failed
refetch, letting the pristine card render unconfirmed. The probe now
resets to unknown in flight and carries the fetch generation guard.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-08-14 08:21:57 +02:00

172 lines
6.8 KiB
TypeScript

/**
* Shared VAT "skicka för signering" chain: (kontrollera) -> POST /utkast ->
* PUT /las -> signeringslänk.
*
* Two callers file through this module so they can never drift apart:
* - the one-click extension route `POST /declaration/submit` (index.ts),
* which runs the kontrollera pre-step so a declaration with validation
* errors is stopped before anything is written to Eget utrymme
* - the pending-operations commit service `commitSubmitVatDeclaration`
* (index.ts), where the staged figures were already reviewed and the
* chain starts at the utkast write
*
* The momsuppgift is recomputed here via buildMomsuppgift (recompute-at-
* commit): the figures filed always equal what the preview showed for the
* same ledger state.
*
* SkatteverketAuthError propagates to the caller: the route maps it through
* handleSkvError, the commit service through mapServiceError.
*/
import type { ExtensionContext } from '@/lib/extensions/types'
import type { VatPeriodType } from '@/types'
import { skvRequest } from './api-client'
import { writeSkatteverketAudit } from './audit'
import { buildMomsuppgift } from './declaration-prep'
import type { SkatteverketKontroll, SkatteverketKontrollResultat, SkatteverketUtkastResponse } from '../types'
export interface VatSubmitChainParams {
periodType: VatPeriodType
year: number
period: number
/** Räkenskapsår for helårsmoms: broken FYs end in their own month, not December. */
fiscalPeriodId?: string
}
export type VatSubmitChainResult =
| {
ok: true
signingUrl: string
redovisare: string
redovisningsperiod: string
kontrollresultat: SkatteverketKontrollResultat | null
}
| {
ok: false
/**
* Where the chain stopped. `validation` failures happen before any
* write at Skatteverket; `draft` failures leave nothing worth keeping
* (utkast overwrites, so retrying the whole chain is safe); `lock`
* failures leave a saved draft in Eget utrymme (`draftSaved: true`),
* so the retry only needs the lock step.
*/
stage: 'validation' | 'draft' | 'lock'
httpStatus: number
error: string
kontrollresultat: SkatteverketKontrollResultat | null
draftSaved: boolean
}
export async function submitVatDeclarationChain(
ctx: ExtensionContext,
params: VatSubmitChainParams,
options: { validate?: boolean } = {}
): Promise<VatSubmitChainResult> {
const { supabase, userId, companyId } = ctx
const { redovisare, redovisningsperiod, momsuppgift } =
await buildMomsuppgift(supabase, ctx.companyId, params)
// 0. Optional kontrollera pre-step: SKV validates the arithmetic without
// saving anything. ERROR-level findings abort the chain here, before
// any state exists at Skatteverket.
if (options.validate) {
const kontrollera = await skvRequest(
supabase, userId, companyId, 'POST', `/kontrollera/${redovisare}/${redovisningsperiod}`, momsuppgift,
)
await writeSkatteverketAudit(ctx, {
endpoint: 'declaration/validate', agRegistreradId: redovisare, redovisningsperiod,
outcome: kontrollera.ok ? 'ok' : 'skv_error', responseStatus: kontrollera.status,
})
if (!kontrollera.ok) {
const text = await kontrollera.text().catch(() => '')
return {
ok: false, stage: 'validation', httpStatus: kontrollera.status,
error: `Skatteverket svarade med ${kontrollera.status}: ${text}`,
kontrollresultat: null, draftSaved: false,
}
}
const kontrolleraData = (await kontrollera.json()) as SkatteverketUtkastResponse
const findings: SkatteverketKontroll[] = kontrolleraData.kontrollResultat?.resultat ?? []
const errorCount = findings.filter((k) => k.status === 'ERROR').length
if (errorCount > 0) {
return {
ok: false, stage: 'validation', httpStatus: 422,
error: `Skatteverket hittade ${errorCount} valideringsfel i deklarationen.`,
kontrollresultat: kontrolleraData.kontrollResultat ?? null, draftSaved: false,
}
}
}
// 1. POST /utkast: save the draft to Eget utrymme. Overwrites any prior
// draft for the period, so retry after a mid-chain failure is safe.
const utkast = await skvRequest(
supabase, userId, companyId, 'POST', `/utkast/${redovisare}/${redovisningsperiod}`, momsuppgift,
)
await writeSkatteverketAudit(ctx, {
endpoint: 'declaration/draft', agRegistreradId: redovisare, redovisningsperiod,
outcome: utkast.ok ? 'ok' : 'skv_error', responseStatus: utkast.status,
})
if (!utkast.ok) {
const text = await utkast.text().catch(() => '')
return {
ok: false, stage: 'draft', httpStatus: utkast.status,
error: `Skatteverket svarade med ${utkast.status}: ${text}`,
kontrollresultat: null, draftSaved: false,
}
}
const utkastData = (await utkast.json()) as SkatteverketUtkastResponse
// periodType/year/period ride along so the VAT kvittens cron can complete
// the period's moms deadline without reverse-parsing redovisningsperiod.
await ctx.settings.set(
`submission_${redovisningsperiod}`,
JSON.stringify({
status: 'draft_saved', redovisare, redovisningsperiod,
periodType: params.periodType, year: params.year, period: params.period,
kontrollresultat: utkastData.kontrollResultat, updatedAt: new Date().toISOString(),
}),
)
// 2. PUT /las: lock for signing; returns the BankID signeringslänk.
const las = await skvRequest(
supabase, userId, companyId, 'PUT', `/las/${redovisare}/${redovisningsperiod}`,
)
await writeSkatteverketAudit(ctx, {
endpoint: 'declaration/lock', agRegistreradId: redovisare, redovisningsperiod,
outcome: las.ok ? 'ok' : 'skv_error', responseStatus: las.status,
})
if (!las.ok) {
const text = await las.text().catch(() => '')
return {
ok: false, stage: 'lock', httpStatus: las.status,
error: `Skatteverket svarade med ${las.status}: ${text}`,
kontrollresultat: utkastData.kontrollResultat ?? null, draftSaved: true,
}
}
const lasData = (await las.json()) as SkatteverketUtkastResponse
if (!lasData.signeringsLank) {
return {
ok: false, stage: 'lock', httpStatus: 502,
error: 'Skatteverket låste deklarationen men returnerade ingen signeringslänk.',
kontrollresultat: utkastData.kontrollResultat ?? null, draftSaved: true,
}
}
// Persist locked state so the UI/poller can resume (mirrors /declaration/lock).
await ctx.settings.set(
`submission_${redovisningsperiod}`,
JSON.stringify({
status: 'draft_locked', redovisare, redovisningsperiod,
periodType: params.periodType, year: params.year, period: params.period,
signeringsLank: lasData.signeringsLank, updatedAt: new Date().toISOString(),
}),
)
return {
ok: true,
signingUrl: lasData.signeringsLank,
redovisare,
redovisningsperiod,
kontrollresultat: utkastData.kontrollResultat ?? null,
}
}