mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-07-19 03:13:32 +00:00
Updates and fixes (#7235)
* Update crates and gha Updated all the crates Updated GitHub Actions Signed-off-by: BlackDex <black.dex@gmail.com> * 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> * Update datatables Signed-off-by: BlackDex <black.dex@gmail.com> --------- Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
committed by
GitHub
parent
70f9dfbe8b
commit
22f5e0496c
@@ -78,6 +78,7 @@ pub fn routes() -> Vec<Route> {
|
||||
revoke_member,
|
||||
bulk_revoke_members,
|
||||
restore_member,
|
||||
restore_member_vnext,
|
||||
bulk_restore_members,
|
||||
get_groups,
|
||||
get_groups_details,
|
||||
@@ -2315,6 +2316,18 @@ async fn _revoke_member(
|
||||
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")]
|
||||
async fn restore_member(
|
||||
org_id: OrganizationId,
|
||||
|
||||
Reference in New Issue
Block a user