diff --git a/apigateway/services.py b/apigateway/services.py index 5703811..d89076d 100644 --- a/apigateway/services.py +++ b/apigateway/services.py @@ -1408,10 +1408,15 @@ def _register_hooks(self, app: Flask): @app.after_request def _after_request_hook(response: Response): if self._producer is not None: + try: + real_user = current_user._get_current_object() + except RuntimeError: + current_app.logger.exception("Unable to collect real user. Most likely due to unbound session.") + return response self._producer.send( self.get_service_config("REQUEST_TOPIC"), { - "user_id": current_user.get_id(), + "user_id": real_user.get_id(), "client_id": ( current_token.client_id if current_token and hasattr(current_token, "client")