From a6558f55488c86c1aa702e9a5e7875afbd2e7490 Mon Sep 17 00:00:00 2001
From: sirux88 <sirux88@gmail.com>
Date: Sun, 5 Feb 2023 16:34:48 +0100
Subject: [PATCH] rust lang specific improvements
---
src/api/core/organizations.rs | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index 6224c18b..3b0d5fad 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -2542,7 +2542,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.to_lowercase(), &user.name, &org.name).await {
+ if let Err(e) = mail::send_admin_reset_password(&user.email, &user.name, &org.name).await {
error!("Error sending user reset password email: {:#?}", e);
}
@@ -2615,19 +2615,11 @@ async fn check_reset_password_applicable_and_permissions(
};
// Resetting user must be higher/equal to user to reset
- let mut reset_allowed = false;
- if headers.org_user_type == UserOrgType::Owner {
- reset_allowed = true;
+ match headers.org_user_type {
+ UserOrgType::Owner => Ok(()),
+ UserOrgType::Admin if target_user.atype <= UserOrgType::Admin => Ok(()),
+ _ => err!("No permission to reset this user's password"),
}
- if headers.org_user_type == UserOrgType::Admin {
- reset_allowed = target_user.atype != (UserOrgType::Owner as i32);
- }
-
- if !reset_allowed {
- err!("No permission to reset this user's password");
- }
-
- Ok(())
}
async fn check_reset_password_applicable(org_id: &str, conn: &mut DbConn) -> EmptyResult {