diff --git a/src/lib.rs b/src/lib.rs index 12f9ea8..e0eb5a7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,15 +4,6 @@ pub mod hashing; pub mod repo; pub mod token_stuff; -/* -pub mod keys { - pub const DBURL: &str = "DATABASE_URL"; - - pub mod error { - pub const ERROR: &str = "DATABASE_URL must be set in .env"; - } -} -*/ mod connection_settings { pub const MAXCONN: u32 = 5; @@ -22,7 +13,6 @@ pub mod db { use sqlx::postgres::PgPoolOptions; - // use crate::{connection_settings, keys}; use crate::connection_settings; pub async fn create_pool() -> Result { @@ -35,14 +25,6 @@ pub mod db { .await } - /* - async fn get_db_url() -> String { - #[cfg(debug_assertions)] // Example: Only load .env in debug builds - dotenvy::dotenv().ok(); - env::var(keys::DBURL).expect(keys::error::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 diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index 551f953..bd08393 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -12,13 +12,6 @@ pub const MESSAGE: &str = "Something random"; pub const ISSUER: &str = "icarus_auth"; pub const AUDIENCE: &str = "icarus"; -/* -pub fn get_key() -> Result { - dotenvy::dotenv().ok(); - let key = std::env::var(KEY_ENV).expect("SECRET_KEY_NOT_FOUND"); - Ok(key) -} -*/ pub fn get_issued() -> time::Result { Ok(time::OffsetDateTime::now_utc()) @@ -53,7 +46,6 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos payload.set_expires_at(&util::time_to_std_time(&expire).unwrap()); let key: String = if provided_key.is_empty() { - // get_key().unwrap() let rt = tokio::runtime::Runtime::new().unwrap(); // Block on the async function to get the result