Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-22 05:10:29 +01:00
Accept PUT and POST on /settings/domains, returns JsonResult, fixes saving Custom Equivalent Domains
Dieser Commit ist enthalten in:
Ursprung
0a4dbaf307
Commit
c32c65d367
1 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
|
@ -121,6 +121,7 @@ pub fn routes() -> Vec<Route> {
|
||||||
|
|
||||||
get_eq_domains,
|
get_eq_domains,
|
||||||
post_eq_domains,
|
post_eq_domains,
|
||||||
|
put_eq_domains,
|
||||||
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -216,7 +217,7 @@ struct EquivDomainData {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/settings/domains", data = "<data>")]
|
#[post("/settings/domains", data = "<data>")]
|
||||||
fn post_eq_domains(data: JsonUpcase<EquivDomainData>, headers: Headers, conn: DbConn) -> EmptyResult {
|
fn post_eq_domains(data: JsonUpcase<EquivDomainData>, headers: Headers, conn: DbConn) -> JsonResult {
|
||||||
let data: EquivDomainData = data.into_inner().data;
|
let data: EquivDomainData = data.into_inner().data;
|
||||||
|
|
||||||
let excluded_globals = data.ExcludedGlobalEquivalentDomains.unwrap_or_default();
|
let excluded_globals = data.ExcludedGlobalEquivalentDomains.unwrap_or_default();
|
||||||
|
@ -229,8 +230,13 @@ fn post_eq_domains(data: JsonUpcase<EquivDomainData>, headers: Headers, conn: Db
|
||||||
user.equivalent_domains = to_string(&equivalent_domains).unwrap_or("[]".to_string());
|
user.equivalent_domains = to_string(&equivalent_domains).unwrap_or("[]".to_string());
|
||||||
|
|
||||||
match user.save(&conn) {
|
match user.save(&conn) {
|
||||||
Ok(()) => Ok(()),
|
Ok(()) => Ok(Json(json!({}))),
|
||||||
Err(_) => err!("Failed to save user")
|
Err(_) => err!("Failed to save user")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[put("/settings/domains", data = "<data>")]
|
||||||
|
fn put_eq_domains(data: JsonUpcase<EquivDomainData>, headers: Headers, conn: DbConn) -> JsonResult {
|
||||||
|
post_eq_domains(data, headers, conn)
|
||||||
|
}
|
||||||
|
|
Laden …
In neuem Issue referenzieren