Making changes related to breaking changes

src/auth/mod.rs

@@ -36,9 +36,7 @@ pub async fn auth<B>(
         (StatusCode::UNAUTHORIZED, Json(json_error))
     })?;
 
-    let secret_key = textsender_models::envy::environment::get_secret_main_key()
+    let secret_key = textsender_models::envy::environment::get_secret_main_key().value;
-        .await
-        .value;
 
     let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256);
     validation.set_audience(&["textsender"]); // Must match exactly what's in the token

src/caller/instant.rs

@@ -81,18 +81,17 @@ pub mod endpoint {
                 match message_repo::get(&pool, &payload.message_id).await {
                     Ok(message) => {
                         println!("Valid message");
-                        let t_config =
+                        let t_config = match textsender_models::config::auxiliary::load_config() {
-                            match textsender_models::config::auxiliary::load_config().await {
+                            Ok(config) => config,
-                                Ok(config) => config,
+                            Err(err) => {
-                                Err(err) => {
+                                eprintln!("Error: {err:?}");
-                                    eprintln!("Error: {err:?}");
+                                response.message = String::from("Error getting config");
-                                    response.message = String::from("Error getting config");
+                                return (
-                                    return (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response),
-                                        axum::Json(response),
+                                );
-                                    );
+                            }
-                                }
+                        };
-                            };
                         let mut results: Vec<
                             textsender_models::message::event::MessageEventResponse,
                         > = Vec::new();

src/config/mod.rs

@@ -50,7 +50,7 @@ pub mod init {
                 Ok("production") => {
                     // In production, allow only your specific, trusted origins
                     let allowed_origins_env =
-                        textsender_models::envy::environment::get_allowed_origins().await;
+                        textsender_models::envy::environment::get_allowed_origins();
                     match textsender_models::envy::utility::delimitize(&allowed_origins_env) {
                         Ok(alwd) => {
                             let allowed_origins: Vec<axum::http::HeaderValue> = alwd

src/db/mod.rs

@@ -5,9 +5,7 @@ pub mod connection_settings {
 }
 
 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;
-        .await
-        .value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()