MyFavMirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-11-07 04:42:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change some missing PascalCase keys (#4671)

Browse Source
This commit is contained in:
Daniel García
2024-06-24 21:17:59 +02:00
committed by GitHub
parent 8e2a87fd79
commit a4c7fadbf4
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/api/core/organizations.rs
View File

@@ -2093,7 +2093,7 @@ async fn activate_organization_user(
#[put("/organizations/<org_id>/users/activate", data = "<data>")]
async fn bulk_activate_organization_user(
org_id: &str,
data: Json<Value>,
data: Json<OrgBulkIds>,
headers: AdminHeaders,
conn: DbConn,
) -> Json<Value> {
@@ -2113,32 +2113,26 @@ async fn restore_organization_user(
#[put("/organizations/<org_id>/users/restore", data = "<data>")]
async fn bulk_restore_organization_user(
org_id: &str,
data: Json<Value>,
data: Json<OrgBulkIds>,
headers: AdminHeaders,
mut conn: DbConn,
) -> Json<Value> {
let data = data.into_inner();
let mut bulk_response = Vec::new();
match data["Ids"].as_array() {
Some(org_users) => {
for org_user_id in org_users {
let org_user_id = org_user_id.as_str().unwrap_or_default();
let err_msg = match _restore_organization_user(org_id, org_user_id, &headers, &mut conn).await {
Ok(_) => String::new(),
Err(e) => format!("{e:?}"),
};
for org_user_id in data.ids {
let err_msg = match _restore_organization_user(org_id, &org_user_id, &headers, &mut conn).await {
Ok(_) => String::new(),
Err(e) => format!("{e:?}"),
};
bulk_response.push(json!(
{
"object": "OrganizationUserBulkResponseModel",
"id": org_user_id,
"error": err_msg
}
));
bulk_response.push(json!(
{
"object": "OrganizationUserBulkResponseModel",
"id": org_user_id,
"error": err_msg
}
}
None => error!("No users to restore"),
));
}
Json(json!({