Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change API and structs to camelCase #4386

Merged
merged 9 commits into from
Jun 23, 2024
Prev Previous commit
Next Next commit
Update org revoke
  • Loading branch information
dani-garcia committed Jun 19, 2024
commit b4c95189b834fa708d42d9378129ba596131fb4a
15 changes: 10 additions & 5 deletions src/api/core/organizations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1978,7 +1978,7 @@ async fn deactivate_organization_user(
#[put("/organizations/<org_id>/users/deactivate", data = "<data>")]
async fn bulk_deactivate_organization_user(
org_id: &str,
data: Json<Value>,
data: Json<OrgBulkRevokeData>,
headers: AdminHeaders,
conn: DbConn,
) -> Json<Value> {
Expand All @@ -1995,21 +1995,26 @@ async fn revoke_organization_user(
_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>")]
async fn bulk_revoke_organization_user(
org_id: &str,
data: Json<Value>,
data: Json<OrgBulkRevokeData>,
headers: AdminHeaders,
mut conn: DbConn,
) -> Json<Value> {
let data = data.into_inner();

let mut bulk_response = Vec::new();
match data["Ids"].as_array() {
match data.ids {
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 _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(),
Err(e) => format!("{e:?}"),
};
Expand Down
Loading