* feat: invoicing & account-security polish bundle Five independent improvements bundled to ship together: - BankID/password lockout fix: BankID-only users could enroll MFA and brick themselves (Supabase requires AAL2 to change password or unenroll MFA, and AAL2 needs a password sign-in). New app_metadata.has_password flag tracks this; middleware gates /mfa/enroll behind it, /account/set- password is the unlock path, SecuritySettings shows a banner, and /api/account/password is the single write path that flips the flag. Backfill script for existing users. - Swish invoice payment method: company_settings.swish + invoice_show_swish columns, validation in lib/api/schemas.ts (accepts 123XXXXXXX företag or 07XXXXXXXX mobile, strips whitespace/hyphens), rendered on invoice PDFs. - Send-reminders kill switch: per-company company_settings.send_invoice_ reminders toggle in PdfPrintSettings/Automatisering. Reminder processor also tightened: positive status allowlist (sent + overdue) so terminal statuses can never match; skip when customer already responded via reminder link; race-window re-check before send. - First-invoice logo prompt: one-shot dialog when creating the first invoice without a logo (issue #520). Self-limits via head-only count. - SIE export opening-balance fallback: route IB through getOpeningBalances so the compute_prior_opening_balances RPC supplies #IB after multi-year imports where opening_balance_entry_id is intentionally NULL. Previously #IB silently went to zero and #UB collapsed to current-period movements. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(account-polish): address PR review feedback - BankID-link path (extensions/general/tic/index.ts): read-merge-write app_metadata instead of passing { bankid_linked: true } alone. updateUserById REPLACES app_metadata wholesale, so the previous code would have wiped has_password for any user who later linked BankID, causing the set-password banner to (incorrectly) reappear and blocking the standard MFA enrollment button. The comment is now corrected. - Middleware (lib/supabase/middleware.ts): thread inner returnTo through the /mfa/enroll → /account/set-password redirect so the user lands on their original destination after the full chain completes, not on /. - safeReturnTo helper (lib/auth/safe-return-to.ts): replace the starts-with-/-but-not-// guard on mfa/enroll and set-password pages. The previous guard let /\evil.com and /@evil.com through. The new helper parses against a synthetic base origin and verifies it matches. - set-password page (app/(auth)/account/set-password/page.tsx): remove CLAUDE.md design system violations — bg-gradient-to-b on page bg, inline shadow-md style on the card, space-y-5, font-medium on the h1, rounded-xl on the card. Flat surface, hairline border, font-display h1 per the design tokens. - Swish dedup (lib/payments/swish.ts): extract normaliseSwish() and isValidSwish() helpers and use them in lib/api/schemas.ts, components/settings/BankDetailsForm.tsx, and the invoicing settings page. Single source of truth for the regex. - Password route (app/api/account/password/route.ts): emit a structured success log so the audit pipeline can detect password-set events, not just failures. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
151 lines
5.9 KiB
TypeScript
151 lines
5.9 KiB
TypeScript
'use client'
|
|
|
|
import { useState } from 'react'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Label } from '@/components/ui/label'
|
|
import { BankNameCombobox } from '@/components/settings/BankNameCombobox'
|
|
import { validateBankgiroNumber, formatBankgiroNumber } from '@/lib/bankgiro/luhn'
|
|
import { normaliseSwish, isValidSwish } from '@/lib/payments/swish'
|
|
import { ENABLED_EXTENSION_IDS } from '@/lib/extensions/_generated/enabled-extensions'
|
|
import type { CompanySettings } from '@/types'
|
|
|
|
interface BankDetailsFormProps {
|
|
settings: CompanySettings
|
|
}
|
|
|
|
export function BankDetailsForm({ settings }: BankDetailsFormProps) {
|
|
const [bankgiroError, setBankgiroError] = useState<string | null>(null)
|
|
const [clearingError, setClearingError] = useState<string | null>(null)
|
|
const [accountNumberError, setAccountNumberError] = useState<string | null>(null)
|
|
const [swishError, setSwishError] = useState<string | null>(null)
|
|
const hasBankingExtension = ENABLED_EXTENSION_IDS.has('enable-banking')
|
|
|
|
return (
|
|
<section className="space-y-4">
|
|
<h2 className="text-sm font-medium uppercase tracking-wider text-muted-foreground">
|
|
Bankuppgifter
|
|
</h2>
|
|
<p className="text-xs text-muted-foreground -mt-2">
|
|
Visas på dina fakturor
|
|
</p>
|
|
|
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<div className="space-y-2">
|
|
<Label>Bank</Label>
|
|
<BankNameCombobox
|
|
defaultValue={settings.bank_name || ''}
|
|
enableBankingEnabled={hasBankingExtension}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="clearing_number">Clearing</Label>
|
|
<Input
|
|
id="clearing_number"
|
|
name="clearing_number"
|
|
inputMode="numeric"
|
|
placeholder="XXXX"
|
|
maxLength={5}
|
|
defaultValue={settings.clearing_number || ''}
|
|
onChange={(e) => {
|
|
e.target.value = e.target.value.replace(/\D/g, '')
|
|
}}
|
|
onBlur={(e) => {
|
|
const val = e.target.value.trim()
|
|
if (!val) { setClearingError(null); return }
|
|
setClearingError(!/^\d{4,5}$/.test(val) ? 'Måste vara 4-5 siffror' : null)
|
|
}}
|
|
/>
|
|
{clearingError && <p className="text-xs text-destructive">{clearingError}</p>}
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="account_number">Kontonummer</Label>
|
|
<Input
|
|
id="account_number"
|
|
name="account_number"
|
|
inputMode="numeric"
|
|
placeholder="XXXXXXX"
|
|
maxLength={12}
|
|
defaultValue={settings.account_number || ''}
|
|
onChange={(e) => {
|
|
e.target.value = e.target.value.replace(/\D/g, '')
|
|
}}
|
|
onBlur={(e) => {
|
|
const val = e.target.value.trim()
|
|
if (!val) { setAccountNumberError(null); return }
|
|
setAccountNumberError(!/^\d{6,12}$/.test(val) ? 'Måste vara 6-12 siffror' : null)
|
|
}}
|
|
/>
|
|
{accountNumberError && <p className="text-xs text-destructive">{accountNumberError}</p>}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="bankgiro">Bankgiro</Label>
|
|
<Input
|
|
id="bankgiro"
|
|
name="bankgiro"
|
|
placeholder="XXX-XXXX"
|
|
defaultValue={settings.bankgiro || ''}
|
|
onBlur={(e) => {
|
|
const val = e.target.value.trim()
|
|
if (!val) { setBankgiroError(null); return }
|
|
if (validateBankgiroNumber(val)) {
|
|
e.target.value = formatBankgiroNumber(val)
|
|
setBankgiroError(null)
|
|
} else {
|
|
setBankgiroError('Ogiltigt bankgironummer')
|
|
}
|
|
}}
|
|
/>
|
|
{bankgiroError && <p className="text-xs text-destructive">{bankgiroError}</p>}
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<Label htmlFor="swish">Swish</Label>
|
|
<Input
|
|
id="swish"
|
|
name="swish"
|
|
placeholder="123 XXX XX XX eller 07X XXX XX XX"
|
|
defaultValue={settings.swish || ''}
|
|
onBlur={(e) => {
|
|
const val = normaliseSwish(e.target.value)
|
|
if (!val) { setSwishError(null); e.target.value = ''; return }
|
|
if (isValidSwish(val)) {
|
|
e.target.value = val
|
|
setSwishError(null)
|
|
} else {
|
|
setSwishError('Ogiltigt Swish-nummer (företagsnummer 123XXXXXXX eller mobilnummer 07XXXXXXXX)')
|
|
}
|
|
}}
|
|
/>
|
|
{swishError && <p className="text-xs text-destructive">{swishError}</p>}
|
|
</div>
|
|
</div>
|
|
</section>
|
|
)
|
|
}
|
|
|
|
/** Validate bank fields from FormData. Returns error messages or null. */
|
|
export function validateBankFields(formData: FormData): { field: string; message: string }[] {
|
|
const errors: { field: string; message: string }[] = []
|
|
const clearing = (formData.get('clearing_number') as string || '').trim()
|
|
const account = (formData.get('account_number') as string || '').trim()
|
|
const bankgiro = (formData.get('bankgiro') as string || '').trim()
|
|
const swish = normaliseSwish(formData.get('swish') as string)
|
|
|
|
if (clearing && !/^\d{4,5}$/.test(clearing)) {
|
|
errors.push({ field: 'clearing_number', message: 'Clearingnummer måste vara 4-5 siffror' })
|
|
}
|
|
if (account && !/^\d{6,12}$/.test(account)) {
|
|
errors.push({ field: 'account_number', message: 'Kontonummer måste vara 6-12 siffror' })
|
|
}
|
|
if (bankgiro && !validateBankgiroNumber(bankgiro)) {
|
|
errors.push({ field: 'bankgiro', message: 'Ogiltigt bankgironummer' })
|
|
}
|
|
if (swish && !isValidSwish(swish)) {
|
|
errors.push({ field: 'swish', message: 'Ogiltigt Swish-nummer (företagsnummer 123XXXXXXX eller mobilnummer 07XXXXXXXX)' })
|
|
}
|
|
return errors
|
|
}
|