From aae40f56d33d0ae7cf013cecad9a375d887a77e1 Mon Sep 17 00:00:00 2001 From: swve Date: Fri, 25 Aug 2023 21:17:42 +0200 Subject: [PATCH] fix: config bugs --- config/config.py | 19 +++++++++++++------ config/config.yaml | 4 ++-- src/services/dev/dev.py | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/config/config.py b/config/config.py index 93c3fa73..0e1905b4 100644 --- a/config/config.py +++ b/config/config.py @@ -68,13 +68,20 @@ def get_learnhouse_config() -> LearnHouseConfig: yaml_config = yaml.safe_load(f) # General Config - env_development_mode = os.environ.get("LEARNHOUSE_DEVELOPMENT_MODE") - development_mode = env_development_mode or yaml_config.get("general", {}).get( - "development_mode" + + # Development Mode & Install Mode + env_development_mode = eval(os.environ.get("LEARNHOUSE_DEVELOPMENT_MODE", "None")) + development_mode = ( + env_development_mode + if env_development_mode is not None + else yaml_config.get("general", {}).get("development_mode") ) - env_install_mode = os.environ.get("LEARNHOUSE_INSTALL_MODE") - install_mode = env_install_mode or yaml_config.get("general", {}).get( - "install_mode" + + env_install_mode = os.environ.get("LEARNHOUSE_INSTALL_MODE", "None") + install_mode = ( + env_install_mode + if env_install_mode is not None + else yaml_config.get("general", {}).get("install_mode") ) # Security Config diff --git a/config/config.yaml b/config/config.yaml index 9e892240..742d57b2 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -13,8 +13,8 @@ hosting_config: domain: learnhouse.app ssl: true allowed_origins: - - http://localhost:3000 - - http://localhost:3001 + - http://localhost:3000 + - http://localhost:3001 cookies_config: domain: ".localhost" allowed_regexp: '\b((?:https?://)[^\s/$.?#].[^\s]*)\b' diff --git a/src/services/dev/dev.py b/src/services/dev/dev.py index 53a51397..e74b25d7 100644 --- a/src/services/dev/dev.py +++ b/src/services/dev/dev.py @@ -8,11 +8,11 @@ def isDevModeEnabled(): return True else: return False - + + def isDevModeEnabledOrRaise(): config = get_learnhouse_config() if config.general_config.development_mode: return True else: - raise HTTPException(status_code=403, detail="Development mode is not enabled") - + raise HTTPException(status_code=403, detail="Development mode is disabled")