Merge pull request #106 from maikthomas/master

Fix empty connection data parameter

Author: maikthomas

opentok/opentok.py

@@ -130,7 +130,7 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, dat
             raise OpenTokException(u('Cannot generate token, expire_time is not in the future {0}').format(expire_time))
         if expire_time > now + (60*60*24*30):  # 30 days
             raise OpenTokException(u('Cannot generate token, expire_time is not in the next 30 days {0}').format(expire_time))
-        if (data is not None) and len(data) > 1000:
+        if data and len(data) > 1000:
             raise OpenTokException(u('Cannot generate token, data must be less than 1000 characters').format(data))
 
         # decode session id to verify api_key
@@ -150,9 +150,10 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, dat
             create_time     = now,
             expire_time     = expire_time,
             role            = role.value,
-            connection_data = (data or None),
             nonce           = random.randint(0,999999)
         )
+        if data:
+            data_params['connection_data'] = data
         data_string = urlencode(data_params, True)
 
         sig = self._sign_string(data_string, self.api_secret)

tests/test_token_generation.py

@@ -64,6 +64,12 @@ def test_generate_data_token(self):
         assert token_decoder(token)[u('connection_data')] == data
         assert token_signature_validator(token, self.api_secret)
 
+    def test_generate_no_data_token(self):
+        token = self.opentok.generate_token(self.session_id)
+        assert isinstance(token, text_type)
+        assert u('connection_data') not in token_decoder(token)
+        assert token_signature_validator(token, self.api_secret)
+
     @raises(TypeError)
     def test_does_not_generate_token_without_params(self):
         token = self.opentok.generate_token()