feat(admin): remove invite-by-email, direct-add only
Strips invite-by-email mode from admin user management UI and API. POST /api/admin/users now always requires password parameter for direct user creation. Removes mode toggle, conditional password field, and invite logic branches. Simplifies user creation flow to single path. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RkCfBY9L5y3SZ6uaKZzLCV
This commit is contained in:
Claude Sonnet 4.6
@@ -27,9 +27,9 @@ export function UserManager({ users, sites }: Props) {
|
||||
const router = useRouter()
|
||||
const [busyId, setBusyId] = useState<string | null>(null)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [mode, setMode] = useState<'invite' | 'create'>('invite')
|
||||
const [form, setForm] = useState(EMPTY_FORM)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null)
|
||||
|
||||
const patchUser = async (id: string, update: Record<string, unknown>) => {
|
||||
setBusyId(id)
|
||||
@@ -48,27 +48,40 @@ export function UserManager({ users, sites }: Props) {
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const deleteUser = async (id: string) => {
|
||||
setBusyId(id)
|
||||
setError(null)
|
||||
const res = await fetch(`/ims/api/admin/users?id=${encodeURIComponent(id)}`, { method: 'DELETE' })
|
||||
setBusyId(null)
|
||||
setConfirmDeleteId(null)
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(data.error ?? 'Delete failed')
|
||||
return
|
||||
}
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
setSubmitting(true)
|
||||
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', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(payload),
|
||||
body: JSON.stringify({
|
||||
email: form.email,
|
||||
name: form.name || undefined,
|
||||
phone: form.phone || undefined,
|
||||
role: form.role,
|
||||
site_id: form.site_id || undefined,
|
||||
password: form.password,
|
||||
}),
|
||||
})
|
||||
setSubmitting(false)
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(data.error ?? `${mode === 'create' ? 'Add' : 'Invite'} failed`)
|
||||
setError(data.error ?? 'Add failed')
|
||||
return
|
||||
}
|
||||
setForm(EMPTY_FORM)
|
||||
@@ -79,24 +92,6 @@ export function UserManager({ users, sites }: Props) {
|
||||
<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>
|
||||
|
||||
{/* 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
|
||||
type="email" required placeholder="email@company.com"
|
||||
@@ -131,24 +126,20 @@ export function UserManager({ users, sites }: Props) {
|
||||
<option value="">No site</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</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"
|
||||
/>
|
||||
)}
|
||||
<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
|
||||
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"
|
||||
>
|
||||
{submitting
|
||||
? (mode === 'create' ? 'Adding…' : 'Inviting…')
|
||||
: (mode === 'create' ? 'Add User' : 'Invite User')}
|
||||
{submitting ? 'Adding…' : 'Add User'}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
@@ -163,6 +154,7 @@ export function UserManager({ users, sites }: Props) {
|
||||
<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>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -202,6 +194,35 @@ export function UserManager({ users, sites }: Props) {
|
||||
{u.active ? 'Active' : 'Deactivated'}
|
||||
</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>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user