mirror of
https://github.com/ViViDboarder/bitwarden_rs.git
synced 2024-11-05 04:46:36 +00:00
Don't include excluded global equivalent domains during sync
Fixes #681
This commit is contained in:
parent
e449912f05
commit
85dbf4e16c
@ -88,7 +88,7 @@ fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> JsonResult {
|
|||||||
let domains_json = if data.exclude_domains {
|
let domains_json = if data.exclude_domains {
|
||||||
Value::Null
|
Value::Null
|
||||||
} else {
|
} else {
|
||||||
api::core::get_eq_domains(headers).unwrap().into_inner()
|
api::core::_get_eq_domains(headers, true).unwrap().into_inner()
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
|
@ -81,6 +81,10 @@ const GLOBAL_DOMAINS: &str = include_str!("../../static/global_domains.json");
|
|||||||
|
|
||||||
#[get("/settings/domains")]
|
#[get("/settings/domains")]
|
||||||
fn get_eq_domains(headers: Headers) -> JsonResult {
|
fn get_eq_domains(headers: Headers) -> JsonResult {
|
||||||
|
_get_eq_domains(headers, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn _get_eq_domains(headers: Headers, no_excluded: bool) -> JsonResult {
|
||||||
let user = headers.user;
|
let user = headers.user;
|
||||||
use serde_json::from_str;
|
use serde_json::from_str;
|
||||||
|
|
||||||
@ -93,6 +97,10 @@ fn get_eq_domains(headers: Headers) -> JsonResult {
|
|||||||
global.Excluded = excluded_globals.contains(&global.Type);
|
global.Excluded = excluded_globals.contains(&global.Type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if no_excluded {
|
||||||
|
globals.retain(|g| !g.Excluded);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"EquivalentDomains": equivalent_domains,
|
"EquivalentDomains": equivalent_domains,
|
||||||
"GlobalEquivalentDomains": globals,
|
"GlobalEquivalentDomains": globals,
|
||||||
|
Loading…
Reference in New Issue
Block a user