11995b1b0c
* feat(auth): make automatic logout an opt-in per-user setting Session timeouts (30 min idle / 12 h absolute on hosted) now apply only to users who enable "Automatic logout" in Settings > Security. Default is off: sessions live for the full Supabase refresh-token lifetime, the behavior from before the 2026-07 session hardening. - user_preferences.auto_logout (migration, default false), toggled via the extended /api/user/preferences route - The opt-in is snapshotted into the signed timeout cookie at mint, so enforcement stays DB-read-free per request; the preferences route clears the cookie on change so a toggle takes effect immediately - Pre-toggle cookies are authentic-but-stale: re-minted preserving their timers, never routed down the tamper path, so the rollout does not log anyone out - NEXT_PUBLIC_SESSION_TIMEOUT_FORCE_ALL=true enforces timeouts for every user regardless of preference (emergency lever, also plumbed through the Docker image); self-hosted stays disabled by default Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(auth): resolve PR #1536 review findings - Replace the spread upsert in /api/user/preferences with one literal payload per field: the phantom-column schema guard cannot resolve spread payloads (Unit tests 3/4 ceiling failure) - Map the preferences 500 through getErrorMessage so the user-facing text is Swedish (CodeRabbit) - fetchAutoLogoutPreference now returns null on a FAILED read instead of a fail-open false: callers skip minting so an unknown preference is never persisted into the year-long signed cookie, and the next request retries; failures log at error level, distinct from the normal opt-out path (compliance swarm GDPR Art.32(1)(b) / ISO A.8.5) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(auth): write multi-field preference updates as one atomic upsert A request carrying both hide_assistant_fab and auto_logout previously issued two sequential writes, so a failure of the second returned 500 after half the request had persisted (CodeRabbit, PR #1536). One literal upsert per accepted field combination keeps the write atomic and stays resolvable for the phantom-column schema guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
109 lines
3.3 KiB
TypeScript
109 lines
3.3 KiB
TypeScript
import { NextResponse } from 'next/server'
|
|
import { z } from 'zod'
|
|
import { requireAuth } from '@/lib/auth/require-auth'
|
|
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
|
import { sessionTimeoutClearCookieOptions } from '@/lib/auth/session-timeout'
|
|
import { SESSION_TIMEOUT_COOKIE } from '@/lib/auth/session-timeout-shared'
|
|
|
|
// User-level UI preferences (not company-scoped), stored on user_preferences.
|
|
// Mirrors the /api/user/locale pattern: requireAuth directly because these
|
|
// must work even when the user has no active company.
|
|
|
|
const BodySchema = z
|
|
.object({
|
|
hide_assistant_fab: z.boolean().optional(),
|
|
auto_logout: z.boolean().optional(),
|
|
})
|
|
.strict()
|
|
.refine((value) => Object.keys(value).length > 0, {
|
|
message: 'At least one preference is required',
|
|
})
|
|
|
|
export async function GET() {
|
|
const { user, supabase, error } = await requireAuth()
|
|
if (error) return error
|
|
|
|
const { data } = await supabase
|
|
.from('user_preferences')
|
|
.select('hide_assistant_fab, auto_logout')
|
|
.eq('user_id', user.id)
|
|
.maybeSingle()
|
|
|
|
return NextResponse.json({
|
|
data: {
|
|
hide_assistant_fab: data?.hide_assistant_fab ?? false,
|
|
auto_logout: data?.auto_logout ?? false,
|
|
},
|
|
})
|
|
}
|
|
|
|
export async function PATCH(request: Request) {
|
|
const { user, supabase, error } = await requireAuth()
|
|
if (error) return error
|
|
|
|
let body: unknown
|
|
try {
|
|
body = await request.json()
|
|
} catch {
|
|
return NextResponse.json({ error: 'Invalid JSON body' }, { status: 400 })
|
|
}
|
|
|
|
const parsed = BodySchema.safeParse(body)
|
|
if (!parsed.success) {
|
|
return NextResponse.json({ error: 'Invalid preferences' }, { status: 400 })
|
|
}
|
|
|
|
const { hide_assistant_fab, auto_logout } = parsed.data
|
|
|
|
// One literal upsert per accepted field combination: the phantom-column
|
|
// schema guard cannot resolve spread payloads, and a single write keeps a
|
|
// multi-field request atomic.
|
|
let upsertError: unknown = null
|
|
if (hide_assistant_fab !== undefined && auto_logout !== undefined) {
|
|
const { error } = await supabase
|
|
.from('user_preferences')
|
|
.upsert(
|
|
{ user_id: user.id, hide_assistant_fab, auto_logout },
|
|
{ onConflict: 'user_id' },
|
|
)
|
|
upsertError = error
|
|
} else if (hide_assistant_fab !== undefined) {
|
|
const { error } = await supabase
|
|
.from('user_preferences')
|
|
.upsert({ user_id: user.id, hide_assistant_fab }, { onConflict: 'user_id' })
|
|
upsertError = error
|
|
} else if (auto_logout !== undefined) {
|
|
const { error } = await supabase
|
|
.from('user_preferences')
|
|
.upsert({ user_id: user.id, auto_logout }, { onConflict: 'user_id' })
|
|
upsertError = error
|
|
}
|
|
|
|
if (upsertError) {
|
|
return NextResponse.json(
|
|
{
|
|
error: getErrorMessage(upsertError, {
|
|
context: 'settings',
|
|
statusCode: 500,
|
|
}),
|
|
},
|
|
{ status: 500 },
|
|
)
|
|
}
|
|
|
|
const response = NextResponse.json({ data: parsed.data })
|
|
|
|
if (parsed.data.auto_logout !== undefined) {
|
|
// The middleware caches the opt-in inside the signed timeout cookie.
|
|
// Clearing it forces a re-mint on the next request, so the change takes
|
|
// effect immediately instead of at the next login.
|
|
response.cookies.set(
|
|
SESSION_TIMEOUT_COOKIE,
|
|
'',
|
|
sessionTimeoutClearCookieOptions(),
|
|
)
|
|
}
|
|
|
|
return response
|
|
}
|