feat(admin): add users directly with admin-set password + phone field

- POST /api/admin/users: if password supplied → createUser (instant, email_confirm:true); else inviteUserByEmail (existing flow)
- password validated ≥8 chars; never logged in audit_log
- profile update now also saves phone number
- UI: mode toggle (Invite by email / Add directly), phone input always visible, password input shown only in 'Add directly' mode

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CPf5Rc8QPx6V8KLEEgfKEQ
This commit is contained in:
2026-07-13 16:36:20 +08:00
co-authored by Claude Sonnet 4.6
parent 690485f74e
commit e949016bd4
2 changed files with 106 additions and 31 deletions
+34 -7
View File
@@ -22,13 +22,17 @@ export async function POST(request: NextRequest) {
const { supabase, user } = await requireAdmin() const { supabase, user } = await requireAdmin()
if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 }) if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
const body: { email?: string; name?: string; role?: string; site_id?: string } = const body: { email?: string; name?: string; phone?: string; role?: string; site_id?: string; password?: string } =
await request.json().catch(() => ({})) await request.json().catch(() => ({}))
const email = (body.email ?? '').trim().toLowerCase() const email = (body.email ?? '').trim().toLowerCase()
if (!email || !email.includes('@')) if (!email || !email.includes('@'))
return NextResponse.json({ error: 'Valid email required' }, { status: 422 }) return NextResponse.json({ error: 'Valid email required' }, { status: 422 })
if (body.role && !isValidRole(body.role)) if (body.role && !isValidRole(body.role))
return NextResponse.json({ error: 'Invalid role' }, { status: 422 }) return NextResponse.json({ error: 'Invalid role' }, { status: 422 })
const password = (body.password ?? '').trim()
const directCreate = password.length > 0
if (directCreate && password.length < 8)
return NextResponse.json({ error: 'Password must be at least 8 characters' }, { status: 422 })
let admin let admin
try { try {
@@ -40,32 +44,55 @@ export async function POST(request: NextRequest) {
) )
} }
// Branch: admin-typed password (instant) vs email invite (link required)
let newUserId: string
if (directCreate) {
const { data: created, error: createError } = await admin.auth.admin.createUser({
email,
password,
email_confirm: true,
user_metadata: { full_name: body.name ?? '' },
})
if (createError || !created?.user)
return NextResponse.json(
{ error: createError?.message ?? 'User creation failed' },
{ status: (createError as { status?: number } | null)?.status ?? 500 },
)
newUserId = created.user.id
} else {
const { data: invited, error: inviteError } = await admin.auth.admin.inviteUserByEmail(email, { const { data: invited, error: inviteError } = await admin.auth.admin.inviteUserByEmail(email, {
data: { full_name: body.name ?? '' }, data: { full_name: body.name ?? '' },
}) })
if (inviteError || !invited?.user) if (inviteError || !invited?.user)
return NextResponse.json({ error: inviteError?.message ?? 'Invite failed' }, { status: 500 }) return NextResponse.json({ error: inviteError?.message ?? 'Invite failed' }, { status: 500 })
newUserId = invited.user.id
}
// handle_new_auth_user trigger creates the profile row; set role/site on top of it // handle_new_auth_user trigger creates the profile row; set fields on top of it
const { error: profileError } = await admin const { error: profileError } = await admin
.from('users') .from('users')
.update({ .update({
name: body.name ?? '', name: body.name ?? '',
phone: (body.phone ?? '').trim() || null,
role: body.role ?? 'reporter', role: body.role ?? 'reporter',
site_id: body.site_id ?? null, site_id: body.site_id ?? null,
}) })
.eq('id', invited.user.id) .eq('id', newUserId)
if (profileError) if (profileError)
return NextResponse.json({ error: 'Invite sent but profile update failed' }, { status: 500 }) return NextResponse.json(
{ error: `${directCreate ? 'User created' : 'Invite sent'} but profile update failed` },
{ status: 500 },
)
// password is never logged
await supabase.rpc('write_audit_log', { await supabase.rpc('write_audit_log', {
p_table_name: 'users', p_table_name: 'users',
p_record_id: invited.user.id, p_record_id: newUserId,
p_action: 'invited', p_action: directCreate ? 'created' : 'invited',
p_new_value: { email, role: body.role ?? 'reporter', site_id: body.site_id ?? null }, p_new_value: { email, role: body.role ?? 'reporter', site_id: body.site_id ?? null },
}) })
return NextResponse.json({ id: invited.user.id }, { status: 201 }) return NextResponse.json({ id: newUserId }, { status: 201 })
} }
export async function PATCH(request: NextRequest) { export async function PATCH(request: NextRequest) {
+67 -19
View File
@@ -21,12 +21,15 @@ interface Props {
sites: SiteOption[] sites: SiteOption[]
} }
const EMPTY_FORM = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
export function UserManager({ users, sites }: Props) { export function UserManager({ users, sites }: Props) {
const router = useRouter() const router = useRouter()
const [busyId, setBusyId] = useState<string | null>(null) const [busyId, setBusyId] = useState<string | null>(null)
const [error, setError] = useState<string | null>(null) const [error, setError] = useState<string | null>(null)
const [invite, setInvite] = useState({ email: '', name: '', role: 'reporter' as UserRole, site_id: '' }) const [mode, setMode] = useState<'invite' | 'create'>('invite')
const [inviting, setInviting] = useState(false) const [form, setForm] = useState(EMPTY_FORM)
const [submitting, setSubmitting] = useState(false)
const patchUser = async (id: string, update: Record<string, unknown>) => { const patchUser = async (id: string, update: Record<string, unknown>) => {
setBusyId(id) setBusyId(id)
@@ -45,22 +48,30 @@ export function UserManager({ users, sites }: Props) {
router.refresh() router.refresh()
} }
const sendInvite = async (e: React.FormEvent) => { const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault() e.preventDefault()
setInviting(true) setSubmitting(true)
setError(null) setError(null)
const payload: Record<string, unknown> = {
email: form.email,
name: form.name || undefined,
phone: form.phone || undefined,
role: form.role,
site_id: form.site_id || undefined,
}
if (mode === 'create') payload.password = form.password
const res = await fetch('/ims/api/admin/users', { const res = await fetch('/ims/api/admin/users', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ ...invite, site_id: invite.site_id || undefined }), body: JSON.stringify(payload),
}) })
setInviting(false) setSubmitting(false)
if (!res.ok) { if (!res.ok) {
const data = await res.json().catch(() => ({})) const data = await res.json().catch(() => ({}))
setError(data.error ?? 'Invite failed') setError(data.error ?? `${mode === 'create' ? 'Add' : 'Invite'} failed`)
return return
} }
setInvite({ email: '', name: '', role: 'reporter', site_id: '' }) setForm(EMPTY_FORM)
router.refresh() router.refresh()
} }
@@ -68,39 +79,76 @@ export function UserManager({ users, sites }: Props) {
<div className="bg-white rounded-xl shadow-sm p-5"> <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> <h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Users</h2>
<form onSubmit={sendInvite} className="flex flex-wrap gap-2 mb-5 items-end"> {/* Mode toggle */}
<div className="flex gap-2 mb-4">
{(['invite', 'create'] as const).map(m => (
<button
key={m}
type="button"
onClick={() => { setMode(m); setError(null) }}
className={`text-xs font-medium px-3 py-1.5 rounded-full border transition-colors ${
mode === m
? 'bg-gray-800 text-white border-gray-800'
: 'border-gray-300 text-gray-600 hover:bg-gray-50'
}`}
>
{m === 'invite' ? 'Invite by email' : 'Add directly'}
</button>
))}
</div>
<form onSubmit={handleSubmit} className="flex flex-wrap gap-2 mb-5 items-end">
<input <input
type="email" required placeholder="email@company.com" type="email" required placeholder="email@company.com"
value={invite.email} value={form.email}
onChange={e => setInvite(v => ({ ...v, email: e.target.value }))} onChange={e => setForm(v => ({ ...v, email: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-52" className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-52"
/> />
<input <input
type="text" placeholder="Full name" type="text" placeholder="Full name"
value={invite.name} value={form.name}
onChange={e => setInvite(v => ({ ...v, name: e.target.value }))} onChange={e => setForm(v => ({ ...v, name: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-40" 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 <select
value={invite.role} value={form.role}
onChange={e => setInvite(v => ({ ...v, role: e.target.value as UserRole }))} onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm" 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>)} {ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
</select> </select>
<select <select
value={invite.site_id} value={form.site_id}
onChange={e => setInvite(v => ({ ...v, site_id: e.target.value }))} onChange={e => setForm(v => ({ ...v, site_id: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm" className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
> >
<option value="">No site</option> <option value="">No site</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)} {sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select> </select>
{mode === 'create' && (
<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"
/>
)}
<button <button
type="submit" disabled={inviting} 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" className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-blue-700 disabled:opacity-50"
> >
{inviting ? 'Inviting…' : 'Invite User'} {submitting
? (mode === 'create' ? 'Adding…' : 'Inviting…')
: (mode === 'create' ? 'Add User' : 'Invite User')}
</button> </button>
</form> </form>