From 2d4016ee42b0b1e08eddd6fbbaffda676fdb1578 Mon Sep 17 00:00:00 2001 From: Aman Tahiliani Date: Sun, 21 Apr 2024 16:22:47 -0400 Subject: [PATCH] Updated User Ip registration --- backend/api/user_login.py | 8 +++++++- backend/api/utils/get_client_ip.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/backend/api/user_login.py b/backend/api/user_login.py index c88a84d..588d159 100644 --- a/backend/api/user_login.py +++ b/backend/api/user_login.py @@ -66,7 +66,13 @@ class PollOnlineView(APIView): def post(self, request): try: user = request.user - ip_address = get_client_ip(request) + try: + data = request.data + ip_address = data['ip'] + print("Local IP found in request") + except Exception as e: + ip_address = get_client_ip(request) + print("Using public IP") user.ip_address = ip_address user.last_poll = timezone.now() user.save() diff --git a/backend/api/utils/get_client_ip.py b/backend/api/utils/get_client_ip.py index 739a1e7..172b5a7 100644 --- a/backend/api/utils/get_client_ip.py +++ b/backend/api/utils/get_client_ip.py @@ -13,7 +13,13 @@ def get_client_ip(request): def update_user_ip(request): user = request.user - ip_address = get_client_ip(request) + try: + data = request.data + ip_address = data['ip'] + print("Local IP found in request") + except Exception as e: + ip_address = get_client_ip(request) + print("Using public IP") user.ip_address = ip_address user.last_poll = timezone.now() user.save()