Compare commits

..

2 Commits

Author SHA1 Message Date
e51df82f09 CORS env variables (#19)
All checks were successful
Release Tagging / release (push) Successful in 41s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 35s
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 31s
Reviewed-on: #19
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-09-28 23:08:32 +00:00
d84a8144ae tsk-17: Add ICARUS_AUTH_BASE_API_URL env key (#18)
All checks were successful
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 30s
Rust Build / Rustfmt (push) Successful in 34s
Rust Build / build (push) Successful in 30s
Rust Build / Clippy (push) Successful in 34s
Release Tagging / release (push) Successful in 33s
Closes #17

Reviewed-on: #18
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-08-14 22:58:45 +00:00
7 changed files with 59 additions and 2 deletions

1
.env
View File

@@ -8,3 +8,4 @@ POSTGRES_MAIN_DB=my_db
POSTGRES_MAIN_HOST=localhost POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com ICARUS_BASE_API_URL=https://icarus.com
ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com

View File

@@ -8,3 +8,4 @@ POSTGRES_MAIN_DB=my_db
POSTGRES_MAIN_HOST=localhost POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com ICARUS_BASE_API_URL=https://icarus.com
ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com

View File

@@ -4,6 +4,9 @@ on:
push: push:
branches: branches:
- main - main
pull_request:
branches:
- main
jobs: jobs:
release: release:

2
Cargo.lock generated
View File

@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
[[package]] [[package]]
name = "icarus_envy" name = "icarus_envy"
version = "0.3.1" version = "0.3.3"
dependencies = [ dependencies = [
"async-std", "async-std",
"const_format", "const_format",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "icarus_envy" name = "icarus_envy"
version = "0.3.1" version = "0.3.3"
edition = "2024" edition = "2024"
rust-version = "1.88" rust-version = "1.88"

View File

@@ -27,3 +27,34 @@ pub async fn get_icarus_base_api_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL) std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
} }
pub async fn get_icarus_auth_base_api_url() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::ICARUS_AUTH_BASE_API_URL)
.expect(crate::keys::error::ICARUS_AUTH_BASE_API_URL)
}
pub async fn get_app_env() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::APP_ENV).expect(crate::keys::error::APP_ENV)
}
pub async fn get_backend_port() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::BACKEND_PORT).expect(crate::keys::error::BACKEND_PORT)
}
pub async fn get_frontend_url() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::FRONTEND_URL).expect(crate::keys::error::FRONTEND_URL)
}
pub async fn get_rust_log() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::RUST_LOG).expect(crate::keys::error::RUST_LOG)
}
pub async fn get_allowed_origins() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::ALLOWED_ORIGINS).expect(crate::keys::error::ALLOWED_ORIGINS)
}

View File

@@ -18,6 +18,20 @@ pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
// Environment key for icarus api url // Environment key for icarus api url
pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL"; pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
// Environment key for icarus auth api url
pub const ICARUS_AUTH_BASE_API_URL: &str = "ICARUS_AUTH_BASE_API_URL";
/// Environment key for App status
pub const APP_ENV: &str = "APP_ENV";
/// Environment key for backend port. Used for both auth and core functionality
pub const BACKEND_PORT: &str = "BACKEND_PORT";
/// Environment key for frontend url
pub const FRONTEND_URL: &str = "FRONTEND_URL";
/// Environment key for application logging
pub const RUST_LOG: &str = "RUST_LOG";
/// Environment key for allowed origins for CORS support
pub const ALLOWED_ORIGINS: &str = "ALLOWED_ORIGINS";
pub mod error { pub mod error {
use const_format::concatcp; use const_format::concatcp;
@@ -28,4 +42,11 @@ pub mod error {
pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR); pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR); pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR); pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR);
pub const ICARUS_AUTH_BASE_API_URL: &str =
concatcp!(super::ICARUS_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
pub const APP_ENV: &str = concatcp!(super::APP_ENV, " ", GENERAL_ERROR);
pub const BACKEND_PORT: &str = concatcp!(super::BACKEND_PORT, " ", GENERAL_ERROR);
pub const FRONTEND_URL: &str = concatcp!(super::FRONTEND_URL, " ", GENERAL_ERROR);
pub const RUST_LOG: &str = concatcp!(super::RUST_LOG, " ", GENERAL_ERROR);
pub const ALLOWED_ORIGINS: &str = concatcp!(super::ALLOWED_ORIGINS, " ", GENERAL_ERROR);
} }