Cargo.lock

@@ -1070,8 +1070,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_envy"
-version = "0.7.0"
+version = "0.8.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.7.0#ab91c3fa4ff40680c6996eaea30be8cb04db0b31"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -25,7 +25,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.7.0" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" }
 
 [dev-dependencies]
 common-multipart-rfc7578 = { version = "0.7.0" }

src/auth/mod.rs

@@ -36,7 +36,7 @@ pub async fn auth<B>(
         (StatusCode::UNAUTHORIZED, Json(json_error))
     })?;
 
-    let secret_key = icarus_envy::environment::get_secret_main_key().await.value;
+    let secret_key = icarus_envy::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

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().await.value;
+                        let directory = icarus_envy::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

src/callers/song.rs

@@ -139,7 +139,7 @@ pub mod endpoint {
                 true,
             )
             .unwrap();
-            song.directory = icarus_envy::environment::get_root_directory().await.value;
+            song.directory = icarus_envy::environment::get_root_directory().value;
 
             match repo_queue::song::get_data(&pool, &payload.song_queue_id).await {
                 Ok(data) => {

src/config/init.rs

@@ -40,7 +40,7 @@ mod cors {
         match std::env::var(icarus_envy::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().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<axum::http::HeaderValue> = alwd
@@ -60,6 +60,8 @@ mod cors {
                 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(),
                 ])

src/db/mod.rs

@@ -5,7 +5,7 @@ pub mod connection_settings {
 }
 
 pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    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()
@@ -15,8 +15,6 @@ pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
 }
 
 pub async fn migrations(pool: &sqlx::PgPool) {
-    // Run migrations using the sqlx::migrate! macro
-    // Assumes your migrations are in a ./migrations folder relative to Cargo.toml
     sqlx::migrate!("./migrations")
         .run(pool)
         .await

src/main.rs

@@ -38,7 +38,7 @@ mod tests {
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-            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
         }
@@ -51,7 +51,7 @@ mod tests {
         }
 
         pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-            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
         }
@@ -78,7 +78,7 @@ mod tests {
         }
 
         pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-            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" {
@@ -149,7 +149,7 @@ mod tests {
     pub const TEST_USER_ID: uuid::Uuid = uuid::uuid!("cc938368-615a-4694-b2ca-6e122fa31c52");
 
     pub async fn test_token() -> Result<String, josekit::JoseError> {
-        let key: String = icarus_envy::environment::get_secret_main_key().await.value;
+        let key: String = icarus_envy::environment::get_secret_main_key().value;
         let (message, issuer, audience) = token_fields();
 
         let token_resource = icarus_models::token::TokenResource {