polishing

Author: chillaq

splitio/models/token.py

@@ -61,17 +61,18 @@ def iat(self):
 def decode_token(raw_token):
     """Decode token"""
     if not 'pushEnabled' in raw_token or not 'token' in raw_token:
-        return False, None, None
+        return Token(False, None, None, None, None)
     token = raw_token['token']
     push_enabled = raw_token['pushEnabled']
     token_parts = token.strip().split('.')
 
     if not push_enabled or len(token_parts) < 2:
-        return False, None, None
+        return Token(False, None, None, None, None)
 
     to_decode = token_parts[1]
-    decoded_payload = base64.b64decode(to_decode + '='*(-len(to_decode) % 4))
-    return push_enabled, token, json.loads(decoded_payload)
+    decoded_token = json.loads(base64.b64decode(to_decode + '='*(-len(to_decode) % 4)))
+#    return push_enabled, token, json.loads(decoded_payload)
+    return Token(push_enabled, token, json.loads(decoded_token['x-ably-capability']), decoded_token['exp'], decoded_token['iat'])
 
 
 def from_raw(raw_token):
@@ -84,5 +85,5 @@ def from_raw(raw_token):
     :return: New token model object
     :rtype: splitio.models.token.Token
     """
-    push_enabled, token, decoded_token = decode_token(raw_token)
-    return Token(push_enabled, None, None, None, None) if not push_enabled else Token(push_enabled, token, json.loads(decoded_token['x-ably-capability']), decoded_token['exp'], decoded_token['iat'])
+#    push_enabled, token, decoded_token = decode_token(raw_token)
+    return decode_token(raw_token)