diff --git a/Cargo.lock b/Cargo.lock index 67a47e1..510df1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -824,8 +824,8 @@ dependencies = [ [[package]] name = "icarus_envy" -version = "0.7.0" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.7.0#ab91c3fa4ff40680c6996eaea30be8cb04db0b31" +version = "0.8.0" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 0476958..f02e7a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.1" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" } +icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" } [dev-dependencies] http-body-util = { version = "0.1.3" } diff --git a/src/callers/login.rs b/src/callers/login.rs index 52b90d7..9a3c6b1 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -92,7 +92,7 @@ pub mod endpoint { Ok(user) => { if hashing::verify_password(&payload.password, user.password.clone()).unwrap() { // Create token - let key = icarus_envy::environment::get_secret_key().await.value; + let key = icarus_envy::environment::get_secret_key().value; let (token_literal, duration) = token_stuff::create_token(&key, &user.id).unwrap(); @@ -151,7 +151,7 @@ pub mod endpoint { match repo::service::valid_passphrase(&pool, &payload.passphrase).await { Ok((id, username, _date_created)) => { - let key = icarus_envy::environment::get_secret_key().await.value; + let key = icarus_envy::environment::get_secret_key().value; let (token_literal, duration) = token_stuff::create_service_token(&key, &id).unwrap(); @@ -203,7 +203,7 @@ pub mod endpoint { axum::Json, ) { let mut response = response::refresh_token::Response::default(); - let key = icarus_envy::environment::get_secret_key().await.value; + let key = icarus_envy::environment::get_secret_key().value; if token_stuff::verify_token(&key, &payload.access_token) { let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap(); diff --git a/src/callers/register.rs b/src/callers/register.rs index 990fbe6..0370aa2 100644 --- a/src/callers/register.rs +++ b/src/callers/register.rs @@ -144,7 +144,7 @@ pub async fn register_user( /// Checks to see if registration is enabled async fn is_registration_enabled() -> Result { let key = String::from("ENABLE_REGISTRATION"); - let var = icarus_envy::environment::get_env(&key).await; + let var = icarus_envy::environment::get_env(&key); let parsed_value = var.value.to_uppercase(); if parsed_value == "TRUE" { diff --git a/src/db/init.rs b/src/db/init.rs index aeb92d9..05bdc0d 100644 --- a/src/db/init.rs +++ b/src/db/init.rs @@ -1,7 +1,7 @@ use sqlx::postgres::PgPoolOptions; pub async fn create_pool() -> Result { - let database_url = icarus_envy::environment::get_db_url().await.value; + let database_url = icarus_envy::environment::get_db_url().value; println!("Database url: {database_url}"); PgPoolOptions::new() diff --git a/src/main.rs b/src/main.rs index 05967a9..691aa74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,7 +69,7 @@ mod init { // Dynamically set the allowed origin based on the environment match std::env::var(icarus_envy::keys::APP_ENV).as_deref() { Ok("production") => { - let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await; + let allowed_origins_env = icarus_envy::environment::get_allowed_origins(); match icarus_envy::utility::delimitize(&allowed_origins_env) { Ok(alwd) => { let allowed_origins: Vec = alwd @@ -162,7 +162,7 @@ mod tests { pub const LIMIT: usize = 6; pub async fn get_pool() -> Result { - let tm_db_url = icarus_envy::environment::get_db_url().await.value; + let tm_db_url = icarus_envy::environment::get_db_url().value; let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); sqlx::PgPool::connect_with(tm_options).await } @@ -175,7 +175,7 @@ mod tests { } pub async fn connect_to_db(db_name: &str) -> Result { - let db_url = icarus_envy::environment::get_db_url().await.value; + let db_url = icarus_envy::environment::get_db_url().value; let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -185,7 +185,10 @@ mod tests { 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), } @@ -197,12 +200,14 @@ mod tests { 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> { - let database_url = icarus_envy::environment::get_db_url().await.value; + let database_url = icarus_envy::environment::get_db_url().value; let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -503,7 +508,7 @@ mod tests { let app = init::routes().await.layer(axum::Extension(pool)); let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap(); - let key = icarus_envy::environment::get_secret_key().await.value; + let key = icarus_envy::environment::get_secret_key().value; match token_stuff::create_service_token(&key, &id) { Ok((token, _expire)) => {