Merge pull request #468 from splitio/push-manager-pr

Push manager pr

Author: chillaq

splitio/models/token.py

@@ -58,25 +58,6 @@ def iat(self):
         return self._iat
 
 
-def decode_token(raw_token):
-    """Decode token"""
-    if not 'pushEnabled' in raw_token or not 'token' in raw_token:
-        return None, None, None
-
-    token = raw_token['token']
-    push_enabled = raw_token['pushEnabled']
-    if not push_enabled or len(token.strip()) == 0:
-        return None, None, None
-
-    token_parts = token.split('.')
-    if len(token_parts) < 2:
-        return 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)
-
-
 def from_raw(raw_token):
     """
     Parse a new token from a raw token response.
@@ -87,5 +68,15 @@ 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 None if push_enabled is None else Token(push_enabled, token, json.loads(decoded_token['x-ably-capability']), decoded_token['exp'], decoded_token['iat'])
+    if not 'pushEnabled' in raw_token or not 'token' in raw_token:
+        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 Token(False, None, None, None, None)
+
+    to_decode = token_parts[1]
+    decoded_token = json.loads(base64.b64decode(to_decode + '='*(-len(to_decode) % 4)))
+    return Token(push_enabled, token, json.loads(decoded_token['x-ably-capability']), decoded_token['exp'], decoded_token['iat'])

splitio/tasks/util/asynctask.py

@@ -94,7 +94,7 @@ def _execution_wrapper(self):
                         _LOGGER.debug("Force execution signal received. Running now")
                         if not _safe_run(self._main):
                             _LOGGER.error("An error occurred when executing the task. "
-                                          "Retrying after perio expires")
+                                          "Retrying after period expires")
                         continue
                 except queue.Empty:
                     # If no message was received, the timeout has expired
@@ -104,7 +104,7 @@ def _execution_wrapper(self):
                 if not _safe_run(self._main):
                     _LOGGER.error(
                         "An error occurred when executing the task. "
-                        "Retrying after perio expires"
+                        "Retrying after period expires"
                     )
         finally:
             self._cleanup()

tests/models/test_token.py

@@ -11,8 +11,12 @@ class TokenTests(object):
     def test_from_raw_false(self):
         """Test token model parsing."""
         parsed = token.from_raw(self.raw_false)
-        assert parsed == None
-    
+        assert parsed.push_enabled == False
+        assert parsed.iat == None
+        assert parsed.channels == None
+        assert parsed.exp == None
+        assert parsed.token == None
+
     raw_empty = {
         'pushEnabled': True,
         'token': '',
@@ -21,7 +25,11 @@ def test_from_raw_false(self):
     def test_from_raw_empty(self):
         """Test token model parsing."""
         parsed = token.from_raw(self.raw_empty)
-        assert parsed == None
+        assert parsed.push_enabled == False
+        assert parsed.iat == None
+        assert parsed.channels == None
+        assert parsed.exp == None
+        assert parsed.token == None
 
     raw_ok = {
         'pushEnabled': True,
@@ -39,4 +47,3 @@ def test_from_raw(self):
         assert parsed.channels['NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits'] == ['subscribe']
         assert parsed.channels['control_pri'] == ['subscribe', 'channel-metadata:publishers']
         assert parsed.channels['control_sec'] == ['subscribe', 'channel-metadata:publishers']
-

tests/push/test_manager.py

@@ -90,6 +90,28 @@ def new_start(*args, **kwargs):  # pylint: disable=unused-argument
         assert feedback_loop.get() == Status.PUSH_RETRYABLE_ERROR
         assert timer_mock.mock_calls == [mocker.call(0, Any())]
 
+    def test_empty_auth_respnse(self, mocker):
+        """Test the initial status is ok and reset() works as expected."""
+        api_mock = mocker.Mock()
+        api_mock.authenticate.return_value = Token(False, None, None, None, None)
+
+        sse_mock = mocker.Mock(spec=SplitSSEClient)
+        sse_constructor_mock = mocker.Mock()
+        sse_constructor_mock.return_value = sse_mock
+        timer_mock = mocker.Mock()
+        mocker.patch('splitio.push.manager.Timer', new=timer_mock)
+        mocker.patch('splitio.push.manager.SplitSSEClient', new=sse_constructor_mock)
+        feedback_loop = Queue()
+        telemetry_storage = InMemoryTelemetryStorage()
+        telemetry_producer = TelemetryStorageProducer(telemetry_storage)
+        telemetry_runtime_producer = telemetry_producer.get_telemetry_runtime_producer()
+        manager = PushManager(api_mock, mocker.Mock(), feedback_loop, mocker.Mock(), telemetry_runtime_producer)
+        manager.start()
+        assert feedback_loop.get() == Status.PUSH_NONRETRYABLE_ERROR
+        assert timer_mock.mock_calls == [mocker.call(0, Any())]
+        assert sse_mock.mock_calls == []
+
+
     def test_push_disabled(self, mocker):
         """Test the initial status is ok and reset() works as expected."""
         api_mock = mocker.Mock()