Fix/chrome pdf preview csp (#572)
* feat: add option to exclude year-end closing entries in SIE export and related reports * delete docs * fix: allow Chrome's PDF viewer in verifikat document preview The /api/documents/:id/inline route shipped with `object-src 'none'` in its CSP, which blocked Chrome's built-in PDF viewer (it renders inline PDFs via an internal <embed>). Users on Chrome saw "Det här innehållet har blockerats" when expanding a PDF attachment in the bookkeeping view; Firefox (PDF.js) and Edge (own viewer) were unaffected, and JPGs worked because <img> isn't subject to object-src. Drops the CSP for this route to the minimum needed for embeddability: `frame-ancestors 'self'`. X-Content-Type-Options: nosniff plus the fixed Content-Type from the handler already block MIME confusion; X-Frame-Options: SAMEORIGIN + frame-ancestors still block clickjacking. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(auth): add webmail deep link to email confirmation screens Mirrors Stripe's signup UX: after asking the user to verify their email, detect their webmail provider from the domain and show a button that opens the inbox in a new tab. Gmail gets a from:<sender> search pre-populated; Outlook/Yahoo/iCloud/Proton open the inbox directly. Unknown / custom domains fall back to the existing copy. Sender address is configurable via NEXT_PUBLIC_BRANDING_AUTH_EMAIL_FROM (default noreply@gnubok.se) so white-label installs can match their Supabase Auth SMTP config. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(auth): unblock first-time password set for BankID users with MFA Supabase rejects updateUser({password}) and mfa.unenroll with "AAL2 session is required" whenever a TOTP factor is enrolled. BankID magic-link logins produce AAL1, and middleware skips MFA enforcement for bankid_linked users, so they had no path to AAL2 — leaving them unable to set a backup password or disable MFA without going through the email-recovery escape hatch. - /api/account/password: branch on app_metadata.has_password. First-time set writes via service.auth.admin.updateUserById (no existing credential to protect, AAL2 guard does not apply). Change-password keeps the user-session updateUser so AAL2 still fires for credential rotation. - /mfa/verify: accept a safeReturnTo query param and route there after successful verify, so step-up flows can land back where they came from. - SecuritySettings: detect the AAL2 error from both change-password and mfa.unenroll and redirect through /mfa/verify?returnTo=/settings/account instead of toasting a dead-end error. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Add tests and rounding utility for öre precision in bokslut calculations - Implemented `roundOre` function for rounding SEK amounts to two decimal places, ensuring consistent monetary calculations. - Introduced `ORE_TOLERANCE` constant for comparing rounded amounts, facilitating invariant checks in financial entries. - Created comprehensive tests for `roundOre`, covering typical cases, edge cases, and idempotency. - Added year-end invariants tests to verify database-level guarantees for closing entries, ensuring they balance to the öre and reject discrepancies. - Developed end-to-end tests for the dispositions chain, validating the correctness of calculations across various scenarios. * fix: update PDF rendering to remove Swish QR code generation and set default to disable Swish visibility * fix: enhance security by rejecting data URIs in safeReturnTo function tests * fix: improve rounding logic in roundOre function and add customer_type migration * fix: add customer_type column to customers and enforce CHECK constraint --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Opus 4.7
Claude Opus 4.7
parent
0087b7be3f
commit
32d9978f1b
@@ -0,0 +1,105 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import {
|
||||
generateReminderEmailHtml,
|
||||
generateReminderEmailText,
|
||||
generateReminderEmailSubject,
|
||||
} from '../reminder-templates'
|
||||
import { makeCustomer, makeInvoice, makeCompanySettings } from '@/tests/helpers'
|
||||
|
||||
const company = makeCompanySettings({ company_name: 'Acme AB' })
|
||||
const customer = makeCustomer({ name: 'Erik Andersson', email: 'erik@example.se' })
|
||||
const invoice = makeInvoice({
|
||||
invoice_number: 'F2026010',
|
||||
invoice_date: '2026-04-15',
|
||||
due_date: '2026-05-01',
|
||||
currency: 'SEK',
|
||||
total: 10_000,
|
||||
})
|
||||
|
||||
const baseData = {
|
||||
invoice,
|
||||
customer,
|
||||
company,
|
||||
reminderLevel: 1 as const,
|
||||
daysOverdue: 25,
|
||||
actionUrl: 'https://example.com/invoice-action/abc',
|
||||
}
|
||||
|
||||
describe('reminder email templates — surcharges', () => {
|
||||
it('renders dröjsmålsränta + påminnelseavgift in HTML when set', () => {
|
||||
const html = generateReminderEmailHtml({
|
||||
...baseData,
|
||||
interestAmount: 86.3,
|
||||
interestRate: 0.105,
|
||||
interestFromDate: '2026-05-01',
|
||||
interestDays: 30,
|
||||
reminderFee: 60,
|
||||
totalDue: 10_146.3,
|
||||
})
|
||||
expect(html).toContain('Ursprungligt belopp:')
|
||||
expect(html).toContain('Dröjsmålsränta')
|
||||
expect(html).toContain('Påminnelseavgift:')
|
||||
expect(html).toContain('Att betala:')
|
||||
expect(html).toContain('10,5%') // rate display (sv-SE format)
|
||||
expect(html).toContain('30 dagar')
|
||||
})
|
||||
|
||||
it('omits surcharge rows when both are zero', () => {
|
||||
const html = generateReminderEmailHtml({
|
||||
...baseData,
|
||||
interestAmount: 0,
|
||||
interestRate: 0.105,
|
||||
interestFromDate: '2026-05-01',
|
||||
interestDays: 0,
|
||||
reminderFee: 0,
|
||||
totalDue: 10_000,
|
||||
})
|
||||
expect(html).not.toContain('Dröjsmålsränta')
|
||||
expect(html).not.toContain('Påminnelseavgift:')
|
||||
expect(html).toContain('Att betala:')
|
||||
})
|
||||
|
||||
it('renders surcharges in plain text', () => {
|
||||
const text = generateReminderEmailText({
|
||||
...baseData,
|
||||
interestAmount: 86.3,
|
||||
interestRate: 0.105,
|
||||
interestFromDate: '2026-05-01',
|
||||
interestDays: 30,
|
||||
reminderFee: 60,
|
||||
totalDue: 10_146.3,
|
||||
})
|
||||
expect(text).toContain('Ursprungligt belopp')
|
||||
expect(text).toContain('Dröjsmålsränta')
|
||||
expect(text).toContain('Påminnelseavgift')
|
||||
expect(text).toContain('Att betala')
|
||||
})
|
||||
|
||||
it('subject includes surcharge note when surcharges apply', () => {
|
||||
const subject = generateReminderEmailSubject({
|
||||
...baseData,
|
||||
interestAmount: 86.3,
|
||||
interestRate: 0.105,
|
||||
interestFromDate: '2026-05-01',
|
||||
interestDays: 30,
|
||||
reminderFee: 60,
|
||||
totalDue: 10_146.3,
|
||||
})
|
||||
expect(subject).toContain('F2026010')
|
||||
expect(subject).toContain('inkl. dröjsmålsränta')
|
||||
})
|
||||
|
||||
it('subject is unchanged when no surcharges apply', () => {
|
||||
const subject = generateReminderEmailSubject({
|
||||
...baseData,
|
||||
interestAmount: 0,
|
||||
interestRate: 0,
|
||||
interestFromDate: '2026-05-01',
|
||||
interestDays: 0,
|
||||
reminderFee: 0,
|
||||
totalDue: 10_000,
|
||||
})
|
||||
expect(subject).not.toContain('inkl. dröjsmålsränta')
|
||||
expect(subject).toContain('F2026010')
|
||||
})
|
||||
})
|
||||
@@ -100,6 +100,14 @@ export interface InvoiceEmailData {
|
||||
company: CompanySettings
|
||||
}
|
||||
|
||||
// Minimal hex validator — guards against branding values that bypass the
|
||||
// settings UI and could inject CSS via crafted strings. Anything malformed
|
||||
// falls back to the legacy default.
|
||||
function safeBrandingColor(value: string | null | undefined, fallback: string): string {
|
||||
if (!value) return fallback
|
||||
return /^#[0-9A-Fa-f]{6}$/.test(value) ? value : fallback
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate HTML email for sending an invoice
|
||||
*/
|
||||
@@ -116,6 +124,13 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
const hidePayment = isCreditNote || isDeliveryNote || isProforma
|
||||
const firstName = customer.name ? customer.name.split(' ')[0] : ''
|
||||
|
||||
// Primary color drives the heading accent and the highlighted total. The
|
||||
// accent is sanitized to a strict hex pattern — anything else falls back
|
||||
// to the legacy dark neutral. Credit notes intentionally use the success
|
||||
// green for the total regardless of branding, because the customer's brain
|
||||
// is wired to expect "money coming back = green".
|
||||
const primaryColor = safeBrandingColor(company.invoice_primary_color, '#111111')
|
||||
|
||||
return `
|
||||
<!DOCTYPE html>
|
||||
<html lang="${L.htmlLang}">
|
||||
@@ -127,8 +142,8 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
<body style="margin: 0; padding: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; line-height: 1.6; color: #333;">
|
||||
<div style="max-width: 600px; margin: 0 auto; padding: 40px 20px;">
|
||||
<!-- Header -->
|
||||
<div style="margin-bottom: 30px;">
|
||||
<h1 style="margin: 0 0 10px 0; font-size: 24px; font-weight: 600; color: #111;">
|
||||
<div style="margin-bottom: 30px; border-bottom: 2px solid ${primaryColor}; padding-bottom: 16px;">
|
||||
<h1 style="margin: 0 0 10px 0; font-size: 24px; font-weight: 600; color: ${primaryColor};">
|
||||
${L.documentFrom(documentType, getCompanyPrimaryName(company))}
|
||||
</h1>
|
||||
<p style="margin: 0; color: #666; font-size: 14px;">
|
||||
@@ -146,7 +161,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Invoice Summary Box -->
|
||||
<!-- Summary Box -->
|
||||
<div style="background: #f8f9fa; border-radius: 8px; padding: 25px; margin-bottom: 30px;">
|
||||
<table style="width: 100%; border-collapse: collapse;">
|
||||
<tr>
|
||||
@@ -168,7 +183,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: 8px 0; font-size: 18px; font-weight: 600;">${L.toPay}</td>
|
||||
<td style="padding: 8px 0; text-align: right; font-size: 18px; font-weight: 600; color: ${isCreditNote ? '#059669' : '#111'};">
|
||||
<td style="padding: 8px 0; text-align: right; font-size: 18px; font-weight: 600; color: ${isCreditNote ? '#059669' : primaryColor};">
|
||||
${formatCurrencyForCustomer(invoice.total, invoice.currency, lang)}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -178,7 +193,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
<!-- Payment Details -->
|
||||
${!hidePayment ? `
|
||||
<div style="margin-bottom: 30px;">
|
||||
<h2 style="margin: 0 0 15px 0; font-size: 16px; font-weight: 600; color: #111;">
|
||||
<h2 style="margin: 0 0 15px 0; font-size: 16px; font-weight: 600; color: ${primaryColor};">
|
||||
${L.paymentHeading}
|
||||
</h2>
|
||||
<table style="width: 100%; border-collapse: collapse;">
|
||||
@@ -221,7 +236,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
|
||||
</p>
|
||||
<p style="margin: 0; color: #666; font-size: 14px;">
|
||||
${L.sincerely}<br>
|
||||
<strong>${getCompanyPrimaryName(company)}</strong>
|
||||
<strong style="color: ${primaryColor};">${getCompanyPrimaryName(company)}</strong>
|
||||
</p>
|
||||
${company.org_number ? `
|
||||
<p style="margin: 10px 0 0 0; color: #999; font-size: 12px;">
|
||||
|
||||
@@ -8,6 +8,15 @@ export interface ReminderEmailData {
|
||||
reminderLevel: 1 | 2 | 3
|
||||
daysOverdue: number
|
||||
actionUrl: string // URL for customer to mark as paid or dispute
|
||||
// Dröjsmålsränta + lagstadgad påminnelseavgift (Räntelagen §6, Lag 1981:739).
|
||||
// When the reminder is generated by the cron, these are computed and persisted
|
||||
// on the invoice_reminders row and then passed in here.
|
||||
interestAmount: number
|
||||
interestRate: number // annual rate as decimal (0.105 = 10.5%)
|
||||
interestFromDate: string
|
||||
interestDays: number
|
||||
reminderFee: number
|
||||
totalDue: number // invoice.total + interestAmount + reminderFee
|
||||
}
|
||||
|
||||
// Reminder level configurations
|
||||
@@ -33,8 +42,27 @@ const REMINDER_CONFIG = {
|
||||
* Generate HTML email for payment reminder
|
||||
*/
|
||||
export function generateReminderEmailHtml(data: ReminderEmailData): string {
|
||||
const { invoice, customer, company, reminderLevel, daysOverdue, actionUrl } = data
|
||||
const {
|
||||
invoice,
|
||||
customer,
|
||||
company,
|
||||
reminderLevel,
|
||||
daysOverdue,
|
||||
actionUrl,
|
||||
interestAmount,
|
||||
interestRate,
|
||||
interestDays,
|
||||
reminderFee,
|
||||
totalDue,
|
||||
} = data
|
||||
const config = REMINDER_CONFIG[reminderLevel]
|
||||
const interestRatePercent = (interestRate * 100).toLocaleString('sv-SE', {
|
||||
minimumFractionDigits: 0,
|
||||
maximumFractionDigits: 2,
|
||||
})
|
||||
const hasInterest = interestAmount > 0
|
||||
const hasFee = reminderFee > 0
|
||||
const hasSurcharges = hasInterest || hasFee
|
||||
|
||||
// Different styling based on urgency
|
||||
const headerColor = reminderLevel === 3 ? '#dc2626' : reminderLevel === 2 ? '#ea580c' : '#2563eb'
|
||||
@@ -117,9 +145,32 @@ export function generateReminderEmailHtml(data: ReminderEmailData): string {
|
||||
<td colspan="2" style="padding: 15px 0 8px 0; border-top: 1px solid #e5e7eb;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: 8px 0; font-size: 18px; font-weight: 600;">Belopp att betala:</td>
|
||||
<td style="padding: 8px 0; color: #666; font-size: 14px;">Ursprungligt belopp:</td>
|
||||
<td style="padding: 8px 0; text-align: right; font-weight: 500;">${formatCurrency(invoice.total, invoice.currency)}</td>
|
||||
</tr>
|
||||
${hasInterest ? `
|
||||
<tr>
|
||||
<td style="padding: 8px 0; color: #666; font-size: 14px;">
|
||||
Dröjsmålsränta (${interestRatePercent}% per år, ${interestDays} dagar):
|
||||
</td>
|
||||
<td style="padding: 8px 0; text-align: right; font-weight: 500;">${formatCurrency(interestAmount, invoice.currency)}</td>
|
||||
</tr>
|
||||
` : ''}
|
||||
${hasFee ? `
|
||||
<tr>
|
||||
<td style="padding: 8px 0; color: #666; font-size: 14px;">Påminnelseavgift:</td>
|
||||
<td style="padding: 8px 0; text-align: right; font-weight: 500;">${formatCurrency(reminderFee, invoice.currency)}</td>
|
||||
</tr>
|
||||
` : ''}
|
||||
${hasSurcharges ? `
|
||||
<tr>
|
||||
<td colspan="2" style="padding: 12px 0 8px 0; border-top: 1px solid #e5e7eb;"></td>
|
||||
</tr>
|
||||
` : ''}
|
||||
<tr>
|
||||
<td style="padding: 8px 0; font-size: 18px; font-weight: 600;">Att betala:</td>
|
||||
<td style="padding: 8px 0; text-align: right; font-size: 18px; font-weight: 600; color: ${headerColor};">
|
||||
${formatCurrency(invoice.total, invoice.currency)}
|
||||
${formatCurrency(totalDue, invoice.currency)}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -204,8 +255,26 @@ export function generateReminderEmailHtml(data: ReminderEmailData): string {
|
||||
* Generate plain text email for payment reminder
|
||||
*/
|
||||
export function generateReminderEmailText(data: ReminderEmailData): string {
|
||||
const { invoice, customer, company, reminderLevel, daysOverdue, actionUrl } = data
|
||||
const {
|
||||
invoice,
|
||||
customer,
|
||||
company,
|
||||
reminderLevel,
|
||||
daysOverdue,
|
||||
actionUrl,
|
||||
interestAmount,
|
||||
interestRate,
|
||||
interestDays,
|
||||
reminderFee,
|
||||
totalDue,
|
||||
} = data
|
||||
const config = REMINDER_CONFIG[reminderLevel]
|
||||
const interestRatePercent = (interestRate * 100).toLocaleString('sv-SE', {
|
||||
minimumFractionDigits: 0,
|
||||
maximumFractionDigits: 2,
|
||||
})
|
||||
const hasInterest = interestAmount > 0
|
||||
const hasFee = reminderFee > 0
|
||||
|
||||
let text = `${config.title.toUpperCase()}\n`
|
||||
text += `Faktura ${invoice.invoice_number} förföll för ${daysOverdue} dagar sedan\n`
|
||||
@@ -230,7 +299,14 @@ export function generateReminderEmailText(data: ReminderEmailData): string {
|
||||
text += `Fakturanummer: ${invoice.invoice_number}\n`
|
||||
text += `Fakturadatum: ${formatDate(invoice.invoice_date)}\n`
|
||||
text += `Förfallodatum: ${formatDate(invoice.due_date)}\n`
|
||||
text += `Belopp att betala: ${formatCurrency(invoice.total, invoice.currency)}\n`
|
||||
text += `Ursprungligt belopp: ${formatCurrency(invoice.total, invoice.currency)}\n`
|
||||
if (hasInterest) {
|
||||
text += `Dröjsmålsränta (${interestRatePercent}% per år, ${interestDays} dagar): ${formatCurrency(interestAmount, invoice.currency)}\n`
|
||||
}
|
||||
if (hasFee) {
|
||||
text += `Påminnelseavgift: ${formatCurrency(reminderFee, invoice.currency)}\n`
|
||||
}
|
||||
text += `Att betala: ${formatCurrency(totalDue, invoice.currency)}\n`
|
||||
text += `-`.repeat(30) + `\n\n`
|
||||
|
||||
text += `Betalningsinformation:\n`
|
||||
@@ -259,13 +335,21 @@ export function generateReminderEmailText(data: ReminderEmailData): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate email subject for payment reminder
|
||||
* Generate email subject for payment reminder.
|
||||
*
|
||||
* When dröjsmålsränta or påminnelseavgift apply we surface them in the
|
||||
* subject so the customer sees the true amount to pay before opening
|
||||
* the email.
|
||||
*/
|
||||
export function generateReminderEmailSubject(data: ReminderEmailData): string {
|
||||
const { invoice, reminderLevel } = data
|
||||
const { invoice, reminderLevel, totalDue, interestAmount, reminderFee } = data
|
||||
const config = REMINDER_CONFIG[reminderLevel]
|
||||
const hasSurcharges = interestAmount > 0 || reminderFee > 0
|
||||
|
||||
return `${config.title}: Faktura ${invoice.invoice_number} - ${formatCurrency(invoice.total, invoice.currency)}`
|
||||
const amount = hasSurcharges ? totalDue : invoice.total
|
||||
const suffix = hasSurcharges ? ' (inkl. dröjsmålsränta)' : ''
|
||||
|
||||
return `${config.title}: Faktura ${invoice.invoice_number} - ${formatCurrency(amount, invoice.currency)}${suffix}`
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user