if using Flask-Login ctx.user exists, get user from there (#65)

* if using Flask-Login ctx.user exists, get user from there

* more flask-login specific case to retrieve the username

* only save user if is logged and not anonymous

Co-authored-by: daniel_shazura <daniel@shazura.com>

Author: Patataman

src/flask_track_usage/__init__.py

@@ -41,6 +41,10 @@
 import six
 
 from flask import _request_ctx_stack, g
+try:
+    from flask_login import current_user
+except Exception:
+    pass
 
 __version__ = '2.0.0'
 __author__ = 'Steve Milner'
@@ -184,6 +188,8 @@ def after_request(self, response):
         }
         if ctx.request.authorization:
             data['username'] = str(ctx.request.authorization.username)
+        elif getattr(self.app, 'login_manager', None) and current_user and not current_user.is_anonymous:
+            data['username'] = str(current_user)
         if self._use_freegeoip:
             clean_ip = quote_plus(str(ctx.request.remote_addr))
             if '{ip}' in self._freegeoip_endpoint:

test/__init__.py

@@ -76,6 +76,7 @@ def setUp(self):
         def index():
             return "Hello!"
 
+
 class FlaskTrackUsageTestCaseGeoIP(unittest.TestCase):
     """
     Master TestCase for unittesting Flask-TrackUsage.

test/test_data.py

@@ -58,16 +58,16 @@ def test_expected_data(self):
         """
         self.client.get('/')
         result = self.storage.get()
-        self.assertEquals(result.__class__, dict)
+        self.assertEqual(result.__class__, dict)
         self.assertIsNone(result['blueprint'])
         self.assertIsNone(result['ip_info'])
-        self.assertEquals(result['status'], 200)
-        self.assertEquals(result['remote_addr'], '127.0.0.1')
-        self.assertEquals(result['speed'].__class__, float)
-        self.assertEquals(result['view_args'], {})
-        self.assertEquals(result['url'], 'http://localhost/')
-        self.assertEquals(result['path'], '/')
-        self.assertEquals(result['authorization'], False)
+        self.assertEqual(result['status'], 200)
+        self.assertEqual(result['remote_addr'], '127.0.0.1')
+        self.assertEqual(result['speed'].__class__, float)
+        self.assertEqual(result['view_args'], {})
+        self.assertEqual(result['url'], 'http://localhost/')
+        self.assertEqual(result['path'], '/')
+        self.assertEqual(result['authorization'], False)
         self.assertTrue(result['user_agent'].string.startswith('werkzeug'))
-        self.assertEquals(type(result['date']), int)
+        self.assertEqual(type(result['date']), int)
         self.assertTrue(datetime.datetime.fromtimestamp(result['date']))