Browse Source

Fix restoring revoked user

A new endpoint is used to restore a revoked user.
This commit fixes that.

Fixes #7224

Signed-off-by: BlackDex <black.dex@gmail.com>
pull/7235/head
BlackDex 7 days ago
parent
commit
e6a704b63f
No known key found for this signature in database GPG Key ID: 58C80A2AA6C765E1
  1. 13
      src/api/core/organizations.rs

13
src/api/core/organizations.rs

@ -78,6 +78,7 @@ pub fn routes() -> Vec<Route> {
revoke_member, revoke_member,
bulk_revoke_members, bulk_revoke_members,
restore_member, restore_member,
restore_member_vnext,
bulk_restore_members, bulk_restore_members,
get_groups, get_groups,
get_groups_details, get_groups_details,
@ -2315,6 +2316,18 @@ async fn _revoke_member(
Ok(()) Ok(())
} }
#[put("/organizations/<org_id>/users/<member_id>/restore/vnext")]
async fn restore_member_vnext(
org_id: OrganizationId,
member_id: MembershipId,
headers: AdminHeaders,
conn: DbConn,
) -> EmptyResult {
// Vaultwarden does not (yet) support the per User Collection linked to the `Enforce organization data ownership` policy.
// Therefor we ignore the `defaultUserCollectionName` data sent and just call restore_member
_restore_member(&org_id, &member_id, &headers, &conn).await
}
#[put("/organizations/<org_id>/users/<member_id>/restore")] #[put("/organizations/<org_id>/users/<member_id>/restore")]
async fn restore_member( async fn restore_member(
org_id: OrganizationId, org_id: OrganizationId,

Loading…
Cancel
Save