adds generate_token method to session, fixes #12

Author: aoberoi

opentok/opentok.py

@@ -37,7 +37,7 @@ def __init__(self, api_key, api_secret, api_url='https://api.opentok.com'):
         self.api_secret = api_secret
         self.api_url = api_url
 
-    def generate_token(self, session_id, role=Roles.publisher, expire_time=None, connection_data=None, **kwargs):
+    def generate_token(self, session_id, role=Roles.publisher, expire_time=None, data=None):
         """
         Generate a token which is passed to the JS API to enable widgets to connect to the Opentok api.
         session_id: Specify a session_id to make this token only valid for that session_id.
@@ -69,8 +69,8 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, con
             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 (connection_data is not None) and len(connection_data) > 1000:
-            raise OpenTokException(u('Cannot generate token, connection_data must be less than 1000 characters').format(connection_data))
+        if (data is not None) 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
         sub_session_id = session_id[2:]
@@ -89,7 +89,7 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, con
             create_time     = now,
             expire_time     = expire_time,
             role            = role.value,
-            connection_data = (connection_data or None),
+            connection_data = (data or None),
             nonce           = random.randint(0,999999)
         )
         data_string = urlencode(data_params, True)
@@ -151,7 +151,7 @@ def create_session(self, location=None, p2p=False):
                 raise AuthError('Failed to create session (code=%s): %s' % (error.attributes['code'].value, error.firstChild.attributes['message'].value))
 
             session_id = dom.getElementsByTagName('session_id')[0].childNodes[0].nodeValue
-            return Session(session_id, location=location, p2p=p2p)
+            return Session(self, session_id, location=location, p2p=p2p)
         except Exception as e:
             raise OpenTokException('Failed to generate session: %s' % str(e))
 

opentok/session.py

@@ -1,5 +1,9 @@
 class Session(object):
-    def __init__(self, session_id, **kwargs):
+    def __init__(self, sdk, session_id, **kwargs):
         self.session_id = session_id
+        self.sdk = sdk
         for key, value in kwargs.items():
             setattr(self, key, value)
+
+    def generate_token(self, **kwargs):
+        return self.sdk.generate_token(self.session_id, **kwargs)

tests/test_archive.py

@@ -8,9 +8,9 @@
 import datetime
 import pytz
 
-from opentok import OpenTok, Archive, ArchiveList, __version__
+from opentok import OpenTok, Archive, __version__
 
-class OpenTokArchiveApiTest(unittest.TestCase):
+class OpenTokArchiveTest(unittest.TestCase):
     def setUp(self):
         self.api_key = u('123456')
         self.api_secret = u('1234567890abcdef1234567890abcdef1234567890')

tests/test_session.py

@@ -0,0 +1,28 @@
+import unittest
+from six import text_type, u, b, PY2, PY3
+from nose.tools import raises
+
+from opentok import OpenTok, Session, Roles
+from .helpers import token_decoder, token_signature_validator
+
+class SessionTest(unittest.TestCase):
+    def setUp(self):
+        self.api_key = u('123456')
+        self.api_secret = u('1234567890abcdef1234567890abcdef1234567890')
+        self.session_id = u('1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4')
+        self.opentok = OpenTok(self.api_key, self.api_secret)
+
+    def test_generate_token(self):
+        session = Session(self.opentok, self.session_id, p2p=False, location=None)
+        token = session.generate_token()
+        assert isinstance(token, text_type)
+        assert token_decoder(token)[u('session_id')] == self.session_id
+        assert token_signature_validator(token, self.api_secret)
+
+    def test_generate_role_token(self):
+        session = Session(self.opentok, self.session_id, p2p=False, location=None)
+        token = session.generate_token(role=Roles.moderator)
+        assert isinstance(token, text_type)
+        assert token_decoder(token)[u('session_id')] == self.session_id
+        assert token_decoder(token)[u('role')] == u('moderator')
+        assert token_signature_validator(token, self.api_secret)

tests/test_token_generation.py

@@ -59,7 +59,7 @@ def test_generate_expires_token(self):
 
     def test_generate_data_token(self):
         data = u('name=Johnny')
-        token = self.opentok.generate_token(self.session_id, connection_data=data)
+        token = self.opentok.generate_token(self.session_id, data=data)
         assert isinstance(token, text_type)
         assert token_decoder(token)[u('connection_data')] == data
         assert token_signature_validator(token, self.api_secret)