setShowPwd(false)}>
e.stopPropagation()}>
🔑
用户创建成功
-
- {pwdName !== pwdUser ? `${pwdName}（${pwdUser}）` : pwdUser}
-
+
{pwdName !== pwdUser ? `${pwdName}（${pwdUser}）` : pwdUser}
{generatedPwd}
初始密码，请妥善保存
-
+
-
+ {/* Toast */}
+ {result && (
+
+ {result.msg}
+
+ )}
- {/* Tab */}
-
-
-
-
-
+
+ {/* Tab Bar */}
+
+ {tabItem('create', '创建用户')}
+ {tabItem('manage', '删除用户')}
+ {tabItem('roles', '权限管理')}
+
-
-
- {result && (
-
- {result.msg}
+
+ {/* ====== 创建用户 ====== */}
+ {tab === 'create' && (
+
+ )}
- {/* ====== 创建用户 ====== */}
- {tab === 'create' && (
-
- )}
-
- {/* ====== 用户管理 ====== */}
- {tab === 'manage' && (
-
-
LLDAP 不支持禁用用户，如需停用请删除。已登录用户在删除后下次操作自动退出。
- {users.length === 0 ? (
-
加载中...
- ) : (
-
+ {/* ====== 删除用户 ====== */}
+ {tab === 'manage' && (
+
+ {users.length === 0 ? (
+
加载中...
+ ) : (
+
+
+
+ | 用户名 |
+ 显示名 |
+ 邮箱 |
+ 创建时间 |
+ 操作 |
+
+
+
{users.map(u => (
-
-
- {u.username}
- {u.displayName !== u.username && {u.displayName}}
-
-
- {u.createdAt?.substring(0, 10)}
+
(e.currentTarget.style.background = 'var(--bg-hover)')}
+ onMouseLeave={e => (e.currentTarget.style.background = 'transparent')}>
+ | {u.username} |
+
+ {(u.displayName && u.displayName !== u.username) ? u.displayName : '—'}
+ |
+
+ {u.email || '未设置'}
+ |
+ {u.createdAt?.substring(0, 19)} |
+
{(u.username === 'admin' || u.username === 'localadmin') ? (
- 系统保留
+ 系统保留
) : (
)}
-
-
+ |
+
))}
-
- )}
-
+ )}
+
+ )}
- {/* ====== 角色管理 ====== */}
- {tab === 'roles' && (
-
- )}
-
-
+ {/* ====== 权限管理 ====== */}
+ {tab === 'roles' &&
}
diff --git a/src/app/admin/create-user/role-manager.tsx b/src/app/admin/create-user/role-manager.tsx
index 1dd2e18..8d15763 100644
--- a/src/app/admin/create-user/role-manager.tsx
+++ b/src/app/admin/create-user/role-manager.tsx
@@ -6,161 +6,147 @@ interface SiteUser { username: string; display_name: string; role: string }
interface RoleData {
assetsUsers: SiteUser[]; issueUsers: SiteUser[]
assetsRoles: string[]; issueRoles: string[]
+ emails: Record
}
-interface Props {
- inputStyle: React.CSSProperties
- setResult: (r: { ok: boolean; msg: string } | null) => void
+interface Props { setResult: (ok: boolean, msg: string) => void }
+
+const ss = {
+ bar: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 } as React.CSSProperties,
+ hint: { fontSize: 13, color: 'var(--text-muted)', margin: 0 } as React.CSSProperties,
+ saveBtn: (active: boolean) => ({ padding: '10px 24px', borderRadius: 8, border: 'none', cursor: active ? 'pointer' : 'not-allowed', background: active ? '#d97706' : 'var(--bg-hover)', color: active ? '#fff' : 'var(--text-muted)', fontSize: 13, fontWeight: 600, transition: 'all 0.2s' } as React.CSSProperties),
+ table: { width: '100%', borderCollapse: 'collapse' as any } as React.CSSProperties,
+ th: { textAlign: 'left' as any, fontSize: 11, fontWeight: 600, color: 'var(--text-muted)', padding: '10px 12px', borderBottom: '2px solid var(--border)', textTransform: 'uppercase' as any, letterSpacing: '0.05em' } as React.CSSProperties,
+ td: { padding: '12px 12px', borderBottom: '1px solid var(--border)', fontSize: 13, color: 'var(--text)' } as React.CSSProperties,
+ roleSelect: (changed: boolean) => ({ height: 34, padding: '0 10px', borderRadius: 6, fontSize: 12, cursor: 'pointer', border: changed ? '1px solid #d97706' : '1px solid var(--border)', background: changed ? 'rgba(217,119,6,0.06)' : 'var(--bg-card)', color: 'var(--text)', outline: 'none', minWidth: 110 } as React.CSSProperties),
+ emailInput: { height: 30, padding: '0 8px', borderRadius: 5, border: '1px solid var(--border)', background: 'var(--bg-card)', color: 'var(--text)', fontSize: 12, width: 160, outline: 'none' } as React.CSSProperties,
+ miniBtn: (primary: boolean) => ({ padding: '4px 12px', borderRadius: 5, border: primary ? 'none' : '1px solid var(--border)', background: primary ? '#2563eb' : 'var(--bg-card)', color: primary ? '#fff' : 'var(--text-secondary)', fontSize: 11, cursor: 'pointer', fontWeight: 500 } as React.CSSProperties),
}
-export default function RoleManager({ inputStyle, setResult }: Props) {
+export default function RoleManager({ setResult }: Props) {
const [roleData, setRoleData] = useState(null)
const [pending, setPending] = useState>({})
const [saving, setSaving] = useState(false)
+ const [editingEmail, setEditingEmail] = useState(null)
+ const [editEmailValue, setEditEmailValue] = useState('')
+ const [savingEmail, setSavingEmail] = useState(false)
const fetchRoleData = useCallback(async () => {
try {
- const res = await fetch('/api/admin/user-roles')
- const d = await res.json()
- if (d.users) setRoleData({
- assetsUsers: d.users.assets || [],
- issueUsers: d.users.issue || [],
- assetsRoles: d.assetsRoles || [],
- issueRoles: d.issueRoles || [],
- })
+ const res = await fetch('/api/admin/user-roles'); const d = await res.json()
+ if (d.users) setRoleData({ assetsUsers: d.users.assets || [], issueUsers: d.users.issue || [], assetsRoles: d.assetsRoles || [], issueRoles: d.issueRoles || [], emails: d.emails || {} })
} catch {}
}, [])
useEffect(() => { fetchRoleData() }, [fetchRoleData])
+ async function handleEditEmail(target: string) {
+ if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(editEmailValue)) { setResult(false, '邮箱格式不合法'); return }
+ setSavingEmail(true)
+ try {
+ const res = await fetch('/api/admin/users', { method: 'PATCH', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ username: target, email: editEmailValue }) })
+ const d = await res.json()
+ if (res.ok) {
+ setRoleData(prev => prev ? { ...prev, emails: { ...prev.emails, [target]: d.email } } : null)
+ setEditingEmail(null); setResult(true, `${target} 邮箱已更新`)
+ } else { setResult(false, d.error || '修改失败') }
+ } catch { setResult(false, '网络错误') }
+ finally { setSavingEmail(false) }
+ }
+
function handleSelect(site: string, username: string, newRole: string, originalRole: string) {
- if (newRole === originalRole) {
- // 改回原值，清除 pending
- const next = { ...pending }
- delete next[`${site}:${username}`]
- setPending(next)
- } else {
- setPending({ ...pending, [`${site}:${username}`]: { site, newRole } })
- }
+ if (newRole === originalRole) { const next = { ...pending }; delete next[`${site}:${username}`]; setPending(next) }
+ else { setPending({ ...pending, [`${site}:${username}`]: { site, newRole } }) }
}
function getCurrentRole(site: string, username: string, originalRole: string): string {
- const key = `${site}:${username}`
- return pending[key]?.newRole || originalRole
+ return pending[`${site}:${username}`]?.newRole || originalRole
}
async function handleSave() {
if (Object.keys(pending).length === 0) return
if (!confirm(`确定保存 ${Object.keys(pending).length} 项角色修改？`)) return
-
- setSaving(true)
- let ok = 0; let fail = 0
+ setSaving(true); let ok = 0; let fail = 0
for (const [key, { site, newRole }] of Object.entries(pending)) {
const username = key.split(':')[1]
try {
- const res = await fetch('/api/admin/user-roles', {
- method: 'PUT', headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ username, site, role: newRole }),
- })
+ const res = await fetch('/api/admin/user-roles', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ username, site, role: newRole }) })
if (res.ok) ok++; else fail++
} catch { fail++ }
}
-
- setResult({ ok: fail === 0, msg: `已保存：${ok} 项成功${fail > 0 ? `，${fail} 项失败` : ''}` })
- setPending({})
- if (fail === 0) fetchRoleData()
- setSaving(false)
+ setResult(fail === 0, `已保存：${ok} 项成功${fail > 0 ? `，${fail} 项失败` : ''}`)
+ setPending({}); if (fail === 0) fetchRoleData(); setSaving(false)
}
- if (!roleData) return 加载中...
+ if (!roleData) return 加载中...
- // 合并两个站点用户
- const userMap = new Map()
- roleData.assetsUsers.forEach(u => userMap.set(u.username, { displayName: u.display_name, assetsRole: u.role, issueRole: '—' }))
- roleData.issueUsers.forEach(u => {
- const e = userMap.get(u.username)
- if (e) e.issueRole = u.role
- else userMap.set(u.username, { displayName: u.display_name, assetsRole: '—', issueRole: u.role })
- })
+ const userMap = new Map()
+ roleData.assetsUsers.forEach(u => userMap.set(u.username, { displayName: u.display_name, email: roleData.emails[u.username] || '', assetsRole: u.role, issueRole: '—' }))
+ roleData.issueUsers.forEach(u => { const e = userMap.get(u.username); if (e) e.issueRole = u.role; else userMap.set(u.username, { displayName: u.display_name, email: roleData.emails[u.username] || '', assetsRole: '—', issueRole: u.role }) })
const users = Array.from(userMap.entries())
const changed = Object.keys(pending).length
return (
-
-
- 修改角色后点击「保存修改」统一提交
- {changed > 0 && （{changed} 项待保存）}
-
-
)
}
-function RoleCell({ site, username, originalRole, roles, pending, inputStyle, onSelect, getCurrentRole }: {
+function RoleCell({ site, username, originalRole, roles, pending, onSelect, getCurrentRole }: {
site: string; username: string; originalRole: string; roles: string[]
pending: Record
- inputStyle: React.CSSProperties
onSelect: (site: string, username: string, newRole: string, originalRole: string) => void
getCurrentRole: (site: string, username: string, originalRole: string) => string
}) {
const isReserved = username === 'admin' || username === 'localadmin'
- const key = `${site}:${username}`
- const changed = !!pending[key]
+ const changed = !!pending[`${site}:${username}`]
const currentRole = getCurrentRole(site, username, originalRole)
-
- if (isReserved) {
- return {currentRole}
- }
- if (originalRole === '—' && !changed) {
- return 未同步
- }
+ if (isReserved) return {currentRole}
+ if (originalRole === '—' && !changed) return 未同步
return (
-
+
+
+
diff --git a/src/app/setup-password/page.tsx b/src/app/setup-password/page.tsx
new file mode 100644
index 0000000..d1e70e9
--- /dev/null
+++ b/src/app/setup-password/page.tsx
@@ -0,0 +1,246 @@
+'use client'
+
+import { Suspense, useState, useMemo } from 'react'
+import { useSearchParams } from 'next/navigation'
+
+interface PasswordStrength {
+ minLength: boolean
+ hasUpper: boolean
+ hasLower: boolean
+ hasDigit: boolean
+ hasSpecial: boolean
+ score: number
+}
+
+function checkPassword(pw: string): PasswordStrength {
+ const minLength = pw.length >= 8
+ const hasUpper = /[A-Z]/.test(pw)
+ const hasLower = /[a-z]/.test(pw)
+ const hasDigit = /[0-9]/.test(pw)
+ const hasSpecial = /[^A-Za-z0-9]/.test(pw)
+ const score = [hasUpper, hasLower, hasDigit, hasSpecial].filter(Boolean).length
+ return { minLength, hasUpper, hasLower, hasDigit, hasSpecial, score }
+}
+
+const checks: { key: keyof PasswordStrength; label: string }[] = [
+ { key: 'minLength', label: '至少 8 位字符' },
+ { key: 'hasUpper', label: '包含大写字母' },
+ { key: 'hasLower', label: '包含小写字母' },
+ { key: 'hasDigit', label: '包含数字' },
+ { key: 'hasSpecial', label: '包含特殊字符' },
+]
+
+function SetupPasswordForm() {
+ const searchParams = useSearchParams()
+ const token = searchParams.get('token') || ''
+ const [password, setPassword] = useState('')
+ const [confirm, setConfirm] = useState('')
+ const [error, setError] = useState('')
+ const [success, setSuccess] = useState(false)
+ const [loading, setLoading] = useState(false)
+
+ const strength = useMemo(() => checkPassword(password), [password])
+ const isStrong = strength.minLength && strength.score >= 3
+ const passwordMismatch = confirm.length > 0 && password !== confirm
+
+ async function handleSubmit(e: React.FormEvent) {
+ e.preventDefault()
+ setError('')
+
+ if (!isStrong) {
+ setError('请先满足密码复杂度要求')
+ return
+ }
+ if (password !== confirm) {
+ setError('两次输入的密码不一致')
+ return
+ }
+
+ setLoading(true)
+ try {
+ const res = await fetch('/api/auth/setup-password', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ token, password }),
+ })
+ const data = await res.json()
+ if (!res.ok) {
+ setError(data.error || '设置失败')
+ } else {
+ setSuccess(true)
+ }
+ } catch {
+ setError('网络错误，请重试')
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ if (!token) {
+ return (
+
+
+
链接无效
+
缺少设置密码所需的 token，请检查链接是否完整。
+
返回登录
+
+
+ )
+ }
+
+ if (success) {
+ return (
+
+
+
密码已设置
+
您的密码已成功设置，现在可以使用新密码登录。
+
前往登录
+
+
+ )
+ }
+
+ return (
+
+ )
+}
+
+export default function SetupPasswordPage() {
+ return (
+
加载中...