diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 05ee7e1008dc4f774ccbb5247914358aadc492d4..2ffa694b87386d38056d5e4a46b3a7b7c548a30e 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -88,7 +88,7 @@ fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> JsonResult { let domains_json = if data.exclude_domains { Value::Null } else { - api::core::get_eq_domains(headers).unwrap().into_inner() + api::core::_get_eq_domains(headers, true).unwrap().into_inner() }; Ok(Json(json!({ diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs index db0d7b2b38289cdc95d149994e70c111a084119f..c8de156f1a386cefb7d8a427ed19ba65a4f3f183 100644 --- a/src/api/core/mod.rs +++ b/src/api/core/mod.rs @@ -81,6 +81,10 @@ const GLOBAL_DOMAINS: &str = include_str!("../../static/global_domains.json"); #[get("/settings/domains")] 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; use serde_json::from_str; @@ -93,6 +97,10 @@ fn get_eq_domains(headers: Headers) -> JsonResult { global.Excluded = excluded_globals.contains(&global.Type); } + if no_excluded { + globals.retain(|g| !g.Excluded); + } + Ok(Json(json!({ "EquivalentDomains": equivalent_domains, "GlobalEquivalentDomains": globals,