Align language cookie with session lifetime

netbox-community · Jun 30, 2024 · 8577ff1 · 8577ff1
1 parent 4f93782
commit 8577ff1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/netbox/account/views.py b/netbox/account/views.py
@@ -111,7 +111,7 @@ def post(self, request):
 
             # Set the user's preferred language (if any)
             if language := request.user.config.get('locale.language'):
-                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language)
+                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
 
             return response
 
@@ -206,7 +206,7 @@ def post(self, request):
 
             # Set/clear language cookie
             if language := form.cleaned_data['locale.language']:
-                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language)
+                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
             else:
                 response.delete_cookie(settings.LANGUAGE_COOKIE_NAME)
 

diff --git a/netbox/netbox/middleware.py b/netbox/netbox/middleware.py
@@ -43,17 +43,15 @@ def __call__(self, request):
             login_url = f'{settings.LOGIN_URL}?next={parse.quote(request.get_full_path_info())}'
             return HttpResponseRedirect(login_url)
 
-        # If language cookie is not set, check if it should be set and redirect to requested page
-        if request.user.is_authenticated and not request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME):
-            if language := request.user.config.get('locale.language'):
-                response = HttpResponseRedirect(request.path)
-                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language)
-                return response
-
         # Enable the event_tracking context manager and process the request.
         with event_tracking(request):
             response = self.get_response(request)
 
+        # Check if language cookie should be renewed
+        if request.user.is_authenticated and settings.SESSION_SAVE_EVERY_REQUEST:
+            if language := request.user.config.get('locale.language'):
+                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
+
         # Attach the unique request ID as an HTTP header.
         response['X-Request-ID'] = request.id