Merge branch 'master' into release

rednaks · Jan 27, 2020 · 15a5516 · 15a5516
2 parents 1264b51 + ed504d5
commit 15a5516
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,7 @@ IP_GEOLOCATION_SETTINGS = {
     'ENABLE_REQUEST_HOOK': True,
     'ENABLE_RESPONSE_HOOK': True,
     'ENABLE_COOKIE': False,
+    'FORCE_IP_ADDR': None,
 }
 
 ```
@@ -70,6 +71,7 @@ Those are the default settings, that will be overwritten by those set in `settin
 | `ENABLE_REQUEST_HOOK`  | Enable or disable hook on request               | `True` (bool)                                                         |
 | `ENABLE_RESPONSE_HOOK` | Enable or disable hook on request               | `True` (bool)                                                         |
 | `ENABLE_COOKIE`        | Enable or disable geolocation data in cookie    | `False` (bool)                                                        |
+| `FORCE_IP_ADDR`        | Force ip address, rather than using visitor ip  | `None` (string)                                                       |
 
 ### Available Backends
 * `django_ip_geolocation.backends.IPGeolocationAPI` : (Default) Using https://ipgeolocationapi.com/

diff --git a/django_ip_geolocation/decorators.py b/django_ip_geolocation/decorators.py
@@ -17,7 +17,9 @@ def inner(request):  # noqa: E501
         try:
             enable_request = _settings.get('ENABLE_REQUEST_HOOK')
             enable_response = _settings.get('ENABLE_RESPONSE_HOOK')
-            if not enable_request and not enable_response:
+            enable_cookie = _settings.get('ENABLE_COOKIE', False)
+
+            if not enable_request and not (enable_response or enable_cookie):
                 return view_func(request)
 
             geolocation = get_geolocation(request)
@@ -31,7 +33,7 @@ def inner(request):  # noqa: E501
                 header = _settings.get('RESPONSE_HEADER')
                 response[header] = geolocation
 
-            if _settings.get('ENABLE_COOKIE', False):
+            if enable_cookie:
                 set_cookie(response, geolocation)
 
             return response

diff --git a/django_ip_geolocation/settings.py b/django_ip_geolocation/settings.py
@@ -10,6 +10,7 @@
     'ENABLE_REQUEST_HOOK': True,
     'ENABLE_RESPONSE_HOOK': True,
     'ENABLE_COOKIE': False,
+    'FORCE_IP_ADDR': None,
 }
 
 CUSTOM_IP_GEOLOCATION_SETTINGS = getattr(settings, 'IP_GEOLOCATION_SETTINGS', {})  # noqa: E501

diff --git a/django_ip_geolocation/utils.py b/django_ip_geolocation/utils.py
@@ -1,6 +1,6 @@
 """Helper functions."""
-from django_ip_geolocation import settings
 from django.utils.module_loading import import_string  # noqa: E501 # pylint: disable=import-error
+from django_ip_geolocation import settings
 
 
 def _get_remote_ip_from_request(request):
@@ -38,7 +38,10 @@ def get_geolocation(request):
     :return: Geolocation data
     :rtype: dict
     """
-    ip_addr = _get_remote_ip_from_request(request)
+    ip_addr = settings.IP_GEOLOCATION_SETTINGS.get('FORCE_IP_ADDR', None)
+    if not ip_addr:
+        ip_addr = _get_remote_ip_from_request(request)
+
     backend_cls = _get_geolocation_backend_cls()
     backend_instance = backend_cls(ip_addr)