From 92e04e3c6a50a2ba65b4caabe85ca5d66719fb93 Mon Sep 17 00:00:00 2001 From: Tarun Tak Date: Fri, 26 Jun 2026 07:10:44 +0000 Subject: [PATCH] fix: using userID when SQUELCH_PII_IN_LOGS enabled --- common/djangoapps/track/middleware.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/track/middleware.py b/common/djangoapps/track/middleware.py index 2c4bc86c69b9..5e452ee035cb 100644 --- a/common/djangoapps/track/middleware.py +++ b/common/djangoapps/track/middleware.py @@ -132,10 +132,14 @@ def enter_request_context(self, request): * path - The path part of the requested URL. * client_id - The unique key used by Google Analytics to identify a user """ + username_or_id = self.get_username(request) + if settings.FEATURES['SQUELCH_PII_IN_LOGS']: + username_or_id = self.get_user_primary_key(request) + context = { 'session': self.get_session_key(request), 'user_id': self.get_user_primary_key(request), - 'username': self.get_username(request), + 'username': username_or_id, 'ip': self.get_request_ip_address(request), } for header_name, context_key in META_KEY_TO_CONTEXT_KEY.items():