Fix tests

Author: Inbal Tako

README.md

@@ -119,7 +119,7 @@ from securenative.models.user_traits import UserTraits
 def track(request):
     securenative = SecureNative.get_instance()
 
-    context = SecureNative.from_http_request(request)
+    context = securenative.from_http_request(request)
     event_options = EventOptions(event=EventTypes.LOG_IN,
                                 user_id="1234",
                                 user_traits=UserTraits("Your Name", "name@gmail.com", "+1234567890"),
@@ -143,7 +143,7 @@ from securenative.models.user_traits import UserTraits
 def verify(request):
     securenative = SecureNative.get_instance()
 
-    context = SecureNative.from_http_request(request)
+    context = securenative.from_http_request(request)
     event_options = EventOptions(event=EventTypes.LOG_IN,
                                 user_id="1234",
                                 user_traits=UserTraits("Your Name", "name@gmail.com", "+1234567890"),

securenative/utils/request_utils.py

@@ -19,17 +19,25 @@ def get_client_ip_from_request(request, options):
                     if request.headers[header] is not None:
                         return request.headers[header]
                 except Exception:
-                    continue
+                    try:
+                        if request.headers[header] is not None:
+                            return request.headers[header]
+                    except Exception:
+                        continue
 
         try:
             x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
             if x_forwarded_for:
                 ip = x_forwarded_for.split(',')[-1].strip()
             else:
                 ip = request.META.get('REMOTE_ADDR')
+
+            if ip is None or ip == "":
+                ip = request.environ.get('HTTP_X_FORWARDED_FOR', request.environ.get('REMOTE_ADDR', ""))
+
             return ip
         except Exception:
-            return request.environ.get('HTTP_X_FORWARDED_FOR', request.environ.get('REMOTE_ADDR', ""))
+            return ""
 
     @staticmethod
     def get_remote_ip_from_request(request):