Fix/skv connection flow (#1015)
* feat(salary): one-click AGI submission with filing state machine and success feedback The AGI panel required users to know that "Ladda ner AGI-fil" was the generate step, then click submit, signing link, and kvittens manually. A nollkorning filing stalled on "AGI-XML saknas" pointing at a UI path that does not exist. - New primary button "Lamna in till Skatteverket" chains the existing endpoints client-side: generate XML if missing, POST underlag, poll kontrollresultat, create signing link, open Mina Sidor in a tab opened synchronously at click (popup-blocker safe). Inline stepper shows each step; the four old buttons become collapsed advanced/recovery actions, auto-expanded in stale-draft and rejected states. XML download stays visible and free for manual filing. - deriveAgiFilingState() + useAgiSubmission() lift the per-period submission record to the run page: the progress rail and salary hero now render the real state machine (generated, underlag inskickat, vantar pa BankID-signatur, inlamnad med kvittensnummer) instead of telling users to "lamna in" an already-submitted declaration. - Success card with kvittensnummer and signature metadata once signed, plus a toast when a poll flips the state while the page is open. - AGI kvittens cron every 15 min instead of every 2 h so filings signed on another device get stamped and emailed promptly. - Advanced submit also auto-generates, and the stale "Lon -> AGI -> Generera" error text now points at the real buttons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(enable-banking): instant OAuth callback feedback and dead-attempt cleanup The bank redirect landed on a blank page for the several seconds the callback spent exchanging the PSD2 session and mirroring accounts, and every failed connect attempt left a status='error' row that rendered forever as an "Atgard kravs" card next to a successful retry, showing duplicate connections to the same bank. - Stream a branded "Slutfor bankanslutningen" progress page from the callback: the shell flushes before the session exchange starts and a script/meta redirect follows when the work completes, with a 30s slow-work escape hatch. Fast outcomes (denial, bad params, unknown state) keep their plain redirects. - Delete never-activated connection rows (no session_id, no accounts_data) on denial or exchange failure, and sweep leftovers for the same bank on the next connect. Established connections keep their "Atgard krävs" card via the accounts_data guard; FKs are ON DELETE SET NULL so deletion has no dependents. - Show "Banken ar ansluten: hamtar dina konton" while the settings panel loads after the callback instead of an anonymous spinner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): reject re-send of issued invoices and gate bookkeeping on the sent flip A direct POST to /api/invoices/[id]/send against an already-issued invoice re-emailed the customer and posted a second revenue verifikat (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id and orphaning the first entry. Only the UI hid the button; the v1 route and the MCP commit executor already rejected non-drafts. - Non-draft invoices now return 409 INVOICE_ALREADY_SENT. - The draft to sent status flip is an optimistic lock (status guard plus row-count check); journal entry, accrual schedules, PDF archival and the invoice.sent event only run for the request that won the flip. - On a flip failure the journal entry is deferred: the row stays draft and a retry re-runs the pipeline, ending with exactly one verifikat. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): payment links, failure visibility and sandbox guard for recurring auto-send - sendInvoiceFromSchedule now auto-creates an online payment link via applyPaymentLinkToInvoice before rendering and passes the payment link QR to the PDF: parity with the dashboard and v1 send routes, which recurring invoices silently lacked. - The recurring cron persists last_run_warning both when a claimed run throws (hourly retries stay visible on the schedule) and when a stale schedule is rolled forward, so a deterministic failure can no longer skip a month silently. - Auto-send is blocked for sandbox companies at the email chokepoint (freeze-and-retain: the invoice is still generated as a draft), covering both the cron and the run-now route with one guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(salary): close the Fortnox payroll API gaps (phases 1-4) Payroll now runs end-to-end through the open API, including onboarding a client from another payroll system, with every write staged for approval. - v1: per-employee payslips (list/detail/PDF), payslip line writes, run roster attach/remove, absence ranges (per-day storage), jamkning fields, cutover opening balances (single + atomic bulk PUT), vacation balance + vacation-year-close. PUT added to the wrapper's idempotency/ test-key set (test keys could otherwise write through PUT). - MCP: 10 new tools (get_employee/get_payslip/list_absence/ get_vacation_balance reads + staged update_payslip_line, register_absence, create_employee, update_employee, set_employee_opening_balances, close_vacation_year), executors, risk tiers, op-type CHECK expansions. create_employee encrypts personnummer at staging: pending_operations never holds plaintext. - Scope-map audit retrofit: 11 formerly unmapped tools now scoped; BREAKING for keys that relied on the 4 default-allow writes. - Cutover: employee_opening_balances (derived lock trigger, self-unlocks on run correction), engine YTD/karens/liability integration, Ingaende saldon section in the employee editor. - Arbetsschema-lite: employees.hours_per_week/workdays_per_week drive the hourly/daily divisors; legacy 173/21 preserved exactly at defaults so existing pay math is byte-identical. - Vacation ledger + semesterberedning/arsavslut: recomputed per-year day balances (synced on book/correct, non-fatal), year-close with the min-20 floor, 5-year sparade-dagar expiry to forced payout, and a 2920/2940 drift adjustment via the bookkeeping engine; Semester dashboard card with preview-then-confirm dialog. - Fix: Zod 4 defaults leak through .partial(), which made every sparse employee PATCH fail validation and reset defaulted columns. Migrations 20260713100000/101000/110000/121000/122000 (applied to staging with version rows; prod via merge). vacation_ledger renamed from 20260713120000 to avoid colliding with vat_declaration_totals_rpc. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf: cut dashboard page-load latency (region, round trips, caching, VAT RPC) The dominant cost was infrastructure: Vercel functions ran in iad1 (Washington D.C.) while Supabase (DB + auth) lives in eu-north-1 (Stockholm), so every request paid 4-5 transatlantic round trips of auth + company resolution before doing any real work (measured 530-1900ms for single-query GETs in prod logs). Pin functions to arn1 and cut the redundant work on top: - vercel.json: functions to arn1, same city as the database - getActiveCompanyId: preference + first-membership queries run in parallel; the fallback result doubles as validation in the common single-company case (one round trip instead of two sequential) - withRouteContext: Server-Timing header and authMs/companyMs/handlerMs in the op-completed log, so latency is attributable per phase - dashboard layout: nav badge counts off the critical path; DashboardNav loads them client-side via the new use-worklist-badges SWR hook with debounced realtime revalidation - swr (new dependency, approved): global provider; useCompanySettings shares one cache entry across consumers and renders from cache on back-navigation instead of re-showing skeletons - /pending: realtime refetch debounced; bulk operations previously fired 4 requests per row-change event - VAT declaration: new get_vat_declaration_totals RPC returns per-account totals, settlement-shape detection (#984) and source_type counts in ONE round trip instead of paging every entry+line through PostgREST. Account lists stay TS-side parameters so ACCOUNT_RUTA remains the single source of truth. Shape-exclusion coverage moved to tests/pg/vat-declaration-totals-rpc.pg.test.ts; DDL already applied to staging. - bundle: CommandPalette lazy-mounts on first Ctrl/Cmd+K, AgentChat dynamic-imports the markdown parser, @vercel/speed-insights (new dependency, approved) added for real-user timings The /salary fetch-waterfall fix from the same effort already landed inside 2084a756. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): settle öre-rounded payments from the mark-paid flow An invoice with öresavrundning shows a rounded "Att betala" on the PDF; the customer pays that amount (up to 50 öre off the stored öre total) and the invoice-page mark-paid flow rejected it with MATCH_AMOUNT_EXCEEDS_REMAINING: a dead end, while the bank-transaction match flow already absorbed the residual to 3740. - PaymentBookingDialog now proposes the rounded bank leg plus the 3740 residual line (credit when rounded up, debit when rounded down), resolved via getDisplayTotal from the per-invoice override and company_settings.ore_rounding. - settleInvoicePayment and the v1 mark-paid route absorb the sub-krona residual, gated by planInvoicePaymentForLines: absorption applies ONLY when the caller lines carry the exact residual on 3740; otherwise the strict plan applies (sub-krona partials stay partial, no-3740 overshoots keep the 400), so the GL can never diverge from the AR sub-ledger. - planInvoicePayment absorb-band boundary tightened to >= 1 kr: an exactly-1-kr overshoot used to slip past both the guard and the absorb branch and silently over-record paid_amount (pre-existing on the bank-match path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): resolve all 7 PR compliance findings - ASVS V3.3: per-request CSP nonce on the enable-banking finalize page (mirrors the mcp-oauth consent page); inline scripts are nonce-bound - ASVS V16: decouple callback finalize work from the response stream (eager promise + next/server after()) so a client disconnect cannot drop session persistence or the consent_granted audit emit - ISO 27001 A.8.15: failed audit-event emits log through the structured logger with a stable message for log-based alerting - ASVS V2.3: recurring-invoice cron and run-now routes resolve isSandboxCompany themselves and pass an explicit suppressAutoSend flag (defence in depth around the email chokepoint, freeze-and-retain kept) - ISO 27001 A.8.11: stagePendingOperation rejects plaintext personnummer-bearing keys in params/preview_data (key-based guard; EF org numbers make value-matching unsafe) - ASVS V4.5: employee PATCH body is truly sparse; cleared number fields are omitted instead of resetting DB values to hardcoded fallbacks - ASVS V8.2.1: route-level tests pin the v1 cross-company deny (404 by convention, not 403) on the payslip PDF endpoint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: implement vacation-year basis change validation and error handling - Added tests to block vacation-year basis changes when open balances exist. - Implemented error handling for open-balances guard query failures in the settings route. - Enhanced absence route to reject reversed date ranges with a validation error. - Updated absence handling to use atomic upserts instead of delete+insert for better performance and reliability. - Refactored salary calculation logic to correctly handle age-based avgifter rates according to Skatteverket's rules. - Improved error messaging for vacation year closure adjustments. - Adjusted employee opening balances handling to preserve audit information during upserts. * feat(settings): add validation to block vacation-year basis change with open balances feat(absence): reject reversed date ranges in absence queries fix(absence): update absence handling to use atomic upserts instead of delete+insert fix(employee): improve validation for jamkning dates in employee updates fix(opening-balances): ensure created_by field is preserved during upserts test(absence): enhance tests for absence range and date validations test(calculation): add tests for age-based avgifter rates and edge cases test(semesterberedning): validate vacation year closure adjustments and error handling test(employee-opening-balances): update tests to reflect changes in salary_run_employees schema * fix(migrations): implement NOT VALID constraints for pending_operations and add validation migration --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
e7e3c35f9e
commit
b6332e9ff4
@@ -50,7 +50,7 @@ function makeRequest(params: Record<string, string>) {
|
||||
|
||||
function mockChain(result: { data?: unknown; error?: unknown }) {
|
||||
const chain: Record<string, unknown> = {}
|
||||
for (const m of ['select', 'eq', 'in', 'single', 'update', 'order', 'limit']) {
|
||||
for (const m of ['select', 'eq', 'in', 'is', 'single', 'update', 'delete', 'order', 'limit']) {
|
||||
chain[m] = vi.fn().mockReturnValue(chain)
|
||||
}
|
||||
chain.single = vi.fn().mockResolvedValue({ data: result.data ?? null, error: result.error ?? null })
|
||||
@@ -98,14 +98,17 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
expect(location).toContain('bank_error=invalid_state')
|
||||
})
|
||||
|
||||
it('writes pending_selection and redirects to picker on success', async () => {
|
||||
it('writes pending_selection and streams a finalizing page that redirects to the picker', async () => {
|
||||
const capturedUpdates: Record<string, unknown>[] = []
|
||||
let callIndex = 0
|
||||
mockFrom.mockImplementation(() => {
|
||||
callIndex++
|
||||
if (callIndex === 1) {
|
||||
// Find pending connection by oauth_state
|
||||
return mockChain({ data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1' }, error: null })
|
||||
return mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1', bank_name: 'TestBank', status: 'pending' },
|
||||
error: null,
|
||||
})
|
||||
}
|
||||
// Update connection: capture the payload, then chain returns the
|
||||
// updated row via .select().single() for the audit event emission.
|
||||
@@ -143,11 +146,27 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
|
||||
const response = await GET(makeRequest({ code: 'auth-code', state: 'valid-state' }))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
const location = response.headers.get('location') || ''
|
||||
expect(location).toContain('/settings/banking?')
|
||||
expect(location).toContain('select_accounts=conn-1')
|
||||
expect(location).not.toContain('bank_connected=true')
|
||||
// Success streams an interim page (instant feedback during the session
|
||||
// exchange) that ends with a client-side redirect to the account picker.
|
||||
expect(response.status).toBe(200)
|
||||
expect(response.headers.get('content-type')).toContain('text/html')
|
||||
expect(response.headers.get('cache-control')).toBe('no-store')
|
||||
const body = await response.text()
|
||||
// Shell flushed with the bank name, then the redirect to the picker.
|
||||
expect(body).toContain('TestBank')
|
||||
expect(body).toContain('window.location.replace')
|
||||
expect(body).toContain('select_accounts=conn-1')
|
||||
expect(body).not.toContain('bank_error')
|
||||
|
||||
// ASVS V3.3: inline scripts are nonce-bound. The response-level CSP
|
||||
// declares the nonce and BOTH chunks (shell watchdog + redirect) carry
|
||||
// it; no un-nonced inline script may exist on this page.
|
||||
const csp = response.headers.get('content-security-policy') ?? ''
|
||||
const nonceMatch = /script-src 'nonce-([^']+)'/.exec(csp)
|
||||
expect(nonceMatch).not.toBeNull()
|
||||
const nonce = nonceMatch![1]
|
||||
expect(body.split(`<script nonce="${nonce}">`).length - 1).toBe(2)
|
||||
expect(body).not.toContain('<script>')
|
||||
|
||||
// Verify the update payload: status=pending_selection, no last_synced_at,
|
||||
// and every account defaults to enabled=true so the picker can simply
|
||||
@@ -185,7 +204,10 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
mockFrom.mockImplementation((table: string) => {
|
||||
callIndex++
|
||||
if (callIndex === 1) {
|
||||
return mockChain({ data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1' }, error: null })
|
||||
return mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1', bank_name: 'TestBank', status: 'expired' },
|
||||
error: null,
|
||||
})
|
||||
}
|
||||
if (table === 'cash_accounts') {
|
||||
// Already mirrored on a previous connect — acc-1 was remapped to 1935
|
||||
@@ -218,7 +240,9 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
|
||||
const response = await GET(makeRequest({ code: 'auth-code', state: 'valid-state' }))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
expect(response.status).toBe(200)
|
||||
const body = await response.text()
|
||||
expect(body).toContain('select_accounts=conn-1')
|
||||
// No allocation for an already-mirrored account; the upsert reuses 1935.
|
||||
expect(mockAllocate).not.toHaveBeenCalled()
|
||||
expect(mockUpsertFromPsd2).toHaveBeenCalledTimes(1)
|
||||
@@ -227,6 +251,77 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
).toBe('1935')
|
||||
})
|
||||
|
||||
it('deletes the fresh row and streams an error redirect when the session exchange fails', async () => {
|
||||
const deleteCalls: unknown[] = []
|
||||
const updateCalls: unknown[] = []
|
||||
mockFrom.mockImplementation(() => {
|
||||
const chain = mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1', bank_name: 'TestBank', status: 'pending' },
|
||||
error: null,
|
||||
})
|
||||
chain.delete = vi.fn(() => {
|
||||
deleteCalls.push('delete')
|
||||
return chain
|
||||
})
|
||||
chain.update = vi.fn((payload: unknown) => {
|
||||
updateCalls.push(payload)
|
||||
return chain
|
||||
})
|
||||
return chain
|
||||
})
|
||||
|
||||
mockCreateSession.mockRejectedValue(new Error('upstream timeout'))
|
||||
|
||||
const response = await GET(makeRequest({ code: 'auth-code', state: 'valid-state' }))
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
const body = await response.text()
|
||||
// The streamed redirect carries the failure to the settings banner.
|
||||
expect(body).toContain('window.location.replace')
|
||||
expect(body).toContain('bank_error=')
|
||||
expect(body).not.toContain('select_accounts=')
|
||||
|
||||
// A never-activated attempt is deleted, not parked as a zombie 'error'
|
||||
// row that would render next to a successful retry as a duplicate.
|
||||
expect(deleteCalls).toHaveLength(1)
|
||||
expect(updateCalls).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('marks a reconnect row as error (not deleted) when the session exchange fails', async () => {
|
||||
const deleteCalls: unknown[] = []
|
||||
const updateCalls: Record<string, unknown>[] = []
|
||||
mockFrom.mockImplementation(() => {
|
||||
const chain = mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', company_id: 'company-1', bank_name: 'TestBank', status: 'expired' },
|
||||
error: null,
|
||||
})
|
||||
chain.delete = vi.fn(() => {
|
||||
deleteCalls.push('delete')
|
||||
return chain
|
||||
})
|
||||
chain.update = vi.fn((payload: Record<string, unknown>) => {
|
||||
updateCalls.push(payload)
|
||||
return chain
|
||||
})
|
||||
return chain
|
||||
})
|
||||
|
||||
mockCreateSession.mockRejectedValue(new Error('upstream timeout'))
|
||||
|
||||
const response = await GET(makeRequest({ code: 'auth-code', state: 'valid-state' }))
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
const body = await response.text()
|
||||
expect(body).toContain('bank_error=')
|
||||
|
||||
// An established connection keeps its row (history, accounts) and gets
|
||||
// the error surfaced on it instead.
|
||||
expect(deleteCalls).toHaveLength(0)
|
||||
expect(updateCalls).toHaveLength(1)
|
||||
expect(updateCalls[0].status).toBe('error')
|
||||
expect(updateCalls[0].oauth_state).toBeNull()
|
||||
})
|
||||
|
||||
it('redirects with error when bank returns error param (no state)', async () => {
|
||||
const response = await GET(makeRequest({ error: 'access_denied', error_description: 'User cancelled' }))
|
||||
|
||||
@@ -257,10 +352,75 @@ describe('GET /api/extensions/enable-banking/callback', () => {
|
||||
expect(mockFrom).toHaveBeenCalledWith('bank_connections')
|
||||
})
|
||||
|
||||
it('deletes a fresh pending row on bank denial instead of parking it in error', async () => {
|
||||
const deleteCalls: unknown[] = []
|
||||
const updateCalls: unknown[] = []
|
||||
mockFrom.mockImplementation(() => {
|
||||
const chain = mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', bank_name: 'TestBank', psu_type: 'business', status: 'pending' },
|
||||
error: null,
|
||||
})
|
||||
chain.delete = vi.fn(() => {
|
||||
deleteCalls.push('delete')
|
||||
return chain
|
||||
})
|
||||
chain.update = vi.fn((payload: unknown) => {
|
||||
updateCalls.push(payload)
|
||||
return chain
|
||||
})
|
||||
return chain
|
||||
})
|
||||
|
||||
const response = await GET(makeRequest({
|
||||
error: 'access_denied',
|
||||
error_description: 'User cancelled',
|
||||
state: 'pending-state',
|
||||
}))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
const location = response.headers.get('location') || ''
|
||||
// URLSearchParams encodes spaces as '+', unlike the encodeURIComponent
|
||||
// fallback used when no matching row exists.
|
||||
expect(location).toContain('bank_error=User+cancelled')
|
||||
expect(deleteCalls).toHaveLength(1)
|
||||
expect(updateCalls).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('keeps a reconnect row on bank denial and marks it expired on session-expiry errors', async () => {
|
||||
const deleteCalls: unknown[] = []
|
||||
const updateCalls: Record<string, unknown>[] = []
|
||||
mockFrom.mockImplementation(() => {
|
||||
const chain = mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', bank_name: 'TestBank', psu_type: 'business', status: 'expired' },
|
||||
error: null,
|
||||
})
|
||||
chain.delete = vi.fn(() => {
|
||||
deleteCalls.push('delete')
|
||||
return chain
|
||||
})
|
||||
chain.update = vi.fn((payload: Record<string, unknown>) => {
|
||||
updateCalls.push(payload)
|
||||
return chain
|
||||
})
|
||||
return chain
|
||||
})
|
||||
|
||||
const response = await GET(makeRequest({
|
||||
error: 'server_error',
|
||||
error_description: 'Session expired at ASPSP',
|
||||
state: 'pending-state',
|
||||
}))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
expect(deleteCalls).toHaveLength(0)
|
||||
expect(updateCalls).toHaveLength(1)
|
||||
expect(updateCalls[0].status).toBe('expired')
|
||||
})
|
||||
|
||||
it('forwards bank_error_code and psu_type when the denied state matches a pending connection', async () => {
|
||||
mockFrom.mockImplementation(() =>
|
||||
mockChain({
|
||||
data: { id: 'conn-1', user_id: 'user-1', bank_name: 'Handelsbanken', psu_type: 'business' },
|
||||
data: { id: 'conn-1', user_id: 'user-1', bank_name: 'Handelsbanken', psu_type: 'business', status: 'pending' },
|
||||
error: null,
|
||||
})
|
||||
)
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
/**
|
||||
* Interim "finalizing" page for the Enable Banking OAuth callback.
|
||||
*
|
||||
* The callback has seconds of unavoidable server work between the bank's
|
||||
* redirect and our own (session exchange with Enable Banking, account
|
||||
* mirroring, audit events). A classic 307 would leave the user staring at a
|
||||
* blank browser tab for that whole window, which reads as "the connection
|
||||
* failed" and provokes retries (and, historically, duplicate connections).
|
||||
*
|
||||
* Instead the route streams this page in two chunks:
|
||||
* 1. renderFinalizeShell() - flushed immediately, before any slow work:
|
||||
* branded spinner + "Slutför anslutningen".
|
||||
* 2. renderFinalizeRedirect() - flushed when the work is done: script +
|
||||
* meta-refresh + visible fallback link that
|
||||
* navigates to the settings page.
|
||||
*
|
||||
* The page is standalone HTML (no app bundle), styled to match the editorial
|
||||
* monochrome design system; see app/api/mcp-oauth/authorize for the sibling
|
||||
* standalone page this mirrors. Swedish-only, like the rest of the
|
||||
* enable-banking extension surfaces.
|
||||
*
|
||||
* Inline scripts are nonce-bound (ASVS V3.3): the route generates a
|
||||
* per-request nonce, stamps it on every <script> tag here, and sets a
|
||||
* response-level CSP with script-src 'nonce-...'. The global next.config CSP
|
||||
* (which still carries 'unsafe-inline' for the app bundle) also applies;
|
||||
* browsers enforce the intersection, so an injected inline script without
|
||||
* the nonce is blocked on this response.
|
||||
*/
|
||||
|
||||
function escapeHtml(value: string): string {
|
||||
return value
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''')
|
||||
}
|
||||
|
||||
/**
|
||||
* Opening chunk: full document head, styles, spinner and heading, plus a
|
||||
* watchdog that reveals an escape hatch if the server work takes abnormally
|
||||
* long (dead function, hung upstream). Deliberately does NOT close <body>:
|
||||
* the redirect chunk does. `cspNonce` must match the script-src nonce the
|
||||
* route puts in the response's Content-Security-Policy header.
|
||||
*/
|
||||
export function renderFinalizeShell(bankName: string | null, cspNonce: string): string {
|
||||
const heading = bankName
|
||||
? `Slutför anslutningen till ${escapeHtml(bankName)}…`
|
||||
: 'Slutför bankanslutningen…'
|
||||
|
||||
return `<!DOCTYPE html>
|
||||
<html lang="sv">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="robots" content="noindex, nofollow">
|
||||
<meta name="color-scheme" content="light">
|
||||
<title>Slutför bankanslutningen</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: hsl(0 0% 100%);
|
||||
--border: hsl(45 5% 85%);
|
||||
--fg: hsl(0 0% 9%);
|
||||
--fg-muted: hsl(0 0% 40%);
|
||||
--fg-faint: hsl(0 0% 55%);
|
||||
--warm-accent: hsl(38 45% 52%);
|
||||
}
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
html { -webkit-text-size-adjust: 100%; }
|
||||
body {
|
||||
font-family: 'Geist', -apple-system, system-ui, 'Segoe UI', sans-serif;
|
||||
background: var(--bg);
|
||||
color: var(--fg);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 100vh;
|
||||
padding: 2rem 1.5rem;
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
main {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
max-width: 26rem;
|
||||
}
|
||||
.spinner {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border: 2px solid var(--border);
|
||||
border-top-color: var(--fg);
|
||||
border-radius: 50%;
|
||||
animation: spin 0.8s linear infinite;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
@keyframes spin { to { transform: rotate(360deg); } }
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
/* Keep a slow spin: a frozen spinner reads as a hung page. */
|
||||
.spinner { animation-duration: 2.5s; }
|
||||
}
|
||||
.eyebrow {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.375rem;
|
||||
font-size: 0.6875rem;
|
||||
font-weight: 500;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
color: var(--fg-faint);
|
||||
margin-bottom: 0.875rem;
|
||||
}
|
||||
.eyebrow::before {
|
||||
content: "";
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
border-radius: 50%;
|
||||
background: var(--warm-accent);
|
||||
}
|
||||
h1 {
|
||||
font-family: 'Hedvig Letters Serif', Georgia, 'Times New Roman', serif;
|
||||
font-size: 1.625rem;
|
||||
font-weight: 400;
|
||||
letter-spacing: -0.018em;
|
||||
line-height: 1.15;
|
||||
margin-bottom: 0.625rem;
|
||||
}
|
||||
.lede {
|
||||
font-size: 0.875rem;
|
||||
color: var(--fg-muted);
|
||||
line-height: 1.55;
|
||||
}
|
||||
.slow {
|
||||
margin-top: 1.5rem;
|
||||
font-size: 0.8125rem;
|
||||
color: var(--fg-muted);
|
||||
line-height: 1.55;
|
||||
}
|
||||
.slow[hidden] { display: none; }
|
||||
a { color: var(--fg); text-decoration: underline; text-underline-offset: 2px; }
|
||||
.fallback { margin-top: 1.25rem; font-size: 0.8125rem; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<main role="main" aria-busy="true">
|
||||
<div class="spinner" aria-hidden="true"></div>
|
||||
<div class="eyebrow">Bankanslutning</div>
|
||||
<h1>${heading}</h1>
|
||||
<p class="lede">Vi bekräftar anslutningen och hämtar dina konton från banken. Du skickas vidare automatiskt.</p>
|
||||
<p class="slow" id="slow-notice" hidden>
|
||||
Det tar längre tid än vanligt. Vänta gärna kvar en stund till,
|
||||
eller <a href="/settings/banking">gå till bankinställningarna</a>.
|
||||
</p>
|
||||
</main>
|
||||
<script nonce="${escapeHtml(cspNonce)}">
|
||||
setTimeout(function () {
|
||||
var el = document.getElementById('slow-notice');
|
||||
if (el) el.hidden = false;
|
||||
}, 30000);
|
||||
</script>
|
||||
`
|
||||
}
|
||||
|
||||
/**
|
||||
* Closing chunk: navigates to `url` the instant it arrives. Three mechanisms,
|
||||
* most graceful first: location.replace (keeps the callback URL out of
|
||||
* history so Back cannot re-trigger it), a meta refresh for no-JS, and a
|
||||
* visible link as the last resort.
|
||||
*/
|
||||
export function renderFinalizeRedirect(url: string, cspNonce: string): string {
|
||||
// <-escape so a "</script>" sequence can never terminate the block
|
||||
// early, even though our URLs are app-relative and query-encoded.
|
||||
const jsUrl = JSON.stringify(url).replace(/</g, '\\u003c')
|
||||
|
||||
return ` <script nonce="${escapeHtml(cspNonce)}">window.location.replace(${jsUrl});</script>
|
||||
<noscript><meta http-equiv="refresh" content="0;url=${escapeHtml(url)}"></noscript>
|
||||
<div class="fallback"><a href="${escapeHtml(url)}">Klicka här om du inte skickas vidare automatiskt</a></div>
|
||||
</body>
|
||||
</html>
|
||||
`
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
import { randomBytes } from 'node:crypto'
|
||||
import { createServiceClient } from '@/lib/supabase/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { NextResponse, after } from 'next/server'
|
||||
import { ensureInitialized } from '@/lib/init'
|
||||
import { createLogger } from '@/lib/logger'
|
||||
import { createSession, type AccountInfo } from '@/extensions/general/enable-banking/lib/api-client'
|
||||
import type { StoredAccount } from '@/extensions/general/enable-banking/types'
|
||||
import { eventBus } from '@/lib/events/bus'
|
||||
@@ -9,6 +11,7 @@ import {
|
||||
allocatePsd2LedgerAccount,
|
||||
defaultLedgerForCurrency,
|
||||
} from '@/lib/cash-accounts/service'
|
||||
import { renderFinalizeShell, renderFinalizeRedirect } from './finalize-page'
|
||||
|
||||
// This route emits bank_connection.consent_granted / .cash_account_mirror_failed
|
||||
// (ASVS V16 / GDPR Art.30 audit events). ensureInitialized() must run at module
|
||||
@@ -17,6 +20,26 @@ import {
|
||||
// redirect route is the first event-emitting code path to execute.
|
||||
ensureInitialized()
|
||||
|
||||
// Structured logger for audit-trail failures (ISO 27001 A.8.15): a failed
|
||||
// audit-event emission must be visible to log-based alerting, not just a raw
|
||||
// console line. The stable message below is what monitoring keys on.
|
||||
const log = createLogger('enable-banking/callback')
|
||||
const AUDIT_EMIT_FAILED = 'audit event emit failed'
|
||||
|
||||
type ServiceClient = Awaited<ReturnType<typeof createServiceClient>>
|
||||
|
||||
interface PendingConnection {
|
||||
id: string
|
||||
user_id: string
|
||||
company_id: string
|
||||
bank_name: string | null
|
||||
status: string
|
||||
}
|
||||
|
||||
// Shown in the settings banner when the session exchange/finalize fails.
|
||||
// User-facing, so Swedish (the raw upstream error is in the server log).
|
||||
const FINALIZE_FAILED_MESSAGE =
|
||||
'Anslutningen kunde inte slutföras. Försök igen om en stund.'
|
||||
|
||||
/**
|
||||
* GET /api/extensions/enable-banking/callback
|
||||
@@ -24,6 +47,13 @@ ensureInitialized()
|
||||
* OAuth callback for Enable Banking PSD2 authorization.
|
||||
* Must be a real Next.js route (not extension handler) because
|
||||
* banks redirect to this URL directly.
|
||||
*
|
||||
* Fast outcomes (bank denial, bad params, unknown state) respond with a
|
||||
* classic 307. The success path instead streams an interim "Slutför
|
||||
* bankanslutningen" page while the slow work runs (session exchange with
|
||||
* Enable Banking, cash-account mirroring), then streams a client-side
|
||||
* redirect: without this the user stares at a blank tab for several seconds,
|
||||
* which reads as a failed connection and provokes duplicate retries.
|
||||
*/
|
||||
export async function GET(request: Request) {
|
||||
const { searchParams } = new URL(request.url)
|
||||
@@ -58,7 +88,7 @@ export async function GET(request: Request) {
|
||||
// (which stays 'expired' during the round-trip) is also handled.
|
||||
const { data: pendingConn } = await supabase
|
||||
.from('bank_connections')
|
||||
.select('id, user_id, bank_name, psu_type')
|
||||
.select('id, user_id, bank_name, psu_type, status')
|
||||
.eq('oauth_state', state)
|
||||
.in('status', ['pending', 'expired', 'error'])
|
||||
.single()
|
||||
@@ -72,17 +102,33 @@ export async function GET(request: Request) {
|
||||
error_description: errorDescription,
|
||||
})
|
||||
|
||||
// If the bank reports a session-expiry during authorization itself,
|
||||
// mark the row 'expired' (not generic 'error') so the settings panel
|
||||
// surfaces the reconnect button rather than a dead-end error state.
|
||||
const isSessionExpiry = /session.?expired|expired.?session|closed.?session|session.?closed|invalid.?session|session.?not.?found/i.test(
|
||||
`${error} ${errorDescription ?? ''}`
|
||||
)
|
||||
if (pendingConn.status === 'pending') {
|
||||
// Fresh connect that never became a connection: delete the row
|
||||
// instead of parking it in 'error'. A parked row renders forever
|
||||
// as an "Åtgärd krävs" card, so a failed attempt followed by a
|
||||
// successful retry showed up as two connections to the same bank.
|
||||
// The ?bank_error banner below is the actual failure feedback.
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.delete()
|
||||
.eq('id', pendingConn.id)
|
||||
.eq('status', 'pending')
|
||||
} else {
|
||||
// Reconnect of an established connection: keep the row (it holds
|
||||
// accounts/transactions history) and surface the failure on it.
|
||||
// If the bank reports a session-expiry during authorization
|
||||
// itself, mark it 'expired' (not generic 'error') so the settings
|
||||
// panel surfaces the reconnect button rather than a dead-end
|
||||
// error state.
|
||||
const isSessionExpiry = /session.?expired|expired.?session|closed.?session|session.?closed|invalid.?session|session.?not.?found/i.test(
|
||||
`${error} ${errorDescription ?? ''}`
|
||||
)
|
||||
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.update({ status: isSessionExpiry ? 'expired' : 'error', error_message: errorMessage, oauth_state: null })
|
||||
.eq('id', pendingConn.id)
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.update({ status: isSessionExpiry ? 'expired' : 'error', error_message: errorMessage, oauth_state: null })
|
||||
.eq('id', pendingConn.id)
|
||||
}
|
||||
|
||||
// Include bank name, error code, and psu_type in the redirect so the
|
||||
// UI can render targeted guidance (e.g. PSU-type retry on
|
||||
@@ -118,240 +164,341 @@ export async function GET(request: Request) {
|
||||
|
||||
const supabase = await createServiceClient()
|
||||
|
||||
try {
|
||||
// Look up the connection awaiting this callback by oauth_state (CSRF-safe).
|
||||
// oauth_state is a single-use random token cleared after use, so it uniquely
|
||||
// identifies the row regardless of status. Accept 'expired'/'error' too: an
|
||||
// in-place reconnect keeps the row in 'expired' during the round-trip (so
|
||||
// the nightly stale-'pending' cleanup can't delete an established row).
|
||||
const { data: pendingConnection, error: findError } = await supabase
|
||||
.from('bank_connections')
|
||||
.select('id, user_id, company_id')
|
||||
.eq('oauth_state', state)
|
||||
.in('status', ['pending', 'expired', 'error'])
|
||||
.single()
|
||||
// Look up the connection awaiting this callback by oauth_state (CSRF-safe).
|
||||
// oauth_state is a single-use random token cleared after use, so it uniquely
|
||||
// identifies the row regardless of status. Accept 'expired'/'error' too: an
|
||||
// in-place reconnect keeps the row in 'expired' during the round-trip (so
|
||||
// the nightly stale-'pending' cleanup can't delete an established row).
|
||||
// This lookup is fast, so it runs BEFORE the streamed response: an unknown
|
||||
// state stays a plain redirect.
|
||||
const { data: pendingConnection, error: findError } = await supabase
|
||||
.from('bank_connections')
|
||||
.select('id, user_id, company_id, bank_name, status')
|
||||
.eq('oauth_state', state)
|
||||
.in('status', ['pending', 'expired', 'error'])
|
||||
.single()
|
||||
|
||||
if (findError || !pendingConnection) {
|
||||
console.error('[enable-banking] No pending connection for oauth_state', {
|
||||
findError: findError ? { message: findError.message, code: findError.code, details: findError.details } : null,
|
||||
state,
|
||||
hasCode: !!code,
|
||||
})
|
||||
return NextResponse.redirect(
|
||||
`${baseUrl}/settings/banking?bank_error=${encodeURIComponent('invalid_state')}`
|
||||
)
|
||||
}
|
||||
|
||||
const userId = pendingConnection.user_id
|
||||
|
||||
console.log('[enable-banking] Exchanging code for session', {
|
||||
connectionId: pendingConnection.id,
|
||||
userId,
|
||||
codeLength: code.length,
|
||||
})
|
||||
|
||||
const sessionData = await createSession(code)
|
||||
const { session_id, accounts, access } = sessionData
|
||||
const consentExpiresAt = access.valid_until
|
||||
|
||||
console.log('[enable-banking] Session created successfully', {
|
||||
connectionId: pendingConnection.id,
|
||||
sessionId: '[REDACTED]',
|
||||
accountCount: accounts.length,
|
||||
consentExpiresAt,
|
||||
})
|
||||
|
||||
// GDPR Art.5(1)(c) / Art.25(1): data minimization. We only store the
|
||||
// metadata the user needs to pick which accounts to sync (uid, name, IBAN,
|
||||
// currency). Balances are bank account financial data: we don't fetch
|
||||
// them here. The first sync (after the user enables specific accounts)
|
||||
// populates balance + balance_updated_at via lib/sync.ts. Accounts the
|
||||
// user deselects never have their balance pulled.
|
||||
const accountsMetadata: StoredAccount[] = accounts.map((account: AccountInfo) => ({
|
||||
uid: account.uid,
|
||||
iban: account.account_id?.iban,
|
||||
name: account.name || account.product,
|
||||
currency: account.currency,
|
||||
// Default to enabled. The user is presented with a picker
|
||||
// immediately after this callback to uncheck unwanted accounts
|
||||
// before any transactions are fetched.
|
||||
enabled: true,
|
||||
}))
|
||||
|
||||
// Stay in 'pending_selection' until the user confirms which accounts to sync.
|
||||
// The cron and manual sync routes both skip this status, so no transactions
|
||||
// can be pulled before the user has had a chance to deselect accounts.
|
||||
// Do not set last_synced_at here either: no transactions have been fetched
|
||||
// yet, and setting it would cause the cron's first-sync 90-day backfill
|
||||
// path to be skipped. The first successful sync sets it.
|
||||
const { data: updatedConnection, error: updateError } = await supabase
|
||||
.from('bank_connections')
|
||||
.update({
|
||||
session_id,
|
||||
status: 'pending_selection',
|
||||
accounts_data: accountsMetadata,
|
||||
consent_expires: consentExpiresAt,
|
||||
oauth_state: null, // Clear to prevent replay
|
||||
})
|
||||
.eq('id', pendingConnection.id)
|
||||
.select('id, bank_name, company_id, user_id')
|
||||
.single()
|
||||
|
||||
if (updateError) {
|
||||
console.error('[enable-banking] Failed to update connection after session creation', {
|
||||
connectionId: pendingConnection.id,
|
||||
updateError: { message: updateError.message, code: updateError.code, details: updateError.details },
|
||||
sessionId: '[REDACTED]',
|
||||
})
|
||||
throw new Error(`Failed to update connection: ${updateError.message}`)
|
||||
}
|
||||
|
||||
// Mirror each PSD2 account into cash_accounts so routing decisions read
|
||||
// from the canonical entity table. Accounts already mirrored (reconnect)
|
||||
// keep their ledger_account — re-deriving it here would clobber the
|
||||
// user's remaps. New accounts each get a free BAS class-19 slot: a bank
|
||||
// returning N same-currency accounts must not collide on the UNIQUE
|
||||
// (company_id, ledger_account) constraint by all defaulting to 1930.
|
||||
const { data: mirroredRows } = await supabase
|
||||
.from('cash_accounts')
|
||||
.select('external_uid, ledger_account')
|
||||
.eq('company_id', updatedConnection.company_id)
|
||||
.eq('bank_connection_id', updatedConnection.id)
|
||||
const existingLedgerByUid = new Map(
|
||||
((mirroredRows ?? []) as Array<{ external_uid: string; ledger_account: string }>).map(
|
||||
(r) => [r.external_uid, r.ledger_account],
|
||||
),
|
||||
)
|
||||
const assignedLedgers = new Set<string>(existingLedgerByUid.values())
|
||||
let accountsDataDirty = false
|
||||
|
||||
for (const account of accountsMetadata) {
|
||||
let targetLedger = existingLedgerByUid.get(account.uid)
|
||||
if (!targetLedger) {
|
||||
targetLedger =
|
||||
(await allocatePsd2LedgerAccount(supabase, updatedConnection.company_id, updatedConnection.user_id, {
|
||||
currency: account.currency,
|
||||
accountName: account.name,
|
||||
exclude: assignedLedgers,
|
||||
})) ?? defaultLedgerForCurrency(account.currency)
|
||||
}
|
||||
assignedLedgers.add(targetLedger)
|
||||
if (account.ledger_account !== targetLedger) {
|
||||
account.ledger_account = targetLedger
|
||||
accountsDataDirty = true
|
||||
}
|
||||
try {
|
||||
await upsertFromPsd2(supabase, updatedConnection.company_id, {
|
||||
bank_connection_id: updatedConnection.id,
|
||||
external_uid: account.uid,
|
||||
currency: account.currency,
|
||||
ledger_account: targetLedger,
|
||||
iban: account.iban ?? null,
|
||||
name: account.name ?? null,
|
||||
enabled: account.enabled ?? true,
|
||||
})
|
||||
} catch (cashErr) {
|
||||
const reason = cashErr instanceof Error ? cashErr.message : String(cashErr)
|
||||
console.error('[enable-banking] Failed to mirror cash_account on callback', {
|
||||
connectionId: updatedConnection.id,
|
||||
uid: account.uid,
|
||||
error: reason,
|
||||
})
|
||||
// Persist the failure to event_log so a security review can see that
|
||||
// a PSD2 account returned by the bank was not mirrored into our
|
||||
// routing table; otherwise this is only visible in console output
|
||||
// (ASVS V16 / ISO 27001 A.8.15 / SOC 2 CC7.2).
|
||||
try {
|
||||
await eventBus.emit({
|
||||
type: 'bank_connection.cash_account_mirror_failed',
|
||||
payload: {
|
||||
connectionId: updatedConnection.id,
|
||||
bankName: updatedConnection.bank_name ?? null,
|
||||
accountUid: account.uid,
|
||||
ledgerAccount: targetLedger,
|
||||
currency: account.currency,
|
||||
reason,
|
||||
userId: updatedConnection.user_id,
|
||||
companyId: updatedConnection.company_id,
|
||||
},
|
||||
})
|
||||
} catch (emitError) {
|
||||
console.error('[enable-banking] Failed to emit cash_account_mirror_failed event', {
|
||||
connectionId: updatedConnection.id,
|
||||
error: emitError instanceof Error ? emitError.message : String(emitError),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Persist the allocated ledgers into accounts_data so the AccountPicker
|
||||
// pre-fills the actual assignments instead of colliding currency
|
||||
// defaults. Non-fatal: cash_accounts is the routing source of truth.
|
||||
if (accountsDataDirty) {
|
||||
const { error: accountsDataError } = await supabase
|
||||
.from('bank_connections')
|
||||
.update({ accounts_data: accountsMetadata })
|
||||
.eq('id', updatedConnection.id)
|
||||
if (accountsDataError) {
|
||||
console.warn('[enable-banking] Failed to persist allocated ledgers to accounts_data', {
|
||||
connectionId: updatedConnection.id,
|
||||
error: accountsDataError.message,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Audit trail: PSD2 consent has been exchanged and account metadata stored.
|
||||
// ASVS V16 requires this transition to be logged as a security event; emit
|
||||
// here so the event_log handler persists it (30-day TTL).
|
||||
try {
|
||||
await eventBus.emit({
|
||||
type: 'bank_connection.consent_granted',
|
||||
payload: {
|
||||
connectionId: updatedConnection.id,
|
||||
bankName: updatedConnection.bank_name ?? null,
|
||||
accountCount: accounts.length,
|
||||
consentExpiresAt: consentExpiresAt ?? null,
|
||||
userId: updatedConnection.user_id,
|
||||
companyId: updatedConnection.company_id,
|
||||
},
|
||||
})
|
||||
} catch (emitError) {
|
||||
// Non-fatal: redirect the user even if the audit event fails. Sentry
|
||||
// surfaces the error; the underlying DB write (the source of truth for
|
||||
// the connection state) has already succeeded.
|
||||
console.error('[enable-banking] Failed to emit consent_granted event', {
|
||||
connectionId: updatedConnection.id,
|
||||
error: emitError instanceof Error ? emitError.message : String(emitError),
|
||||
})
|
||||
}
|
||||
|
||||
const connectionId = updatedConnection.id
|
||||
const redirectTarget = `/settings/banking?select_accounts=${connectionId}`
|
||||
|
||||
return NextResponse.redirect(`${baseUrl}${redirectTarget}`)
|
||||
} catch (error) {
|
||||
console.error('[enable-banking] Callback error', {
|
||||
message: error instanceof Error ? error.message : String(error),
|
||||
stack: error instanceof Error ? error.stack : undefined,
|
||||
name: error instanceof Error ? error.name : undefined,
|
||||
if (findError || !pendingConnection) {
|
||||
console.error('[enable-banking] No pending connection for oauth_state', {
|
||||
findError: findError ? { message: findError.message, code: findError.code, details: findError.details } : null,
|
||||
state,
|
||||
hasCode: !!code,
|
||||
})
|
||||
|
||||
try {
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.update({ status: 'error', error_message: error instanceof Error ? error.message : 'Connection failed', oauth_state: null })
|
||||
.eq('oauth_state', state)
|
||||
.in('status', ['pending', 'expired', 'error'])
|
||||
} catch (cleanupError) {
|
||||
console.error('[enable-banking] Callback cleanup failed', {
|
||||
cleanupError: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
|
||||
})
|
||||
}
|
||||
|
||||
return NextResponse.redirect(
|
||||
`${baseUrl}/settings/banking?bank_error=${encodeURIComponent('Connection failed')}`
|
||||
`${baseUrl}/settings/banking?bank_error=${encodeURIComponent('invalid_state')}`
|
||||
)
|
||||
}
|
||||
|
||||
// Kick the finalize work off eagerly, decoupled from the response stream:
|
||||
// if the user closes the tab mid-stream, the stream is cancelled but this
|
||||
// promise keeps running, so the session persistence, cash-account mirror
|
||||
// and consent_granted audit emit are not lost (ASVS V16). Never rejects:
|
||||
// failures resolve to the cleanup redirect target.
|
||||
const finalizePromise = (async (): Promise<string> => {
|
||||
try {
|
||||
return await finalizeConnection(supabase, pendingConnection, code)
|
||||
} catch (finalizeError) {
|
||||
console.error('[enable-banking] Callback error', {
|
||||
message: finalizeError instanceof Error ? finalizeError.message : String(finalizeError),
|
||||
stack: finalizeError instanceof Error ? finalizeError.stack : undefined,
|
||||
name: finalizeError instanceof Error ? finalizeError.name : undefined,
|
||||
state,
|
||||
connectionId: pendingConnection.id,
|
||||
})
|
||||
return cleanupFailedFinalize(supabase, pendingConnection)
|
||||
}
|
||||
})()
|
||||
|
||||
// Keep the serverless function alive until the finalize work settles even
|
||||
// if the client disconnects and the platform considers the response done.
|
||||
try {
|
||||
after(() => finalizePromise.then(() => undefined))
|
||||
} catch {
|
||||
// Outside a request scope (unit tests, plain node server): the stream's
|
||||
// own await below still drives the promise to completion.
|
||||
}
|
||||
|
||||
// Per-request CSP nonce for the two inline scripts on the finalize page
|
||||
// (ASVS V3.3): mirrors the mcp-oauth consent page. The global next.config
|
||||
// CSP also applies; the intersection means inline scripts on THIS response
|
||||
// must carry the nonce.
|
||||
const cspNonce = randomBytes(16).toString('base64')
|
||||
const csp = [
|
||||
"default-src 'none'",
|
||||
`script-src 'nonce-${cspNonce}'`,
|
||||
"style-src 'unsafe-inline'",
|
||||
"base-uri 'none'",
|
||||
"form-action 'self'",
|
||||
"frame-ancestors 'none'",
|
||||
].join('; ')
|
||||
|
||||
// Stream: flush the branded "Slutför bankanslutningen" shell immediately,
|
||||
// await the finalize work, then stream a client-side redirect to the
|
||||
// outcome URL. The user sees progress from the first byte instead of a
|
||||
// blank tab.
|
||||
const encoder = new TextEncoder()
|
||||
const stream = new ReadableStream<Uint8Array>({
|
||||
async start(controller) {
|
||||
controller.enqueue(encoder.encode(renderFinalizeShell(pendingConnection.bank_name, cspNonce)))
|
||||
const targetPath = await finalizePromise
|
||||
try {
|
||||
controller.enqueue(encoder.encode(renderFinalizeRedirect(`${baseUrl}${targetPath}`, cspNonce)))
|
||||
controller.close()
|
||||
} catch {
|
||||
// Stream already cancelled (client closed the tab). The finalize
|
||||
// work above completed regardless; there is just no one to redirect.
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
return new Response(stream, {
|
||||
headers: {
|
||||
'Content-Type': 'text/html; charset=utf-8',
|
||||
'Content-Security-Policy': csp,
|
||||
// The body carries a one-time OAuth outcome: never cache, never buffer
|
||||
// (X-Accel-Buffering opts out of proxy buffering so the shell chunk
|
||||
// actually reaches the browser before the work finishes).
|
||||
'Cache-Control': 'no-store',
|
||||
'X-Accel-Buffering': 'no',
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* The slow part of the callback: exchange the authorization code for a PSD2
|
||||
* session, persist the account metadata, mirror accounts into cash_accounts,
|
||||
* and emit the audit event. Returns the app-relative redirect target.
|
||||
* Extracted so the route can run it behind the streamed progress page.
|
||||
*/
|
||||
async function finalizeConnection(
|
||||
supabase: ServiceClient,
|
||||
pendingConnection: PendingConnection,
|
||||
code: string,
|
||||
): Promise<string> {
|
||||
const userId = pendingConnection.user_id
|
||||
|
||||
console.log('[enable-banking] Exchanging code for session', {
|
||||
connectionId: pendingConnection.id,
|
||||
userId,
|
||||
codeLength: code.length,
|
||||
})
|
||||
|
||||
const sessionData = await createSession(code)
|
||||
const { session_id, accounts, access } = sessionData
|
||||
const consentExpiresAt = access.valid_until
|
||||
|
||||
console.log('[enable-banking] Session created successfully', {
|
||||
connectionId: pendingConnection.id,
|
||||
sessionId: '[REDACTED]',
|
||||
accountCount: accounts.length,
|
||||
consentExpiresAt,
|
||||
})
|
||||
|
||||
// GDPR Art.5(1)(c) / Art.25(1): data minimization. We only store the
|
||||
// metadata the user needs to pick which accounts to sync (uid, name, IBAN,
|
||||
// currency). Balances are bank account financial data: we don't fetch
|
||||
// them here. The first sync (after the user enables specific accounts)
|
||||
// populates balance + balance_updated_at via lib/sync.ts. Accounts the
|
||||
// user deselects never have their balance pulled.
|
||||
const accountsMetadata: StoredAccount[] = accounts.map((account: AccountInfo) => ({
|
||||
uid: account.uid,
|
||||
iban: account.account_id?.iban,
|
||||
name: account.name || account.product,
|
||||
currency: account.currency,
|
||||
// Default to enabled. The user is presented with a picker
|
||||
// immediately after this callback to uncheck unwanted accounts
|
||||
// before any transactions are fetched.
|
||||
enabled: true,
|
||||
}))
|
||||
|
||||
// Stay in 'pending_selection' until the user confirms which accounts to sync.
|
||||
// The cron and manual sync routes both skip this status, so no transactions
|
||||
// can be pulled before the user has had a chance to deselect accounts.
|
||||
// Do not set last_synced_at here either: no transactions have been fetched
|
||||
// yet, and setting it would cause the cron's first-sync 90-day backfill
|
||||
// path to be skipped. The first successful sync sets it.
|
||||
const { data: updatedConnection, error: updateError } = await supabase
|
||||
.from('bank_connections')
|
||||
.update({
|
||||
session_id,
|
||||
status: 'pending_selection',
|
||||
accounts_data: accountsMetadata,
|
||||
consent_expires: consentExpiresAt,
|
||||
oauth_state: null, // Clear to prevent replay
|
||||
})
|
||||
.eq('id', pendingConnection.id)
|
||||
.select('id, bank_name, company_id, user_id')
|
||||
.single()
|
||||
|
||||
if (updateError) {
|
||||
console.error('[enable-banking] Failed to update connection after session creation', {
|
||||
connectionId: pendingConnection.id,
|
||||
updateError: { message: updateError.message, code: updateError.code, details: updateError.details },
|
||||
sessionId: '[REDACTED]',
|
||||
})
|
||||
throw new Error(`Failed to update connection: ${updateError.message}`)
|
||||
}
|
||||
|
||||
// Mirror each PSD2 account into cash_accounts so routing decisions read
|
||||
// from the canonical entity table. Accounts already mirrored (reconnect)
|
||||
// keep their ledger_account — re-deriving it here would clobber the
|
||||
// user's remaps. New accounts each get a free BAS class-19 slot: a bank
|
||||
// returning N same-currency accounts must not collide on the UNIQUE
|
||||
// (company_id, ledger_account) constraint by all defaulting to 1930.
|
||||
const { data: mirroredRows } = await supabase
|
||||
.from('cash_accounts')
|
||||
.select('external_uid, ledger_account')
|
||||
.eq('company_id', updatedConnection.company_id)
|
||||
.eq('bank_connection_id', updatedConnection.id)
|
||||
const existingLedgerByUid = new Map(
|
||||
((mirroredRows ?? []) as Array<{ external_uid: string; ledger_account: string }>).map(
|
||||
(r) => [r.external_uid, r.ledger_account],
|
||||
),
|
||||
)
|
||||
const assignedLedgers = new Set<string>(existingLedgerByUid.values())
|
||||
let accountsDataDirty = false
|
||||
|
||||
for (const account of accountsMetadata) {
|
||||
let targetLedger = existingLedgerByUid.get(account.uid)
|
||||
if (!targetLedger) {
|
||||
targetLedger =
|
||||
(await allocatePsd2LedgerAccount(supabase, updatedConnection.company_id, updatedConnection.user_id, {
|
||||
currency: account.currency,
|
||||
accountName: account.name,
|
||||
exclude: assignedLedgers,
|
||||
})) ?? defaultLedgerForCurrency(account.currency)
|
||||
}
|
||||
assignedLedgers.add(targetLedger)
|
||||
if (account.ledger_account !== targetLedger) {
|
||||
account.ledger_account = targetLedger
|
||||
accountsDataDirty = true
|
||||
}
|
||||
try {
|
||||
await upsertFromPsd2(supabase, updatedConnection.company_id, {
|
||||
bank_connection_id: updatedConnection.id,
|
||||
external_uid: account.uid,
|
||||
currency: account.currency,
|
||||
ledger_account: targetLedger,
|
||||
iban: account.iban ?? null,
|
||||
name: account.name ?? null,
|
||||
enabled: account.enabled ?? true,
|
||||
})
|
||||
} catch (cashErr) {
|
||||
const reason = cashErr instanceof Error ? cashErr.message : String(cashErr)
|
||||
console.error('[enable-banking] Failed to mirror cash_account on callback', {
|
||||
connectionId: updatedConnection.id,
|
||||
uid: account.uid,
|
||||
error: reason,
|
||||
})
|
||||
// Persist the failure to event_log so a security review can see that
|
||||
// a PSD2 account returned by the bank was not mirrored into our
|
||||
// routing table; otherwise this is only visible in console output
|
||||
// (ASVS V16 / ISO 27001 A.8.15 / SOC 2 CC7.2).
|
||||
try {
|
||||
await eventBus.emit({
|
||||
type: 'bank_connection.cash_account_mirror_failed',
|
||||
payload: {
|
||||
connectionId: updatedConnection.id,
|
||||
bankName: updatedConnection.bank_name ?? null,
|
||||
accountUid: account.uid,
|
||||
ledgerAccount: targetLedger,
|
||||
currency: account.currency,
|
||||
reason,
|
||||
userId: updatedConnection.user_id,
|
||||
companyId: updatedConnection.company_id,
|
||||
},
|
||||
})
|
||||
} catch (emitError) {
|
||||
// A.8.15: structured error (not bare console) so log-based alerting
|
||||
// catches a dropped security event instead of it vanishing silently.
|
||||
log.error(AUDIT_EMIT_FAILED, emitError as Error, {
|
||||
eventType: 'bank_connection.cash_account_mirror_failed',
|
||||
connectionId: updatedConnection.id,
|
||||
accountUid: account.uid,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Persist the allocated ledgers into accounts_data so the AccountPicker
|
||||
// pre-fills the actual assignments instead of colliding currency
|
||||
// defaults. Non-fatal: cash_accounts is the routing source of truth.
|
||||
if (accountsDataDirty) {
|
||||
const { error: accountsDataError } = await supabase
|
||||
.from('bank_connections')
|
||||
.update({ accounts_data: accountsMetadata })
|
||||
.eq('id', updatedConnection.id)
|
||||
if (accountsDataError) {
|
||||
console.warn('[enable-banking] Failed to persist allocated ledgers to accounts_data', {
|
||||
connectionId: updatedConnection.id,
|
||||
error: accountsDataError.message,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Audit trail: PSD2 consent has been exchanged and account metadata stored.
|
||||
// ASVS V16 requires this transition to be logged as a security event; emit
|
||||
// here so the event_log handler persists it (30-day TTL).
|
||||
try {
|
||||
await eventBus.emit({
|
||||
type: 'bank_connection.consent_granted',
|
||||
payload: {
|
||||
connectionId: updatedConnection.id,
|
||||
bankName: updatedConnection.bank_name ?? null,
|
||||
accountCount: accounts.length,
|
||||
consentExpiresAt: consentExpiresAt ?? null,
|
||||
userId: updatedConnection.user_id,
|
||||
companyId: updatedConnection.company_id,
|
||||
},
|
||||
})
|
||||
} catch (emitError) {
|
||||
// Non-fatal: redirect the user even if the audit event fails. The
|
||||
// structured error record is the alerting channel (A.8.15): production
|
||||
// log monitoring keys on the stable message. The underlying DB write
|
||||
// (the source of truth for the connection state) has already succeeded.
|
||||
log.error(AUDIT_EMIT_FAILED, emitError as Error, {
|
||||
eventType: 'bank_connection.consent_granted',
|
||||
connectionId: updatedConnection.id,
|
||||
})
|
||||
}
|
||||
|
||||
return `/settings/banking?select_accounts=${updatedConnection.id}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Failure cleanup after finalizeConnection threw. A fresh connect (prior
|
||||
* status 'pending') never became a connection: delete the row so it can't
|
||||
* linger as a zombie "Åtgärd krävs" card next to a successful retry. A
|
||||
* reconnect row (established connection) is kept and marked 'error' so the
|
||||
* user retains the renew affordance. Returns the error redirect target.
|
||||
*/
|
||||
async function cleanupFailedFinalize(
|
||||
supabase: ServiceClient,
|
||||
pendingConnection: PendingConnection,
|
||||
): Promise<string> {
|
||||
try {
|
||||
if (pendingConnection.status === 'pending') {
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.delete()
|
||||
.eq('id', pendingConnection.id)
|
||||
.eq('status', 'pending')
|
||||
} else {
|
||||
await supabase
|
||||
.from('bank_connections')
|
||||
.update({ status: 'error', error_message: FINALIZE_FAILED_MESSAGE, oauth_state: null })
|
||||
.eq('id', pendingConnection.id)
|
||||
.in('status', ['pending', 'expired', 'error'])
|
||||
}
|
||||
} catch (cleanupError) {
|
||||
console.error('[enable-banking] Callback cleanup failed', {
|
||||
cleanupError: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
|
||||
})
|
||||
}
|
||||
|
||||
const params = new URLSearchParams({
|
||||
bank_error: FINALIZE_FAILED_MESSAGE,
|
||||
...(pendingConnection.bank_name ? { bank_name: pendingConnection.bank_name } : {}),
|
||||
})
|
||||
return `/settings/banking?${params.toString()}`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user