dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-07-09 17:25:59 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

PutPolicy now using vnext format (#7296)

Browse Source 
Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
Timshel 2026-07-07 15:59:26 +02:00 committed by GitHub
parent a058a35ccd
commit 7320a1db4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/api/core/organizations.rs
View File

@ -2034,18 +2034,27 @@ struct PolicyData {
data: Option<Value>, data: Option<Value>,
} }
#[derive(Deserialize)]
struct PutPolicy {
policy: PolicyData,
// Ignore metadata for now as we do not yet support this
// "metadata": {
// "defaultUserCollectionName": "2.xx|xx==|xx="
// }
}
#[put("/organizations/<org_id>/policies/<pol_type>", data = "<data>")] #[put("/organizations/<org_id>/policies/<pol_type>", data = "<data>")]
async fn put_policy( async fn put_policy(
org_id: OrganizationId, org_id: OrganizationId,
pol_type: i32, pol_type: i32,
data: Json<PolicyData>, data: Json<PutPolicy>,
headers: AdminHeaders, headers: AdminHeaders,
conn: DbConn, conn: DbConn,
) -> JsonResult { ) -> JsonResult {
if org_id != headers.org_id { if org_id != headers.org_id {
err!("Organization not found", "Organization id's do not match"); err!("Organization not found", "Organization id's do not match");
} }
let data: PolicyData = data.into_inner(); let data: PolicyData = data.into_inner().policy;
let Some(pol_type_enum) = OrgPolicyType::from_i32(pol_type) else { let Some(pol_type_enum) = OrgPolicyType::from_i32(pol_type) else {
err!("Invalid or unsupported policy type") err!("Invalid or unsupported policy type")
@ -2153,26 +2162,16 @@ async fn put_policy(
Ok(Json(policy.to_json())) Ok(Json(policy.to_json()))
} }
#[derive(Deserialize)] // Deprecated with client v2026.5.0
struct PolicyDataVnext {
policy: PolicyData,
// Ignore metadata for now as we do not yet support this
// "metadata": {
// "defaultUserCollectionName": "2.xx|xx==|xx="
// }
}
#[put("/organizations/<org_id>/policies/<pol_type>/vnext", data = "<data>")] #[put("/organizations/<org_id>/policies/<pol_type>/vnext", data = "<data>")]
async fn put_policy_vnext( async fn put_policy_vnext(
org_id: OrganizationId, org_id: OrganizationId,
pol_type: i32, pol_type: i32,
data: Json<PolicyDataVnext>, data: Json<PutPolicy>,
headers: AdminHeaders, headers: AdminHeaders,
conn: DbConn, conn: DbConn,
) -> JsonResult { ) -> JsonResult {
let data: PolicyDataVnext = data.into_inner(); put_policy(org_id, pol_type, data, headers, conn).await
let policy: PolicyData = data.policy;
put_policy(org_id, pol_type, Json(policy), headers, conn).await
} }
#[get("/plans")] #[get("/plans")]