phoenix/icarus_auth
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 46 Wiki Activity

Adding icarus_envy #39

Merged
phoenix merged 18 commits from experiment-icarus_envy into devel 2025-06-01 23:02:10 +00:00
Conversation 0 Commits 18 Files Changed 6 +12 -5
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51340beaa7 - Show all commits

11
src/lib.rs
View File

@@ -4,6 +4,7 @@ pub mod hashing;
pub mod repo; pub mod repo;
pub mod token_stuff; pub mod token_stuff;
/*
pub mod keys { pub mod keys {
pub const DBURL: &str = "DATABASE_URL"; pub const DBURL: &str = "DATABASE_URL";
@@ -11,6 +12,7 @@ pub mod keys {
pub const ERROR: &str = "DATABASE_URL must be set in .env"; pub const ERROR: &str = "DATABASE_URL must be set in .env";
} }
} }
*/
mod connection_settings { mod connection_settings {
pub const MAXCONN: u32 = 5; pub const MAXCONN: u32 = 5;
@@ -21,10 +23,13 @@ pub mod db {
use sqlx::postgres::PgPoolOptions; use sqlx::postgres::PgPoolOptions;
use std::env; use std::env;
use crate::{connection_settings, keys}; use icarus_envy::keys;
// use crate::{connection_settings, keys};
use crate::connection_settings;
pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> { pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
let database_url = get_db_url().await; let database_url = icarus_envy::environment::get_db_url().await;
println!("Database url: {:?}", database_url); println!("Database url: {:?}", database_url);
PgPoolOptions::new() PgPoolOptions::new()
@@ -33,11 +38,13 @@ pub mod db {
.await .await
} }
/*
async fn get_db_url() -> String { async fn get_db_url() -> String {
#[cfg(debug_assertions)] // Example: Only load .env in debug builds #[cfg(debug_assertions)] // Example: Only load .env in debug builds
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
env::var(keys::DBURL).expect(keys::error::ERROR) env::var(keys::DBURL).expect(keys::error::ERROR)
} }
*/
pub async fn migrations(pool: &sqlx::PgPool) { pub async fn migrations(pool: &sqlx::PgPool) {
// Run migrations using the sqlx::migrate! macro // Run migrations using the sqlx::migrate! macro

6
src/main.rs
View File

@@ -75,7 +75,7 @@ mod tests {
pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> { pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
dotenvy::dotenv().ok(); // Load .env file if it exists dotenvy::dotenv().ok(); // Load .env file if it exists
let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present"); let tm_db_url = std::env::var(icarus_envy::keys::DBURL).expect("DATABASE_URL must be present");
let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
sqlx::PgPool::connect_with(tm_options).await sqlx::PgPool::connect_with(tm_options).await
} }
@@ -87,7 +87,7 @@ mod tests {
} }
pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> { pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
let db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be set for tests"); let db_url = std::env::var(icarus_envy::keys::DBURL).expect("DATABASE_URL must be set for tests");
let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
sqlx::PgPool::connect_with(options).await sqlx::PgPool::connect_with(options).await
} }
@@ -116,7 +116,7 @@ mod tests {
pub fn get_database_name() -> Result<String, Box<dyn std::error::Error>> { pub fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
dotenvy::dotenv().ok(); // Load .env file if it exists dotenvy::dotenv().ok(); // Load .env file if it exists
match std::env::var(keys::DBURL) { match std::env::var(icarus_envy::keys::DBURL) {
Ok(database_url) => { Ok(database_url) => {
let parsed_url = url::Url::parse(&database_url)?; let parsed_url = url::Url::parse(&database_url)?;
if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {