Gitea-Repo fix
Dieser Commit ist enthalten in:
committet von
Server Deploy
Ursprung
c21be47428
Commit
623bbdf5dd
@ -35,10 +35,15 @@ router.post('/login', async (req, res) => {
|
||||
|
||||
const db = getDb();
|
||||
|
||||
// Benutzer suchen: Zuerst nach Username "admin", dann nach E-Mail
|
||||
// Benutzer suchen: Admin kann mit "admin" einloggen, alle anderen mit E-Mail
|
||||
let user;
|
||||
// User per Username suchen (kann E-Mail-Adresse oder admin sein)
|
||||
user = db.prepare('SELECT * FROM users WHERE username = ?').get(username);
|
||||
if (username.toLowerCase() === 'admin') {
|
||||
// Admin-Login über spezielle E-Mail
|
||||
user = db.prepare('SELECT * FROM users WHERE email = ? AND role = ?').get('admin@taskmate.local', 'admin');
|
||||
} else {
|
||||
// Normale User loggen sich mit E-Mail ein
|
||||
user = db.prepare('SELECT * FROM users WHERE email = ?').get(username);
|
||||
}
|
||||
|
||||
// Audit-Log Eintrag vorbereiten
|
||||
const logAttempt = (userId, success) => {
|
||||
@ -131,7 +136,8 @@ router.post('/login', async (req, res) => {
|
||||
csrfToken,
|
||||
user: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
initials: user.initials,
|
||||
displayName: user.display_name,
|
||||
color: user.color,
|
||||
role: user.role || 'user',
|
||||
@ -345,14 +351,15 @@ router.get('/users', authenticateToken, (req, res) => {
|
||||
const db = getDb();
|
||||
// Nur regulaere Benutzer (nicht Admins) fuer Aufgaben-Zuweisung
|
||||
const users = db.prepare(`
|
||||
SELECT id, username, display_name, color
|
||||
SELECT id, email, initials, display_name, color
|
||||
FROM users
|
||||
WHERE role != 'admin' OR role IS NULL
|
||||
`).all();
|
||||
|
||||
res.json(users.map(u => ({
|
||||
id: u.id,
|
||||
username: u.username,
|
||||
email: u.email,
|
||||
initials: u.initials,
|
||||
displayName: u.display_name,
|
||||
color: u.color
|
||||
})));
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren