From 7ea6a341c5c58a0fe8e02be98082acbce9f1512f Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 17 Jul 2026 16:12:07 -0400 Subject: [PATCH] icarus_envy -> sienvy --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- src/callers/login.rs | 6 +++--- src/callers/register.rs | 2 +- src/db/init.rs | 2 +- src/main.rs | 16 ++++++++-------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9805cc9..defbf28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,15 +781,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "icarus_envy" -version = "0.8.0" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309" -dependencies = [ - "const_format", - "dotenvy", -] - [[package]] name = "icarus_models" version = "0.11.3" @@ -1558,6 +1549,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" +[[package]] +name = "sienvy" +version = "0.8.0" +source = "git+ssh://git@git.kundeng.us/phoenix/sienvy.git?tag=v0.8.0-main-d06c8fdf49-006#d06c8fdf49920cf4d8ba0487c20f5bdc851c36de" +dependencies = [ + "const_format", + "dotenvy", +] + [[package]] name = "simd-adler32" version = "0.3.9" @@ -1586,12 +1586,12 @@ dependencies = [ "argon2", "axum", "http-body-util", - "icarus_envy", "icarus_models", "josekit", "openssl", "serde", "serde_json", + "sienvy", "sqlx", "time", "tokio", diff --git a/Cargo.toml b/Cargo.toml index ddf3088..ff8aed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,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.3" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" } +sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" } [dev-dependencies] http-body-util = { version = "0.1.3" } diff --git a/src/callers/login.rs b/src/callers/login.rs index 9a3c6b1..06b0b3e 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().value; + let key = sienvy::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().value; + let key = sienvy::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().value; + let key = sienvy::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 0370aa2..5de508e 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); + let var = sienvy::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 05bdc0d..df5efa5 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().value; + let database_url = sienvy::environment::get_db_url().value; println!("Database url: {database_url}"); PgPoolOptions::new() diff --git a/src/main.rs b/src/main.rs index 691aa74..71ef3ba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -44,7 +44,7 @@ mod init { register_responses::Response, login_responses::Response, login_responses::service_login::Response, login_responses::refresh_token::Response)), tags( - (name = "Icarus Auth API", description = "Auth API for Icarus API") + (name = "soaricarus Auth API", description = "Auth API for soaricarus API") ) )] struct ApiDoc; @@ -67,10 +67,10 @@ mod init { .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2] // Dynamically set the allowed origin based on the environment - match std::env::var(icarus_envy::keys::APP_ENV).as_deref() { + match std::env::var(sienvy::keys::APP_ENV).as_deref() { Ok("production") => { - let allowed_origins_env = icarus_envy::environment::get_allowed_origins(); - match icarus_envy::utility::delimitize(&allowed_origins_env) { + let allowed_origins_env = sienvy::environment::get_allowed_origins(); + match sienvy::utility::delimitize(&allowed_origins_env) { Ok(alwd) => { let allowed_origins: Vec = alwd .into_iter() @@ -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().value; + let tm_db_url = sienvy::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().value; + let db_url = sienvy::environment::get_db_url().value; let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -207,7 +207,7 @@ mod tests { } pub async fn get_database_name() -> Result> { - let database_url = icarus_envy::environment::get_db_url().value; + let database_url = sienvy::environment::get_db_url().value; let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -508,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().value; + let key = sienvy::environment::get_secret_key().value; match token_stuff::create_service_token(&key, &id) { Ok((token, _expire)) => {