diff --git a/app/routers/auth.py b/app/routers/auth.py index ccf3eaf..acb06f9 100644 --- a/app/routers/auth.py +++ b/app/routers/auth.py @@ -88,9 +88,18 @@ async def login(request: Request, username: str = Form(...), password: str = For log_login_failed(db, request, username) db.commit() return err_template("Mot de passe incorrect") - # Include mode in JWT token - token = create_access_token({"sub": row.username, "role": row.role, "uid": row.id, "mode": mode}) - user = {"sub": row.username, "role": row.role, "uid": row.id, "mode": mode} + # Include display_name + auth_type dans le JWT pour affichage propre + display_row = db.execute(text( + "SELECT display_name, auth_type FROM users WHERE id=:uid" + ), {"uid": row.id}).fetchone() + display_name = display_row.display_name if display_row else row.username + auth_type = display_row.auth_type if display_row else "local" + token = create_access_token({ + "sub": row.username, "role": row.role, "uid": row.id, "mode": mode, + "display": display_name, "auth": auth_type, + }) + user = {"sub": row.username, "role": row.role, "uid": row.id, "mode": mode, + "display": display_name, "auth": auth_type} log_login(db, request, user) db.commit() # Redirect diff --git a/app/templates/base.html b/app/templates/base.html index 420789a..aa7ec11 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -164,7 +164,10 @@
- {{ user.sub }} + {{ user.display or user.sub }} + {% if user.auth == 'ldap' %}(AD){% endif %} + ยท + {{ user.sub }} {{ user.role }} Deconnexion