bump: textsender_models

Cargo.toml

@@ -18,7 +18,7 @@ time = { version = "0.3.49", features = ["macros", "serde"] }
 josekit = { version = "0.10.3" }
 utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10", features = ["config", "user"] }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.0", features = ["config", "user"] }
 
 [dev-dependencies]
 tower = { version = "0.5.3", features = ["full"] }

src/callers/login.rs

@@ -192,9 +192,8 @@ pub async fn user_login(
                         Ok(matches) => {
                             if matches {
                                 // Create token
-                                let key = textsender_models::envy::environment::get_secret_key()
+                                let key =
-                                    .await
+                                    textsender_models::envy::environment::get_secret_key().value;
-                                    .value;
                                 let cst = token_stuff::create_token(&key, &user.id).unwrap();
 
                                 if token_stuff::verify_token(&key, &cst.access_token) {
@@ -332,9 +331,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 =
-                                    .await
+                                    textsender_models::envy::environment::get_secret_key().value;
-                                    .value;
                                 let cst =
                                     token_stuff::create_token(&key, &service_user.id).unwrap();
 
@@ -439,9 +437,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;
-            .await
-            .value;
         if token_stuff::verify_token(&key, &payload.access_token) {
             match token_stuff::extract_id_from_token(&key, &payload.access_token) {
                 Ok(id) => {

src/callers/register.rs

@@ -183,7 +183,7 @@ pub async fn register_user(
 /// Checks to see if registration is enabled
 async fn is_registration_enabled() -> Result<bool, std::io::Error> {
     let key = String::from("ENABLE_REGISTRATION");
-    let var = textsender_models::envy::environment::get_env(&key).await;
+    let var = textsender_models::envy::environment::get_env(&key);
     let parsed_value = var.value.to_uppercase();
 
     if parsed_value == "TRUE" {

src/db/init.rs

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

src/lib.rs

@@ -58,7 +58,7 @@ pub mod init {
             match std::env::var(textsender_models::envy::keys::APP_ENV).as_deref() {
                 Ok("production") => {
                     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/token_stuff/mod.rs

@@ -26,7 +26,7 @@ pub fn create_token(
         audiences: vec![String::from(AUDIENCE)],
         user_id: *id,
     };
-    textsender_models::token::create_token(provided_key, &resource, time::Duration::hours(4))
+    textsender_models::token::create_token(provided_key, resource, time::Duration::hours(4))
 }
 
 pub fn create_service_token(
@@ -39,7 +39,7 @@ pub fn create_service_token(
         audiences: vec![String::from(AUDIENCE)],
         user_id: *id,
     };
-    textsender_models::token::create_token(provided, &resource, time::Duration::hours(1))
+    textsender_models::token::create_token(provided, resource, time::Duration::hours(1))
 }
 
 pub fn create_service_refresh_token(
@@ -52,7 +52,7 @@ pub fn create_service_refresh_token(
         audiences: vec![String::from(AUDIENCE)],
         user_id: *id,
     };
-    textsender_models::token::create_token(key, &resource, time::Duration::hours(4))
+    textsender_models::token::create_token(key, resource, time::Duration::hours(4))
 }
 
 pub fn verify_token(key: &String, token: &String) -> bool {