more refactoring
This commit is contained in:
parent
13e17770ca
commit
7268d49b4a
12 changed files with 319 additions and 189 deletions
|
|
@ -1,3 +1,4 @@
|
|||
use crate::error::{AppError, AppResult};
|
||||
use std::env;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
|
|
@ -16,8 +17,11 @@ pub struct Config {
|
|||
}
|
||||
|
||||
impl Config {
|
||||
pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
|
||||
let database_url = env::var("DATABASE_URL").map_err(|_| "DATABASE_URL must be set")?;
|
||||
pub fn from_env() -> AppResult<Self> {
|
||||
dotenvy::dotenv().ok();
|
||||
|
||||
let database_url = env::var("DATABASE_URL")
|
||||
.map_err(|_| AppError::Config("DATABASE_URL must be set".into()))?;
|
||||
|
||||
let port = env::var("PORT")
|
||||
.ok()
|
||||
|
|
@ -27,12 +31,12 @@ impl Config {
|
|||
let zen_api_key = env::var("ZEN_API_KEY").ok();
|
||||
let tavily_api_key = env::var("TAVILY_API_KEY").ok();
|
||||
|
||||
let authentik_issuer =
|
||||
env::var("AUTHENTIK_ISSUER").map_err(|_| "AUTHENTIK_ISSUER must be set")?;
|
||||
let authentik_client_id =
|
||||
env::var("AUTHENTIK_CLIENT_ID").map_err(|_| "AUTHENTIK_CLIENT_ID must be set")?;
|
||||
let authentik_issuer = env::var("AUTHENTIK_ISSUER")
|
||||
.map_err(|_| AppError::Config("AUTHENTIK_ISSUER must be set".into()))?;
|
||||
let authentik_client_id = env::var("AUTHENTIK_CLIENT_ID")
|
||||
.map_err(|_| AppError::Config("AUTHENTIK_CLIENT_ID must be set".into()))?;
|
||||
let authentik_client_secret = env::var("AUTHENTIK_CLIENT_SECRET")
|
||||
.map_err(|_| "AUTHENTIK_CLIENT_SECRET must be set")?;
|
||||
.map_err(|_| AppError::Config("AUTHENTIK_CLIENT_SECRET must be set".into()))?;
|
||||
|
||||
let cors_allowed_origins = env::var("CORS_ALLOWED_ORIGINS").ok();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue