icarus_envy related changes

src/auth.rs

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

@@ -702,7 +702,7 @@ pub mod endpoint {
                 let song_id = payload.song_id;
                 match crate::callers::song::song_db::get_song(&pool, &song_id).await {
                     Ok(song) => {
-                        let directory = icarus_envy::environment::get_root_directory().await;
+                        let directory = icarus_envy::environment::get_root_directory().await.value;
                         let dir = std::path::Path::new(&directory);
 
                         // TODO: Make this random and the file extension should not be hard coded

src/callers/song.rs

@@ -1209,7 +1209,7 @@ pub mod endpoint {
             let mut song = payload.to_song();
             song.filename =
                 song.generate_filename(icarus_models::types::MusicTypes::FlacExtension, true);
-            song.directory = icarus_envy::environment::get_root_directory().await;
+            song.directory = icarus_envy::environment::get_root_directory().await.value;
 
             match song_queue::get_data(&pool, &payload.song_queue_id).await {
                 Ok(data) => {

src/main.rs

@@ -10,7 +10,7 @@ pub mod db {
     }
 
     pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-        let database_url = icarus_envy::environment::get_db_url().await;
+        let database_url = icarus_envy::environment::get_db_url().await.value;
         println!("Database url: {database_url}");
 
         PgPoolOptions::new()
@@ -82,11 +82,22 @@ pub mod init {
                 Ok("production") => {
                     // In production, allow only your specific, trusted origins
                     let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
+                    /*
                     let allowed_origins: Vec<axum::http::HeaderValue> = allowed_origins_env
                         .split(",")
                         .map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
                         .collect();
-                    cors.allow_origin(allowed_origins)
+                    */
+                    match icarus_envy::utility::delimitize(&allowed_origins_env) {
+                        Ok(alwd) => {
+                            let allowed_origins: Vec<axum::http::HeaderValue> = alwd.into_iter().map(|a| a.parse::<axum::http::HeaderValue>().unwrap()).collect();
+                            cors.allow_origin(allowed_origins)
+                        }
+                        Err(err) => {
+                            eprintln!("Error getting allowed origins: Error: {err:?}");
+                            std::process::exit(-1);
+                        }
+                    }
                 }
                 _ => {
                     // Development (default): Allow localhost origins