fix: config bugs

This commit is contained in:
swve 2023-08-25 21:17:42 +02:00
parent 3336140b26
commit aae40f56d3
3 changed files with 18 additions and 11 deletions

View file

@ -68,13 +68,20 @@ def get_learnhouse_config() -> LearnHouseConfig:
yaml_config = yaml.safe_load(f) yaml_config = yaml.safe_load(f)
# General Config # General Config
env_development_mode = os.environ.get("LEARNHOUSE_DEVELOPMENT_MODE")
development_mode = env_development_mode or yaml_config.get("general", {}).get( # Development Mode & Install Mode
"development_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( env_install_mode = os.environ.get("LEARNHOUSE_INSTALL_MODE", "None")
"install_mode" install_mode = (
env_install_mode
if env_install_mode is not None
else yaml_config.get("general", {}).get("install_mode")
) )
# Security Config # Security Config

View file

@ -13,8 +13,8 @@ hosting_config:
domain: learnhouse.app domain: learnhouse.app
ssl: true ssl: true
allowed_origins: allowed_origins:
- http://localhost:3000 - http://localhost:3000
- http://localhost:3001 - http://localhost:3001
cookies_config: cookies_config:
domain: ".localhost" domain: ".localhost"
allowed_regexp: '\b((?:https?://)[^\s/$.?#].[^\s]*)\b' allowed_regexp: '\b((?:https?://)[^\s/$.?#].[^\s]*)\b'

View file

@ -8,11 +8,11 @@ def isDevModeEnabled():
return True return True
else: else:
return False return False
def isDevModeEnabledOrRaise(): def isDevModeEnabledOrRaise():
config = get_learnhouse_config() config = get_learnhouse_config()
if config.general_config.development_mode: if config.general_config.development_mode:
return True return True
else: else:
raise HTTPException(status_code=403, detail="Development mode is not enabled") raise HTTPException(status_code=403, detail="Development mode is disabled")