vw_small

commit b4dfc24040c1c75d8cc062ffb91c3584ea93f1c0
parent 9a0fe6f617b287b7a8d7dabce9f3018f93472cd9
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue,  5 Nov 2019 18:47:43 +0100

Merge pull request #703 from patrickli/bugfix/dont-sync-excluded-global-domains

Don't include excluded global equivalent domains during sync
Diffstat:
M
src/api/core/ciphers.rs
 | 
2
+-
M
src/api/core/mod.rs
 | 
8
++++++++

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git 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
@@ -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,