Browse Source
use email as display name if name is empty
pull/6733/head
stefan0xC
7 days ago
No known key found for this signature in database
GPG Key ID: 817020C608FE9C09
2 changed files with
3 additions and
3 deletions
-
src/api/core/organizations.rs
-
src/api/identity.rs
|
|
|
@ -3207,7 +3207,7 @@ async fn put_reset_password( |
|
|
|
|
|
|
|
// Sending email before resetting password to ensure working email configuration and the resulting
|
|
|
|
// user notification. Also this might add some protection against security flaws and misuse
|
|
|
|
if let Err(e) = mail::send_admin_reset_password(&user.email, &user.name, &org.name).await { |
|
|
|
if let Err(e) = mail::send_admin_reset_password(&user.email, user.display_name(), &org.name).await { |
|
|
|
err!(format!("Error sending user reset password email: {e:#?}")); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -266,7 +266,7 @@ async fn _sso_login( |
|
|
|
Some((user, _)) if !user.enabled => { |
|
|
|
err!( |
|
|
|
"This user has been disabled", |
|
|
|
format!("IP: {}. Username: {}.", ip.ip, user.name), |
|
|
|
format!("IP: {}. Username: {}.", ip.ip, user.display_name()), |
|
|
|
ErrorEvent { |
|
|
|
event: EventType::UserFailedLogIn |
|
|
|
} |
|
|
|
@ -521,7 +521,7 @@ async fn authenticated_response( |
|
|
|
result["TwoFactorToken"] = Value::String(token); |
|
|
|
} |
|
|
|
|
|
|
|
info!("User {} logged in successfully. IP: {}", &user.name, ip.ip); |
|
|
|
info!("User {} logged in successfully. IP: {}", user.display_name(), ip.ip); |
|
|
|
Ok(Json(result)) |
|
|
|
} |
|
|
|
|
|
|
|
|