polish

Author: chillaq

splitio/api/auth.py

@@ -7,7 +7,7 @@
 from splitio.api.commons import headers_from_metadata, record_telemetry
 from splitio.util.time import get_current_epoch_time_ms
 from splitio.api.client import HttpClientException
-from splitio.models.token import from_raw
+from splitio.models.token import decode_token
 from splitio.models.telemetry import HTTPExceptionsAndLatencies
 
 _LOGGER = logging.getLogger(__name__)
@@ -50,7 +50,7 @@ def authenticate(self):
             record_telemetry(response.status_code, get_current_epoch_time_ms() - start, HTTPExceptionsAndLatencies.TOKEN, self._telemetry_runtime_producer)
             if 200 <= response.status_code < 300:
                 payload = json.loads(response.body)
-                return from_raw(payload)
+                return decode_token(payload)
             else:
                 if (response.status_code >= 400 and response.status_code < 500):
                     self._telemetry_runtime_producer.record_auth_rejections()

splitio/models/token.py

@@ -59,7 +59,15 @@ def iat(self):
 
 
 def decode_token(raw_token):
-    """Decode token"""
+    """
+    Parse a new token from a raw token response.
+
+    :param raw_token: Token parsed from auth response.
+    :type raw_token: dict
+
+    :return: New token model object
+    :rtype: splitio.models.token.Token
+    """
     if not 'pushEnabled' in raw_token or not 'token' in raw_token:
         return Token(False, None, None, None, None)
     token = raw_token['token']
@@ -71,19 +79,4 @@ def decode_token(raw_token):
 
     to_decode = token_parts[1]
     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):
-    """
-    Parse a new token from a raw token response.
-
-    :param raw_token: Token parsed from auth response.
-    :type raw_token: dict
-
-    :return: New token model object
-    :rtype: splitio.models.token.Token
-    """
-#    push_enabled, token, decoded_token = decode_token(raw_token)
-    return decode_token(raw_token)
+    return Token(push_enabled, token, json.loads(decoded_token['x-ably-capability']), decoded_token['exp'], decoded_token['iat'])

tests/models/test_token.py

@@ -8,9 +8,9 @@ class TokenTests(object):
     """Token model tests."""
     raw_false = {'pushEnabled': False}
 
-    def test_from_raw_false(self):
+    def test_decode_token_false(self):
         """Test token model parsing."""
-        parsed = token.from_raw(self.raw_false)
+        parsed = token.decode_token(self.raw_false)
         assert parsed.push_enabled == False
         assert parsed.iat == None
         assert parsed.channels == None
@@ -22,9 +22,9 @@ def test_from_raw_false(self):
         'token': '',
     }
 
-    def test_from_raw_empty(self):
+    def test_decode_token_empty(self):
         """Test token model parsing."""
-        parsed = token.from_raw(self.raw_empty)
+        parsed = token.decode_token(self.raw_empty)
         assert parsed.push_enabled == False
         assert parsed.iat == None
         assert parsed.channels == None
@@ -36,9 +36,9 @@ def test_from_raw_empty(self):
         'token': 'eyJhbGciOiJIUzI1NiIsImtpZCI6IjVZOU05US45QnJtR0EiLCJ0eXAiOiJKV1QifQ.eyJ4LWFibHktY2FwYWJpbGl0eSI6IntcIk56TTJNREk1TXpjMF9NVGd5TlRnMU1UZ3dOZz09X3NlZ21lbnRzXCI6W1wic3Vic2NyaWJlXCJdLFwiTnpNMk1ESTVNemMwX01UZ3lOVGcxTVRnd05nPT1fc3BsaXRzXCI6W1wic3Vic2NyaWJlXCJdLFwiY29udHJvbF9wcmlcIjpbXCJzdWJzY3JpYmVcIixcImNoYW5uZWwtbWV0YWRhdGE6cHVibGlzaGVyc1wiXSxcImNvbnRyb2xfc2VjXCI6W1wic3Vic2NyaWJlXCIsXCJjaGFubmVsLW1ldGFkYXRhOnB1Ymxpc2hlcnNcIl19IiwieC1hYmx5LWNsaWVudElkIjoiY2xpZW50SWQiLCJleHAiOjE2MDIwODgxMjcsImlhdCI6MTYwMjA4NDUyN30.5_MjWonhs6yoFhw44hNJm3H7_YMjXpSW105DwjjppqE',
     }
 
-    def test_from_raw(self):
+    def test_decode_token(self):
         """Test token model parsing."""
-        parsed = token.from_raw(self.raw_ok)
+        parsed = token.decode_token(self.raw_ok)
         assert isinstance(parsed, token.Token)
         assert parsed.push_enabled == True
         assert parsed.iat == 1602084527