Update dependencies (#30)

Reviewed-on: phoenix/textsender_api#30

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()
-        .await
-        .value;
+    let secret_key = textsender_models::envy::environment::get_secret_main_key().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 =
-                            match textsender_models::config::auxiliary::load_config().await {
-                                Ok(config) => config,
-                                Err(err) => {
-                                    eprintln!("Error: {err:?}");
-                                    response.message = String::from("Error getting config");
-                                    return (
-                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                        axum::Json(response),
-                                    );
-                                }
-                            };
+                        let t_config = match textsender_models::config::auxiliary::load_config() {
+                            Ok(config) => config,
+                            Err(err) => {
+                                eprintln!("Error: {err:?}");
+                                response.message = String::from("Error getting config");
+                                return (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response),
+                                );
+                            }
+                        };
                         let mut results: Vec<
                             textsender_models::message::event::MessageEventResponse,
                         > = Vec::new();
@@ -101,12 +100,18 @@ pub mod endpoint {
                             schedule_at: None,
                         };
 
+                        let mut sendmsg = swoosh::SendMsg::default();
+                        sendmsg.load_config(
+                            &t_config.auth_token,
+                            &t_config.phone_number,
+                            &t_config.service_sid,
+                            &t_config.account_sid,
+                        );
+
                         for contact in &contacts {
-                            match swoosh::twilio::api::send_message(
-                                &message, contact, &pp, &t_config,
-                            )
-                            .await
-                            {
+                            sendmsg.load_message(&message.content);
+                            sendmsg.load_recipient(&contact.phone_number);
+                            match sendmsg.send_message(&pp).await {
                                 Ok(result) => {
                                     let val = swoosh::twilio::api::response_to_json(result).await;
                                     let mer = textsender_models::message::event::MessageEventResponse {

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()
-        .await
-        .value;
+    let database_url = textsender_models::envy::environment::get_db_url().value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()