Compare commits

...

3 Commits

Author SHA1 Message Date
7881a865ae Version bump
Some checks failed
Rust Build / Check (pull_request) Successful in 38s
Rust Build / Test Suite (pull_request) Failing after 53s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 40s
Rust Build / build (pull_request) Successful in 54s
2025-10-10 16:46:08 -04:00
8a9bcce8f2 Code formatting 2025-10-10 16:45:36 -04:00
a89415178d icarus_envy related changes 2025-10-10 16:45:23 -04:00
6 changed files with 24 additions and 12 deletions

2
Cargo.lock generated
View File

@@ -759,7 +759,7 @@ dependencies = [
[[package]]
name = "icarus_auth"
version = "0.5.1"
version = "0.5.2"
dependencies = [
"argon2",
"axum",

View File

@@ -1,6 +1,6 @@
[package]
name = "icarus_auth"
version = "0.5.1"
version = "0.5.2"
edition = "2024"
rust-version = "1.88"

View File

@@ -96,7 +96,7 @@ pub mod endpoint {
Ok(user) => {
if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
// Create token
let key = icarus_envy::environment::get_secret_key().await;
let key = icarus_envy::environment::get_secret_key().await.value;
let (token_literal, duration) =
token_stuff::create_token(&key, &user.id).unwrap();
@@ -155,7 +155,7 @@ pub mod endpoint {
match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
Ok((id, _passphrase, _date_created)) => {
let key = icarus_envy::environment::get_secret_key().await;
let key = icarus_envy::environment::get_secret_key().await.value;
let (token_literal, duration) =
token_stuff::create_service_token(&key, &id).unwrap();
@@ -207,7 +207,7 @@ pub mod endpoint {
axum::Json<response::refresh_token::Response>,
) {
let mut response = response::refresh_token::Response::default();
let key = icarus_envy::environment::get_secret_key().await;
let key = icarus_envy::environment::get_secret_key().await.value;
if token_stuff::verify_token(&key, &payload.access_token) {
let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap();

View File

@@ -16,7 +16,7 @@ pub mod db {
use crate::connection_settings;
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()

View File

@@ -66,12 +66,22 @@ mod init {
match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
Ok("production") => {
let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
let allowed_origins: Vec<axum::http::HeaderValue> = allowed_origins_env
.split(",")
match icarus_envy::utility::delimitize(&allowed_origins_env) {
Ok(alwd) => {
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
.into_iter()
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
.collect();
cors.allow_origin(allowed_origins)
}
Err(err) => {
eprintln!(
"Could not parse out allowed origins from env: Error: {err:?}"
);
std::process::exit(-1);
}
}
}
_ => {
// Development (default): Allow localhost origins
cors.allow_origin(vec![

View File

@@ -124,7 +124,9 @@ mod tests {
#[test]
fn test_tokenize() {
let rt = tokio::runtime::Runtime::new().unwrap();
let special_key = rt.block_on(icarus_envy::environment::get_secret_key());
let special_key = rt
.block_on(icarus_envy::environment::get_secret_key())
.value;
let id = uuid::Uuid::new_v4();
match create_token(&special_key, &id) {
Ok((token, _duration)) => {