fix: root user password reset (#8348)

This commit is contained in:
Hengfei Yang
2025-09-10 17:24:07 +08:00
committed by GitHub
parent aff48e3a56
commit 55a0c62d3f
5 changed files with 73 additions and 22 deletions
@@ -29,7 +29,7 @@ use crate::{
self,
http::HttpResponse as MetaHttpResponse,
service_account::{APIToken, ServiceAccountRequest, UpdateServiceAccountRequest},
user::{UpdateUser, UserRequest},
user::{UpdateUser, UserRequest, UserUpdateMode},
},
utils::auth::UserEmail,
},
@@ -226,7 +226,14 @@ pub async fn update(
};
let initiator_id = &user_email.user_id;
users::update_user(&org_id, &email_id, false, initiator_id, user).await
users::update_user(
&org_id,
&email_id,
UserUpdateMode::OtherUpdate,
initiator_id,
user,
)
.await
}
/// RemoveServiceAccount
+7 -3
View File
@@ -45,7 +45,7 @@ use crate::{
self,
user::{
AuthTokens, PostUserRequest, RolesResponse, SignInResponse, SignInUser, UpdateUser,
UserOrgRole, UserRequest, UserRoleRequest, get_roles,
UserOrgRole, UserRequest, UserRoleRequest, UserUpdateMode, get_roles,
},
},
utils::auth::{UserEmail, generate_presigned_url, is_valid_email},
@@ -245,8 +245,12 @@ pub async fn update(
});
}
let initiator_id = &user_email.user_id;
let self_update = user_email.user_id.eq(&email_id);
users::update_user(&org_id, &email_id, self_update, initiator_id, user).await
let update_mode = if user_email.user_id.eq(&email_id) {
UserUpdateMode::SelfUpdate
} else {
UserUpdateMode::OtherUpdate
};
users::update_user(&org_id, &email_id, update_mode, initiator_id, user).await
}
/// AddUserToOrganization