Code formatting

src/callers/login.rs

@@ -96,8 +96,7 @@ pub mod response {
     pub async fn extract(
         response: axum::response::Response,
     ) -> Result<LoginResponse, std::io::Error> {
-        let body = match axum::body::to_bytes(response.into_body(), usize::MAX)
+        let body = match axum::body::to_bytes(response.into_body(), usize::MAX).await {
-            .await {
             Ok(body) => body,
             Err(err) => {
                 return Err(std::io::Error::other(err));
@@ -201,15 +200,18 @@ pub async fn user_login(
                         Ok(matches) => {
                             if matches {
                                 // Create token
-                                let key = textsender_models::envy::environment::get_secret_key()
+                                let key =
-                                    .value;
+                                    textsender_models::envy::environment::get_secret_key().value;
                                 let cst = match token_stuff::create_token(&key, &user.id) {
                                     Ok(token) => token,
                                     Err(_err) => {
-                                        return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response::LoginResponse {
+                                        return (
-                                            message: String::from("Error creating token"),
+                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                            data: Vec::new()
+                                            axum::Json(response::LoginResponse {
-                                        }));
+                                                message: String::from("Error creating token"),
+                                                data: Vec::new(),
+                                            }),
+                                        );
                                     }
                                 };
 
@@ -348,8 +350,8 @@ pub async fn service_user_login(
                             if matches {
                                 // Create token
                                 println!("Creating token");
-                                let key = textsender_models::envy::environment::get_secret_key()
+                                let key =
-                                    .value;
+                                    textsender_models::envy::environment::get_secret_key().value;
                                 let cst =
                                     token_stuff::create_token(&key, &service_user.id).unwrap();
 
@@ -454,8 +456,7 @@ pub async fn refresh_token(
             }),
         )
     } else {
-        let key = textsender_models::envy::environment::get_secret_key()
+        let key = textsender_models::envy::environment::get_secret_key().value;
-            .value;
         if token_stuff::verify_token(&key, &payload.access_token) {
             match token_stuff::extract_id_from_token(&key, &payload.access_token) {
                 Ok(id) => {

src/db/init.rs

@@ -1,8 +1,7 @@
 use sqlx::postgres::PgPoolOptions;
 
 pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    let database_url = textsender_models::envy::environment::get_db_url()
+    let database_url = textsender_models::envy::environment::get_db_url().value;
-        .value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()

src/token_stuff/mod.rs

@@ -119,9 +119,7 @@ mod tests {
 
     #[test]
     fn test_tokenize() {
-        let special_key = 
+        let special_key = textsender_models::envy::environment::get_secret_key().value;
-            textsender_models::envy::environment::get_secret_key()
-            .value;
         let id = uuid::Uuid::new_v4();
         match create_token(&special_key, &id) {
             Ok(cst) => {

tests/tests.rs

@@ -9,9 +9,7 @@ mod db_mgr {
     pub const LIMIT: usize = 6;
 
     pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-        let tm_db_url = textsender_models::envy::environment::get_db_url()
+        let tm_db_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
         let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
         sqlx::PgPool::connect_with(tm_options).await
     }
@@ -23,9 +21,7 @@ mod db_mgr {
     }
 
     pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-        let db_url = textsender_models::envy::environment::get_db_url()
+        let db_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
         let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
         sqlx::PgPool::connect_with(options).await
     }
@@ -35,7 +31,10 @@ mod db_mgr {
         db_name: &str,
     ) -> Result<(), sqlx::Error> {
         let create_query = format!("CREATE DATABASE {}", db_name);
-        match sqlx::query(&create_query).execute(template_pool).await {
+        match sqlx::query(sqlx::AssertSqlSafe(create_query))
+            .execute(template_pool)
+            .await
+        {
             Ok(_) => Ok(()),
             Err(e) => Err(e),
         }
@@ -47,14 +46,14 @@ mod db_mgr {
         db_name: &str,
     ) -> Result<(), sqlx::Error> {
         let drop_query = format!("DROP DATABASE IF EXISTS {} WITH (FORCE)", db_name);
-        sqlx::query(&drop_query).execute(template_pool).await?;
+        sqlx::query(sqlx::AssertSqlSafe(drop_query))
+            .execute(template_pool)
+            .await?;
         Ok(())
     }
 
     pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-        let database_url = textsender_models::envy::environment::get_db_url()
+        let database_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
 
         let parsed_url = url::Url::parse(&database_url)?;
         if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {