_default_jwt_payload_handler: Check for attribute 'id'

CHANGES

@@ -3,6 +3,13 @@ Flask-JWT Changelog
 
 Here you can see the full list of changes between each Flask-JWT release.
 
+Version 0.3.3
+-------------
+
+Released March 7th 2018 (by AbdealiJK)
+
+- Fixed an error when finding attribute 'id'
+
 Version 0.3.2
 -------------
 

docs/conf.py

@@ -46,7 +46,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.2'
+version = '0.3.3'
 # The full version, including alpha/beta/rc tags.
 release = version
 

flask_jwt/__init__.py

@@ -18,7 +18,7 @@
 from flask import current_app, request, jsonify, _request_ctx_stack
 from werkzeug.local import LocalProxy
 
-__version__ = '0.3.2'
+__version__ = '0.3.3'
 
 logger = logging.getLogger(__name__)
 
@@ -50,7 +50,10 @@ def _default_jwt_payload_handler(identity):
     iat = datetime.utcnow()
     exp = iat + current_app.config.get('JWT_EXPIRATION_DELTA')
     nbf = iat + current_app.config.get('JWT_NOT_BEFORE_DELTA')
-    identity = getattr(identity, 'id') or identity['id']
+    if hasattr(identity, 'id'):
+        identity = getattr(identity, 'id')
+    else:
+        identity = identity['id']
     return {'exp': exp, 'iat': iat, 'nbf': nbf, 'identity': identity}
 
 

setup.py

@@ -54,7 +54,7 @@ def run_tests(self):
 
 setup(
     name='Flask-JWT',
-    version='0.3.2',
+    version='0.3.3',
     url='https://github.com/mattupstate/flask-jwt',
     license='MIT',
     author='Matt Wright',