From e6a704b63f0a0162bdbc3d116117cac2e697bf85 Mon Sep 17 00:00:00 2001
From: BlackDex <black.dex@gmail.com>
Date: Sat, 16 May 2026 15:24:44 +0200
Subject: [PATCH] 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>
---
 src/api/core/organizations.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index 31311a65..3e6eb767 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -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,