saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-01 16:49:09 +00:00
Code Activity

Update org revoke

Browse source
This commit is contained in:
Daniel García 2024-06-19 17:29:40 +02:00
commit b4c95189b8
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/core/organizations.rs
View file

@ -1978,7 +1978,7 @@ async fn deactivate_organization_user(
#[put("/organizations/<org_id>/users/deactivate", data = "<data>")] #[put("/organizations/<org_id>/users/deactivate", data = "<data>")]
async fn bulk_deactivate_organization_user( async fn bulk_deactivate_organization_user(
org_id: &str, org_id: &str,
data: Json<Value>, data: Json<OrgBulkRevokeData>,
headers: AdminHeaders, headers: AdminHeaders,
conn: DbConn, conn: DbConn,
) -> Json<Value> { ) -> Json<Value> {
@ -1995,21 +1995,26 @@ async fn revoke_organization_user(
_revoke_organization_user(org_id, org_user_id, &headers, &mut conn).await _revoke_organization_user(org_id, org_user_id, &headers, &mut conn).await
} }
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
struct OrgBulkRevokeData {
ids: Option<Vec<String>>,
}
#[put("/organizations/<org_id>/users/revoke", data = "<data>")] #[put("/organizations/<org_id>/users/revoke", data = "<data>")]
async fn bulk_revoke_organization_user( async fn bulk_revoke_organization_user(
org_id: &str, org_id: &str,
data: Json<Value>, data: Json<OrgBulkRevokeData>,
headers: AdminHeaders, headers: AdminHeaders,
mut conn: DbConn, mut conn: DbConn,
) -> Json<Value> { ) -> Json<Value> {
let data = data.into_inner(); let data = data.into_inner();
let mut bulk_response = Vec::new(); let mut bulk_response = Vec::new();
match data["Ids"].as_array() { match data.ids {
Some(org_users) => { Some(org_users) => {
for org_user_id in 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 _revoke_organization_user(org_id, &org_user_id, &headers, &mut conn).await {
let err_msg = match _revoke_organization_user(org_id, org_user_id, &headers, &mut conn).await {
Ok(_) => String::new(), Ok(_) => String::new(),
Err(e) => format!("{e:?}"), Err(e) => format!("{e:?}"),
}; };