Code formatting

src/service/core.rs

@@ -27,4 +27,3 @@ impl Service {
         );
     }
 }
-

src/service/mod.rs

@@ -1,6 +1,5 @@
 pub mod core;
 
-
 pub mod auth {
     pub struct Auth {
         pub app: crate::app::App,
@@ -22,28 +21,27 @@ pub mod auth {
             println!("Payload: {payload:?}");
 
             match client.post(api_url).json(&payload).send().await {
-                Ok(response) => {
+                Ok(response) => match response.status() {
-                    match response.status() {
                     reqwest::StatusCode::OK => {
                         println!("Response: {response:?}");
                         match response.text().await {
-                                Ok(val) => {
+                            Ok(val) => match parse_token_response(&val).await {
-                                    match parse_token_response(&val).await {
                                 Ok(login_result) => Ok(login_result),
-                                        Err(err) => Err(err)
+                                Err(err) => Err(err),
-                                    }
+                            },
-                                }
                             Err(err) => Err(std::io::Error::other(err)),
                         }
                     }
                     _ => Err(std::io::Error::other("Error getting token")),
-                    }
+                },
-                }
                 Err(err) => Err(std::io::Error::other(err.to_string())),
             }
         }
 
-        pub async fn get_refresh_token(&self, login_result: &textsender_models::token::Login) -> Result<textsender_models::token::Login, std::io::Error> {
+        pub async fn get_refresh_token(
+            &self,
+            login_result: &textsender_models::token::Login,
+        ) -> Result<textsender_models::token::Login, std::io::Error> {
             let client = reqwest::Client::new();
             let endpoint = String::from("api/v1/token/refresh");
             let api_url = format!("{}/{endpoint}", self.app.auth_url);
@@ -55,29 +53,27 @@ pub mod auth {
             });
 
             match client.post(api_url).json(&payload).send().await {
-                Ok(response) => {
+                Ok(response) => match response.status() {
-                    match response.status() {
                     reqwest::StatusCode::OK => {
                         println!("Response: {response:?}");
                         match response.text().await {
-                                Ok(val) => {
+                            Ok(val) => match parse_token_response(&val).await {
-                                    match parse_token_response(&val).await {
                                 Ok(login_result) => Ok(login_result),
-                                        Err(err) => Err(err)
+                                Err(err) => Err(err),
-                                    }
+                            },
-                                }
                             Err(err) => Err(std::io::Error::other(err)),
                         }
                     }
                     _ => Err(std::io::Error::other("Error getting token")),
-                    }
+                },
-                }
                 Err(err) => Err(std::io::Error::other(err.to_string())),
             }
         }
     }
 
-    async fn parse_token_response(response: &String) -> Result<textsender_models::token::LoginResult, std::io::Error> {
+    async fn parse_token_response(
+        response: &String,
+    ) -> Result<textsender_models::token::LoginResult, std::io::Error> {
         match serde_json::from_str::<serde_json::Value>(response) {
             Ok(j) => {
                 println!("Good");
@@ -89,12 +85,12 @@ pub mod auth {
                 match j.get("data") {
                     Some(serde_json::Value::Array(lrs)) => {
                         if lrs.is_empty() {
-                            Err(std::io::Error::other(
+                            Err(std::io::Error::other("Error response is empty"))
-                                "Error response is empty",
-                            ))
                         } else {
                             let lr = lrs[0].clone();
-                            let ll: textsender_models::token::LoginResult = match serde_json::from_value(lr) {                                                        Ok(lr) => lr,
+                            let ll: textsender_models::token::LoginResult =
+                                match serde_json::from_value(lr) {
+                                    Ok(lr) => lr,
                                     Err(err) => {
                                         return Err(std::io::Error::other(err.to_string()));
                                     }
@@ -102,9 +98,7 @@ pub mod auth {
                             Ok(ll)
                         }
                     }
-                    _ => Err(std::io::Error::other(
+                    _ => Err(std::io::Error::other("Error parsing response")),
-                        "Error parsing response",
-                    )),
                 }
             }
             Err(err) => Err(std::io::Error::other(err.to_string())),