diff --git a/Cargo.lock b/Cargo.lock index 585e06d..00b75df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1038,15 +1038,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_meta" version = "0.6.1" @@ -2129,6 +2120,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 = "signal-hook-registry" version = "1.4.8" @@ -2190,7 +2190,6 @@ dependencies = [ "axum-extra", "common-multipart-rfc7578", "futures", - "icarus_envy", "icarus_meta", "icarus_models", "josekit", @@ -2199,6 +2198,7 @@ dependencies = [ "openssl", "serde", "serde_json", + "sienvy", "sqlx", "tempfile", "time", diff --git a/Cargo.toml b/Cargo.toml index 46be008..b948787 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.6.1" } 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] common-multipart-rfc7578 = { version = "0.7.0" } diff --git a/src/auth/mod.rs b/src/auth/mod.rs index 3839ec7..307e737 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -36,7 +36,7 @@ pub async fn auth( (StatusCode::UNAUTHORIZED, Json(json_error)) })?; - let secret_key = icarus_envy::environment::get_secret_main_key().value; + let secret_key = sienvy::environment::get_secret_main_key().value; let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256); validation.set_audience(&["icarus"]); // Must match exactly what's in the token diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 5b2835d..7522645 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -68,7 +68,7 @@ pub mod endpoint { let song_id = payload.song_id; match crate::repo::song::get_song(&pool, &song_id).await { Ok(song) => { - let directory = icarus_envy::environment::get_root_directory().value; + let directory = sienvy::environment::get_root_directory().value; let file_type = icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); let coverart_type = if file_type.file_type diff --git a/src/callers/song.rs b/src/callers/song.rs index d817aff..935813d 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -139,7 +139,7 @@ pub mod endpoint { true, ) .unwrap(); - song.directory = icarus_envy::environment::get_root_directory().value; + song.directory = sienvy::environment::get_root_directory().value; match repo_queue::song::get_data(&pool, &payload.song_queue_id).await { Ok(data) => { diff --git a/src/config/init.rs b/src/config/init.rs index a1b37af..74ac2d8 100644 --- a/src/config/init.rs +++ b/src/config/init.rs @@ -28,20 +28,18 @@ mod cors { axum::http::Method::POST, axum::http::Method::PUT, axum::http::Method::DELETE, - ]) // Specify allowed methods:cite[2] + ]) .allow_headers([ axum::http::header::CONTENT_TYPE, axum::http::header::AUTHORIZATION, - ]) // Specify allowed headers:cite[2] - .allow_credentials(true) // If you need to send cookies or authentication headers:cite[2] + ]) + .allow_credentials(true) .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") => { - // In production, allow only your specific, trusted origins - 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() @@ -55,17 +53,14 @@ mod cors { } } } - _ => { - // Development (default): Allow localhost origins - cors.allow_origin(vec![ - "http://localhost:8000".parse().unwrap(), - "http://127.0.0.1:8000".parse().unwrap(), - "http://localhost:8001".parse().unwrap(), - "http://127.0.0.1:8001".parse().unwrap(), - "http://localhost:4200".parse().unwrap(), - "http://127.0.0.1:4200".parse().unwrap(), - ]) - } + _ => cors.allow_origin(vec![ + "http://localhost:8000".parse().unwrap(), + "http://127.0.0.1:8000".parse().unwrap(), + "http://localhost:8001".parse().unwrap(), + "http://127.0.0.1:8001".parse().unwrap(), + "http://localhost:4200".parse().unwrap(), + "http://127.0.0.1:4200".parse().unwrap(), + ]), } } } diff --git a/src/db/mod.rs b/src/db/mod.rs index 2983446..5b1096d 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -5,7 +5,7 @@ pub mod connection_settings { } 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 8ecd1cb..13215d7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,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 } @@ -51,7 +51,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 } @@ -83,7 +83,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" { @@ -157,7 +157,7 @@ mod tests { pub const TEST_USER_ID: uuid::Uuid = uuid::uuid!("cc938368-615a-4694-b2ca-6e122fa31c52"); pub async fn test_token() -> Result { - let key: String = icarus_envy::environment::get_secret_main_key().value; + let key: String = sienvy::environment::get_secret_main_key().value; let (message, issuer, audience) = token_fields(); let token_resource = icarus_models::token::TokenResource {