root: fix override locale only if it is not empty (goauthentik#12283)

* update impersonate middleware override language only if it's not empty Signed-off-by: Zhang Jie <[email protected]> * Update brands locale scope Signed-off-by: Zhang Jie <[email protected]> --------- Signed-off-by: Zhang Jie <[email protected]>
yonasBSD · Dec 6, 2024 · 98c4344 · 98c4344
1 parent eef1237
commit 98c4344
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/authentik/brands/middleware.py b/authentik/brands/middleware.py
@@ -25,5 +25,7 @@ def __call__(self, request: HttpRequest) -> HttpResponse:
             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
@@ -42,8 +42,10 @@ def __call__(self, request: HttpRequest) -> HttpResponse:
             # 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: