From 33f484846fc1583e7a6b053c6e8d8d75e21eca6a Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Thu, 26 Dec 2024 22:27:39 +1100 Subject: [PATCH] remove dead code --- src/charge_controllers/tristar.rs | 9 ---- src/main.rs | 1 - src/server/authentication.rs | 76 ------------------------------- 3 files changed, 86 deletions(-) delete mode 100644 src/server/authentication.rs diff --git a/src/charge_controllers/tristar.rs b/src/charge_controllers/tristar.rs index 7cdf21e..301ea6e 100644 --- a/src/charge_controllers/tristar.rs +++ b/src/charge_controllers/tristar.rs @@ -297,15 +297,6 @@ impl Tristar { self.charge_state_gauges.set(new_state.charge_state); self.state = new_state; } - // else { - // self.consecutive_errors += 1; - // if self.consecutive_errors >= MAX_CONSECUTIVE_ERRORS { - // self.modbus.close(); - // if let Err(e) = self.modbus.connect() { - // log::error!("error reconnecting to modbus device: {e:?}"); - // } - // } - // } } async fn get_data(&mut self) -> Result { diff --git a/src/main.rs b/src/main.rs index dc68cce..d73b97c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -161,7 +161,6 @@ async fn main() { pl_state, api_requests, pli_requests, - // tcrc_requests, )); // spawn the api / charge rate control loop diff --git a/src/server/authentication.rs b/src/server/authentication.rs deleted file mode 100644 index b258de3..0000000 --- a/src/server/authentication.rs +++ /dev/null @@ -1,76 +0,0 @@ -use tesla_common::AuthInfo; - -use crate::errors::AuthKeyError; - -#[derive(serde::Deserialize, Debug)] -#[allow(dead_code)] -struct AuthKeySuccess { - access_token: String, - refresh_token: String, - id_token: String, - expires_in: usize, - state: String, - token_type: String, -} - -impl AuthKeySuccess { - fn get_keys(&self) -> AuthInfo { - AuthInfo { - access_token: tesla_common::AccessToken(self.access_token.clone()), - refresh_token: Some(tesla_common::RefreshToken(self.refresh_token.clone())), - } - } -} - -#[derive(serde::Deserialize, Debug)] -#[serde(untagged)] -enum AuthKeyResponse { - Ok(AuthKeySuccess), - Error(crate::errors::TeslaError), -} - -pub async fn register_auth_key(code: String) -> Result { - if let Some(secrets) = super::SECRETS.as_ref() { - let mut headers = reqwest::header::HeaderMap::new(); - headers.insert( - "Content-Type", - "application/x-www-form-urlencoded".parse().unwrap(), - ); - - let client = reqwest::Client::builder() - .redirect(reqwest::redirect::Policy::none()) - .build() - .unwrap(); - let res = client - .post("https://auth.tesla.com/oauth2/v3/token") - .headers(headers) - .body( - [ - "grant_type=authorization_code&client_id=", - &secrets.client_id, - "&client_secret=", - &secrets.client_secret, - "&code=", - &code, - "&audience=", - &secrets.audience, - "&redirect_uri=", - &secrets.redirect_uri, - ] - .concat(), - ) - .send() - .await? - .text() - .await?; - let keys = match serde_json::from_str(&res) { - Ok(AuthKeyResponse::Ok(v)) => Ok(v), - Ok(AuthKeyResponse::Error(e)) => Err(AuthKeyError::TeslaError(e)), - Err(e) => Err(AuthKeyError::SerdeError(e)), - }?; - - Ok(keys.get_keys()) - } else { - Err(AuthKeyError::Secrets) - } -}