From 98c43447ffcd8f86ac9abe6bfd0a064792470dfa Mon Sep 17 00:00:00 2001
From: Zhang Jie <13131481+j-z10@users.noreply.github.com>
Date: Sat, 7 Dec 2024 05:58:02 +0800
Subject: [PATCH] root: fix override locale only if it is not empty (#12283)

* update impersonate middleware

override language only if it's not empty

Signed-off-by: Zhang Jie <13131481+j-z10@users.noreply.github.com>

* Update brands locale scope

Signed-off-by: Zhang Jie <13131481+j-z10@users.noreply.github.com>

---------

Signed-off-by: Zhang Jie <13131481+j-z10@users.noreply.github.com>
---
 authentik/brands/middleware.py | 6 ++++--
 authentik/core/middleware.py   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/authentik/brands/middleware.py b/authentik/brands/middleware.py
index 52af854e33..dd72038ab8 100644
--- a/authentik/brands/middleware.py
+++ b/authentik/brands/middleware.py
@@ -25,5 +25,7 @@ class BrandMiddleware:
             locale = brand.default_locale
             if locale != "":
                 locale_to_set = locale
-        with override(locale_to_set):
-            return self.get_response(request)
+        if locale_to_set:
+            with override(locale_to_set):
+                return self.get_response(request)
+        return self.get_response(request)
diff --git a/authentik/core/middleware.py b/authentik/core/middleware.py
index 1d20455a1b..811b1eceb2 100644
--- a/authentik/core/middleware.py
+++ b/authentik/core/middleware.py
@@ -42,8 +42,10 @@ class ImpersonateMiddleware:
             # Ensure that the user is active, otherwise nothing will work
             request.user.is_active = True
 
-        with override(locale_to_set):
-            return self.get_response(request)
+        if locale_to_set:
+            with override(locale_to_set):
+                return self.get_response(request)
+        return self.get_response(request)
 
 
 class RequestIDMiddleware: