cleanup

Author: j-chmielewski

src-tauri/src/commands.rs

@@ -393,8 +393,6 @@ pub async fn all_instances() -> Result<Vec<InstanceInfo<Id>>, Error> {
             proxy_url: instance.proxy_url,
             active: connected,
             pubkey: keys.pubkey,
-            // disable_all_traffic: instance.disable_all_traffic,
-            // force_all_traffic: instance.force_all_traffic,
             client_traffic_policy: instance.client_traffic_policy,
             enterprise_enabled: instance.enterprise_enabled,
             openid_display_name: instance.openid_display_name,
@@ -590,14 +588,6 @@ pub(crate) async fn do_update_instance(
         Location::disable_all_traffic_for_all(transaction.as_mut(), instance.id).await?;
         debug!("Disabled all traffic for all locations of instance {instance}");
     }
-    error!(
-        "## Updating instance {}({:?}) : {:?} -> {:?}({:?})",
-        instance.name,
-        instance.client_traffic_policy,
-        instance.client_traffic_policy,
-        instance_info.client_traffic_policy,
-        ClientTrafficPolicy::from(instance_info.client_traffic_policy),
-    );
     instance.client_traffic_policy = instance_info.client_traffic_policy.into();
     instance.openid_display_name = instance_info.openid_display_name;
     instance.uuid = instance_info.id;

src-tauri/src/database/models/instance.rs

@@ -69,7 +69,6 @@ impl Instance<Id> {
     where
         E: SqliteExecutor<'e>,
     {
-        error!("### Executing query: {:?}", self.client_traffic_policy);
         query!(
             "UPDATE instance SET name = $1, uuid = $2, url = $3, proxy_url = $4, username = $5, \
             client_traffic_policy = $6, enterprise_enabled = $7, token = $8, \
@@ -210,8 +209,6 @@ impl Instance<NoId> {
             username: self.username,
             token: self.token,
             client_traffic_policy: self.client_traffic_policy,
-            // disable_all_traffic: self.disable_all_traffic,
-            // force_all_traffic: self.force_all_traffic,
             enterprise_enabled: self.enterprise_enabled,
             openid_display_name: self.openid_display_name,
         })
@@ -227,7 +224,6 @@ pub struct InstanceInfo<I = NoId> {
     pub proxy_url: String,
     pub active: bool,
     pub pubkey: String,
-    // pub disable_all_traffic: bool,
     pub client_traffic_policy: ClientTrafficPolicy,
     pub enterprise_enabled: bool,
     pub openid_display_name: Option<String>,

src/pages/client/types.ts

@@ -14,8 +14,6 @@ export type DefguardInstance = {
   active: boolean;
   pubkey: string;
   client_traffic_policy: ClientTrafficPolicy,
-  // disable_all_traffic: boolean;
-  // force_all_traffic: boolean;
   openid_display_name?: string;
 };