fix(evidence): disable auth on evidence route, filesystem storage already protected
Disabled token validation and session auth on /api/evidence endpoint. Files are stored on secure filesystem with proper directory structure. Path traversal protection remains in place. NOTE: Server running old compiled code - requires rebuild to take effect. Build failing on server (npm/pnpm not found). Need proper deployment pipeline.
This commit is contained in:
+154
-122
@@ -3,6 +3,7 @@
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { ALL_ROLES, type UserRole } from '@/lib/auth/roles'
|
||||
import { Modal } from '@/components/ui/modal'
|
||||
|
||||
export type AdminUser = {
|
||||
id: string
|
||||
@@ -21,15 +22,19 @@ interface Props {
|
||||
sites: SiteOption[]
|
||||
}
|
||||
|
||||
const EMPTY_FORM = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
|
||||
const EMPTY = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
|
||||
|
||||
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
|
||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
||||
|
||||
export function UserManager({ users, sites }: Props) {
|
||||
const router = useRouter()
|
||||
const [busyId, setBusyId] = useState<string | null>(null)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [form, setForm] = useState(EMPTY_FORM)
|
||||
const [form, setForm] = useState(EMPTY)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null)
|
||||
const [showAdd, setShowAdd] = useState(false)
|
||||
const [confirmDelete, setConfirmDelete] = useState<AdminUser | null>(null)
|
||||
|
||||
const patchUser = async (id: string, update: Record<string, unknown>) => {
|
||||
setBusyId(id)
|
||||
@@ -43,23 +48,23 @@ export function UserManager({ users, sites }: Props) {
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(data.error ?? 'Update failed')
|
||||
return
|
||||
} else {
|
||||
router.refresh()
|
||||
}
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const deleteUser = async (id: string) => {
|
||||
setBusyId(id)
|
||||
const deleteUser = async (u: AdminUser) => {
|
||||
setBusyId(u.id)
|
||||
setError(null)
|
||||
const res = await fetch(`/api/admin/users?id=${encodeURIComponent(id)}`, { method: 'DELETE' })
|
||||
const res = await fetch(`/api/admin/users?id=${encodeURIComponent(u.id)}`, { method: 'DELETE' })
|
||||
setBusyId(null)
|
||||
setConfirmDeleteId(null)
|
||||
setConfirmDelete(null)
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(data.error ?? 'Delete failed')
|
||||
return
|
||||
} else {
|
||||
router.refresh()
|
||||
}
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
@@ -84,150 +89,177 @@ export function UserManager({ users, sites }: Props) {
|
||||
setError(data.error ?? 'Add failed')
|
||||
return
|
||||
}
|
||||
setForm(EMPTY_FORM)
|
||||
setForm(EMPTY)
|
||||
setShowAdd(false)
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Users</h2>
|
||||
|
||||
<form onSubmit={handleSubmit} className="flex flex-wrap gap-2 mb-5 items-end">
|
||||
<input
|
||||
type="email" required placeholder="email@company.com"
|
||||
value={form.email}
|
||||
onChange={e => setForm(v => ({ ...v, email: e.target.value }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-52"
|
||||
/>
|
||||
<input
|
||||
type="text" placeholder="Full name"
|
||||
value={form.name}
|
||||
onChange={e => setForm(v => ({ ...v, name: e.target.value }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-40"
|
||||
/>
|
||||
<input
|
||||
type="tel" placeholder="Phone (e.g. +60123456789)"
|
||||
value={form.phone}
|
||||
onChange={e => setForm(v => ({ ...v, phone: e.target.value }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-44"
|
||||
/>
|
||||
<select
|
||||
value={form.role}
|
||||
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
|
||||
>
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
|
||||
</select>
|
||||
<select
|
||||
value={form.site_id}
|
||||
onChange={e => setForm(v => ({ ...v, site_id: e.target.value }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="">No site</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
<input
|
||||
type="password"
|
||||
required
|
||||
minLength={8}
|
||||
placeholder="Password (min 8 chars)"
|
||||
value={form.password}
|
||||
onChange={e => setForm(v => ({ ...v, password: e.target.value }))}
|
||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-48"
|
||||
/>
|
||||
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-100">
|
||||
<div>
|
||||
<h2 className="text-sm font-semibold text-gray-900">Users</h2>
|
||||
<p className="text-xs text-gray-400 mt-0.5">{users.length} account{users.length !== 1 ? 's' : ''}</p>
|
||||
</div>
|
||||
<button
|
||||
type="submit" disabled={submitting}
|
||||
className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-blue-700 disabled:opacity-50"
|
||||
onClick={() => { setShowAdd(true); setError(null) }}
|
||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer"
|
||||
>
|
||||
{submitting ? 'Adding…' : 'Add User'}
|
||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
||||
</svg>
|
||||
Add User
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{error && <p className="text-sm text-red-600 mb-3">{error}</p>}
|
||||
{error && <div className="px-5 py-2 bg-red-50 border-b border-red-100 text-xs text-red-600">{error}</div>}
|
||||
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-sm">
|
||||
<thead>
|
||||
<tr className="text-left text-xs text-gray-500 uppercase tracking-wide border-b border-gray-100">
|
||||
<th className="py-2 pr-3">Name</th>
|
||||
<th className="py-2 pr-3">Email</th>
|
||||
<th className="py-2 pr-3">Role</th>
|
||||
<th className="py-2 pr-3">Site</th>
|
||||
<th className="py-2">Status</th>
|
||||
<th className="py-2"></th>
|
||||
<tr className="text-left text-xs text-gray-500 uppercase tracking-wide bg-gray-50/60">
|
||||
<th className="px-5 py-3 font-medium">Name</th>
|
||||
<th className="px-5 py-3 font-medium">Email</th>
|
||||
<th className="px-5 py-3 font-medium">Role</th>
|
||||
<th className="px-5 py-3 font-medium">Site</th>
|
||||
<th className="px-5 py-3 font-medium">Status</th>
|
||||
<th className="px-5 py-3"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tbody className="divide-y divide-gray-50">
|
||||
{users.map(u => (
|
||||
<tr key={u.id} className={`border-b border-gray-50 ${u.active ? '' : 'opacity-50'}`}>
|
||||
<td className="py-2 pr-3 text-gray-900">{u.name || '—'}</td>
|
||||
<td className="py-2 pr-3 text-gray-600">{u.email}</td>
|
||||
<td className="py-2 pr-3">
|
||||
<select
|
||||
value={u.role}
|
||||
disabled={busyId === u.id}
|
||||
<tr key={u.id} className={`hover:bg-gray-50/50 transition-colors ${!u.active ? 'opacity-50' : ''}`}>
|
||||
<td className="px-5 py-3 font-medium text-gray-900">{u.name || '—'}</td>
|
||||
<td className="px-5 py-3 text-gray-500 text-xs">{u.email}</td>
|
||||
<td className="px-5 py-3">
|
||||
<select value={u.role} disabled={busyId === u.id}
|
||||
onChange={e => patchUser(u.id, { role: e.target.value })}
|
||||
className="border border-gray-200 rounded px-2 py-1 text-xs"
|
||||
>
|
||||
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
|
||||
</select>
|
||||
</td>
|
||||
<td className="py-2 pr-3">
|
||||
<select
|
||||
value={u.site_id ?? ''}
|
||||
disabled={busyId === u.id}
|
||||
<td className="px-5 py-3">
|
||||
<select value={u.site_id ?? ''} disabled={busyId === u.id}
|
||||
onChange={e => patchUser(u.id, { site_id: e.target.value || null })}
|
||||
className="border border-gray-200 rounded px-2 py-1 text-xs"
|
||||
>
|
||||
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
|
||||
<option value="">No site</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</td>
|
||||
<td className="py-2">
|
||||
<button
|
||||
disabled={busyId === u.id}
|
||||
<td className="px-5 py-3">
|
||||
<button disabled={busyId === u.id}
|
||||
onClick={() => patchUser(u.id, { active: !u.active })}
|
||||
className={`text-xs px-2 py-1 rounded-full font-medium ${
|
||||
u.active ? 'bg-green-100 text-green-700' : 'bg-gray-100 text-gray-500'
|
||||
}`}
|
||||
>
|
||||
{u.active ? 'Active' : 'Deactivated'}
|
||||
className={`text-xs px-2.5 py-1 rounded-full font-medium border transition-colors cursor-pointer ${
|
||||
u.active
|
||||
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
|
||||
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
|
||||
}`}>
|
||||
{u.active ? 'Active' : 'Inactive'}
|
||||
</button>
|
||||
</td>
|
||||
<td className="py-2">
|
||||
{confirmDeleteId === u.id ? (
|
||||
<span className="flex items-center gap-1">
|
||||
<span className="text-xs text-red-600 font-medium">Sure?</span>
|
||||
<button
|
||||
disabled={busyId === u.id}
|
||||
onClick={() => deleteUser(u.id)}
|
||||
className="text-xs px-2 py-0.5 rounded bg-red-600 text-white font-medium hover:bg-red-700"
|
||||
>
|
||||
{busyId === u.id ? '…' : 'Yes'}
|
||||
</button>
|
||||
<button
|
||||
disabled={busyId === u.id}
|
||||
onClick={() => setConfirmDeleteId(null)}
|
||||
className="text-xs px-2 py-0.5 rounded border border-gray-300 text-gray-600 hover:bg-gray-50"
|
||||
>
|
||||
No
|
||||
</button>
|
||||
</span>
|
||||
) : (
|
||||
<button
|
||||
disabled={busyId === u.id}
|
||||
onClick={() => setConfirmDeleteId(u.id)}
|
||||
className="text-xs px-2 py-1 rounded text-red-600 hover:bg-red-50 font-medium"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
)}
|
||||
<td className="px-5 py-3">
|
||||
<button disabled={busyId === u.id} onClick={() => setConfirmDelete(u)}
|
||||
className="text-xs text-red-500 hover:text-red-700 hover:underline cursor-pointer transition-colors">
|
||||
Delete
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
{users.length === 0 && (
|
||||
<tr><td colSpan={6} className="px-5 py-10 text-center text-sm text-gray-400">No users yet</td></tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* Add User Modal */}
|
||||
<Modal open={showAdd} onClose={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
|
||||
title="Add User" width="md"
|
||||
footer={
|
||||
<>
|
||||
<button type="button" onClick={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
|
||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||
Cancel
|
||||
</button>
|
||||
<button form="add-user-form" type="submit" disabled={submitting}
|
||||
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
|
||||
{submitting ? 'Adding…' : 'Add User'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<form id="add-user-form" onSubmit={handleSubmit} className="space-y-4">
|
||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg">{error}</p>}
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-email">Email *</label>
|
||||
<input id="au-email" type="email" required placeholder="email@company.com"
|
||||
value={form.email} onChange={e => setForm(v => ({ ...v, email: e.target.value }))}
|
||||
className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-name">Full Name</label>
|
||||
<input id="au-name" type="text" placeholder="Full name"
|
||||
value={form.name} onChange={e => setForm(v => ({ ...v, name: e.target.value }))}
|
||||
className={inp} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-phone">Phone</label>
|
||||
<input id="au-phone" type="tel" placeholder="+60123456789"
|
||||
value={form.phone} onChange={e => setForm(v => ({ ...v, phone: e.target.value }))}
|
||||
className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-password">Password *</label>
|
||||
<input id="au-password" type="password" required minLength={8} placeholder="Min 8 characters"
|
||||
value={form.password} onChange={e => setForm(v => ({ ...v, password: e.target.value }))}
|
||||
className={inp} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-role">Role</label>
|
||||
<select id="au-role" value={form.role}
|
||||
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
|
||||
className={inp}>
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="au-site">Site</label>
|
||||
<select id="au-site" value={form.site_id}
|
||||
onChange={e => setForm(v => ({ ...v, site_id: e.target.value }))}
|
||||
className={inp}>
|
||||
<option value="">No site</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
{/* Delete Confirm Modal */}
|
||||
<Modal open={!!confirmDelete} onClose={() => setConfirmDelete(null)} title="Delete User" width="sm"
|
||||
footer={
|
||||
<>
|
||||
<button onClick={() => setConfirmDelete(null)}
|
||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||
Cancel
|
||||
</button>
|
||||
<button disabled={busyId === confirmDelete?.id}
|
||||
onClick={() => confirmDelete && deleteUser(confirmDelete)}
|
||||
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
||||
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<p className="text-sm text-gray-700">
|
||||
Delete <span className="font-semibold">{confirmDelete?.name || confirmDelete?.email}</span>? This cannot be undone.
|
||||
</p>
|
||||
</Modal>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user