Merge branch 'master' into app-passwords

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	authentik/core/tests/test_source_flow_manager.py
#	authentik/stages/authenticator_validate/tests.py
#	authentik/stages/password/tests.py
#	scripts/generate_ci_config.py
This commit is contained in:
Jens Langhammer
2021-08-23 20:30:58 +02:00
34 changed files with 126 additions and 119 deletions

View File

@ -1,9 +1,9 @@
"""Utility script to generate a config for CI runs"""
from authentik.providers.oauth2.generators import generate_client_id
from authentik.lib.generators import generate_id
from yaml import safe_dump
with open("local.env.yml", "w") as _config:
safe_dump({
"secret_key": generate_client_id(),
"log_level": "debug"
"log_level": "debug",
"secret_key": generate_id(),
}, _config, default_flow_style=False)