diff --git a/apps/api/src/modules/identity/index.ts b/apps/api/src/modules/identity/index.ts index ffbd351..cad2f02 100644 --- a/apps/api/src/modules/identity/index.ts +++ b/apps/api/src/modules/identity/index.ts @@ -277,17 +277,28 @@ export const identityModule: KcModule = { app.patch('/admin/users/:id', async (req) => { const a = requirePermission(req, 'users.write'); const { id } = z.object({ id: z.string().uuid() }).parse(req.params); - const b = z.object({ status: z.enum(['active', 'disabled']).optional(), staffRole: z.enum(['support', 'accounting', 'admin', 'superadmin']).optional() }).parse(req.body); + const b = z.object({ status: z.enum(['active', 'disabled']).optional(), staffRole: z.enum(['support', 'accounting', 'admin', 'superadmin']).optional(), email: email.optional(), name: z.string().trim().min(1).max(150).optional() }).parse(req.body); const u = await one('SELECT * FROM users WHERE id = ?', [id]); if (!u) throw notFound(); if (id === a.user.id) throw forbidden('Eigenes Konto kann hier nicht geändert werden', 'SELF_CHANGE'); const privileged = (r: unknown) => r === 'admin' || r === 'superadmin'; if ((privileged(u.staff_role) || privileged(b.staffRole)) && !can(a.principal, 'users.write_privileged')) throw forbidden('Nur Superadministratoren', 'PRIVILEGED_ONLY'); + const emailChanged = b.email !== undefined && b.email !== u.email; + if (emailChanged) { + // Login-Adresse eines Mitarbeiters zu ändern ist eine Kontoübernahme-Möglichkeit: nur Superadmin + if (u.kind === 'staff' && !can(a.principal, 'users.write_privileged')) throw forbidden('Nur Superadministratoren dürfen die Anmelde-E-Mail von Mitarbeitern ändern', 'PRIVILEGED_ONLY'); + if (await one('SELECT 1 AS x FROM users WHERE email = ? AND id <> ?', [b.email, id])) throw conflict('E-Mail bereits vergeben', 'EMAIL_EXISTS'); + await run('UPDATE users SET email = ? WHERE id = ?', [b.email, id]); + // Offene Einladungs-/Reset-Links gingen an die alte Adresse und dürfen nicht mehr gelten; bestehende Sitzungen enden + await run('UPDATE user_tokens SET used_at = UTC_TIMESTAMP(3) WHERE user_id = ? AND used_at IS NULL', [id]); + await run('UPDATE sessions SET revoked_at = UTC_TIMESTAMP(3) WHERE user_id = ? AND revoked_at IS NULL', [id]); + } + if (b.name !== undefined) await run('UPDATE users SET name = ? WHERE id = ?', [b.name, id]); if (b.staffRole && u.kind !== 'staff') throw badRequest('Nur für Mitarbeiter'); if (b.status === 'active' && u.status === 'invited') throw badRequest('Eingeladene Benutzer aktivieren sich selbst'); await run('UPDATE users SET status = COALESCE(?, status), staff_role = COALESCE(?, staff_role) WHERE id = ?', [b.status ?? null, b.staffRole ?? null, id]); if (b.status === 'disabled') await run('UPDATE sessions SET revoked_at = UTC_TIMESTAMP(3) WHERE user_id = ? AND revoked_at IS NULL', [id]); - await audit({ actorType: 'user', actorId: a.user.id, action: 'user.update', resourceType: 'user', resourceId: id, correlationId: req.correlationId, ip: clientIp(req), before: { status: u.status, staffRole: u.staff_role }, after: b }); + await audit({ actorType: 'user', actorId: a.user.id, action: 'user.update', resourceType: 'user', resourceId: id, correlationId: req.correlationId, ip: clientIp(req), before: { status: u.status, staffRole: u.staff_role, ...(emailChanged ? { email: u.email } : {}), ...(b.name !== undefined ? { name: u.name } : {}) }, after: b }); return { status: 'ok' }; }); }, diff --git a/apps/api/test/orders.test.ts b/apps/api/test/orders.test.ts index 8249a31..6ca1bae 100644 --- a/apps/api/test/orders.test.ts +++ b/apps/api/test/orders.test.ts @@ -326,3 +326,22 @@ describe('Staffelpreise nach Laufzeit', () => { expect(items[0].snapshot.terms).toEqual({ termMonths: 12, renewal: 'auto', renewalTermMonths: 12, noticeDays: 30 }); }); }); + +describe('Benutzer: Anmelde-E-Mail ändern', () => { + it('Personal ändert E-Mail/Name eines Kunden; alte Einladung ungültig, Duplikate und Mitarbeiter-E-Mails geschützt', async () => { + const admin = await staff('mail-adm@shop.test', 'admin'); const sa = await staff('mail-sa@shop.test', 'superadmin'); const sup = await staff('mail-sup@shop.test', 'support'); + const c = (await call(app, admin, 'POST', '/admin/customers', { type: 'private', name: 'Alt Name', owner: { email: 'alt@shop.test', name: 'Alt Name' } })).json(); + const oldToken = new URL(c.inviteLink).searchParams.get('token'); + const uid = (await call(app, admin, 'GET', `/admin/customers/${c.id}`)).json().members[0].id; + expect((await call(app, sup, 'PATCH', `/admin/users/${uid}`, { email: 'neu@shop.test' })).statusCode).toBe(403); + expect((await call(app, admin, 'PATCH', `/admin/users/${uid}`, { email: 'mail-sa@shop.test' })).statusCode).toBe(409); + expect((await call(app, admin, 'PATCH', `/admin/users/${uid}`, { email: 'Neu@Shop.test', name: 'Neu Name' })).statusCode).toBe(200); + const m = (await call(app, admin, 'GET', `/admin/customers/${c.id}`)).json().members[0]; + expect(m).toMatchObject({ email: 'neu@shop.test', name: 'Neu Name' }); + expect((await app.inject({ method: 'POST', url: '/v1/auth/invite/accept', payload: { token: oldToken, password: 'passwort-kunde-123', repeat: 'passwort-kunde-123' } })).statusCode).toBe(400); + const saId = (await call(app, sa, 'GET', '/auth/me')).json().user.id; + expect((await call(app, admin, 'PATCH', `/admin/users/${saId}`, { email: 'x@shop.test' })).statusCode).toBe(403); + const log = await one("SELECT before_json FROM audit_events WHERE action = 'user.update' AND resource_id = ?", [uid]); + expect(JSON.stringify(log?.before_json)).toContain('alt@shop.test'); + }); +}); diff --git a/apps/web/src/app/(app)/admin/kunden/[id]/page.tsx b/apps/web/src/app/(app)/admin/kunden/[id]/page.tsx index c34bb58..d4bc626 100644 --- a/apps/web/src/app/(app)/admin/kunden/[id]/page.tsx +++ b/apps/web/src/app/(app)/admin/kunden/[id]/page.tsx @@ -16,7 +16,7 @@ interface RRow { id: string; name: string; state: string; validUntil: string | n export default function Kunde() { const { id } = useParams<{ id: string }>(); const { can, reload } = useSession(); const r = useRouter(); const [contracts, setContracts] = useState(null); const [orders, setOrders] = useState(null); const [ress, setRess] = useState(null); - const [o, setO] = useState(null); const [msg, setMsg] = useState<{ k: 'ok' | 'err' | 'warn'; t: string } | null>(null); const [confirm, setConfirm] = useState(null); const [switchTo, setSwitchTo] = useState<'private' | 'business' | null>(null); + const [o, setO] = useState(null); const [msg, setMsg] = useState<{ k: 'ok' | 'err' | 'warn'; t: string } | null>(null); const [confirm, setConfirm] = useState(null); const [switchTo, setSwitchTo] = useState<'private' | 'business' | null>(null); const [editUser, setEditUser] = useState(null); const [impersonateOpen, setImpersonateOpen] = useState(false); const [impersonateBusy, setImpersonateBusy] = useState(false); const [welcomeBusy, setWelcomeBusy] = useState(false); const load = useCallback(() => api('GET', `/admin/customers/${id}`).then(setO).catch((e) => setMsg({ k: 'err', t: errMsg(e) })), [id]); @@ -33,6 +33,16 @@ export default function Kunde() { // Beim Wechsel zum Privatkunden werden Firma und USt-IdNr. entfernt (Bestätigung vorher). try { setO(await api('PATCH', `/admin/customers/${id}`, { customerType: t, ...(t === 'private' ? { billing: { company: '', vatId: '' } } : { billing: { company: o!.name } }) })); setSwitchTo(null); setMsg({ k: 'ok', t: 'Kundenart geändert.' }); } catch (x) { setMsg({ k: 'err', t: errMsg(x) }); } } + async function saveUser(e: FormEvent, m: { id: string; email: string; name: string; status: string }) { + e.preventDefault(); const f = new FormData(e.currentTarget); const email = String(f.get('uemail') ?? '').trim(); const name = String(f.get('uname') ?? '').trim(); + try { + await api('PATCH', `/admin/users/${m.id}`, { name, email }); + if (f.get('ubilling') === 'on') await api('PATCH', `/admin/customers/${id}`, { billing: { billingEmail: email } }); + setEditUser(null); await load(); + const changed = email.toLowerCase() !== m.email; + setMsg({ k: 'ok', t: changed ? `Gespeichert. Anmeldung ab sofort mit ${email}${m.status === 'invited' ? ' – die alte Einladung ist ungültig, bitte „Einladung senden“ erneut ausführen.' : '; bestehende Sitzungen wurden beendet.'}` : 'Gespeichert.' }); + } catch (x) { setMsg({ k: 'err', t: errMsg(x) }); } + } async function reinvite(uid: string, email: string) { try { const r = await api<{ mail: string; inviteLink?: string }>('POST', `/admin/users/${uid}/reinvite`); setMsg(r.mail === 'sent' ? { k: 'ok', t: `Die Einladung wurde an ${email} gesendet.` } : { k: 'warn', t: `E-Mail-Versand ist nicht eingerichtet. Einladungslink (wird nur jetzt angezeigt): ${r.inviteLink}` }); } catch (x) { setMsg({ k: 'err', t: errMsg(x) }); } } @@ -89,7 +99,14 @@ export default function Kunde() {

Benutzer

{w && }

Enthält den Zugangslink, die aktuellen Produkte mit Preisen und eine kurze Anleitung inkl. Discord-Verknüpfung. Geht an den ersten Ansprechpartner.

- {o.members.map((m) => )}
NameE-MailRolleStatusAktionen
{m.name}{m.email}{ROLE_LABEL[m.role]}{w && m.status === 'invited' && }
+ {o.members.map((m) => editUser === m.id ? +
void saveUser(e, m)}> +
+
+ {o.billing.billingEmail === m.email && } +
+
+ : {m.name}{m.email}{ROLE_LABEL[m.role]}
{can('users.write') && }{w && m.status === 'invited' && }
)} {w &&

Kundenart

{switchTo ? (

Zu {switchTo === 'private' ? 'Privatkunde' : 'Geschäftskunde'} wechseln? {switchTo === 'private' ? 'Firma und USt-IdNr. werden entfernt.' : 'Als Firma wird der bisherige Name übernommen.'} Das kann Auswirkungen auf Rechnungen und Steuer haben. Die Änderung wird protokolliert.

)