From bd0815d894aece6e79ea45272c7fbbeba0529a42 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:18:39 +0000 Subject: [PATCH] root: fix app settings load order (cherry-pick #8569) (#8571) Co-authored-by: Jens L fix app settings load order (#8569) --- authentik/root/settings.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/authentik/root/settings.py b/authentik/root/settings.py index 902825f377..11d847b6ce 100644 --- a/authentik/root/settings.py +++ b/authentik/root/settings.py @@ -481,13 +481,6 @@ def _update_settings(app_path: str): pass -# Load subapps's settings -for _app in set(SHARED_APPS + TENANT_APPS): - if not _app.startswith("authentik"): - continue - _update_settings(f"{_app}.settings") -_update_settings("data.user_settings") - if DEBUG: CELERY["task_always_eager"] = True os.environ[ENV_GIT_HASH_KEY] = "dev" @@ -512,5 +505,13 @@ except ImportError: # being imported for @prefill_task TENANT_APPS.append("authentik.events") + +# Load subapps's settings +for _app in set(SHARED_APPS + TENANT_APPS): + if not _app.startswith("authentik"): + continue + _update_settings(f"{_app}.settings") +_update_settings("data.user_settings") + SHARED_APPS = list(OrderedDict.fromkeys(SHARED_APPS + TENANT_APPS)) INSTALLED_APPS = list(OrderedDict.fromkeys(SHARED_APPS + TENANT_APPS))