fixes timestamp issues for expire_time

Author: aoberoi

opentok/opentok.py

@@ -102,21 +102,21 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, con
         # after this block it will only be an integer
         if expire_time is not None:
             if isinstance(expire_time, datetime):
-                expire_time = calendar.timegm(expire_time.timetuple())
+                expire_time = calendar.timegm(expire_time.utctimetuple())
             else:
                 try:
                     expire_time = int(expire_time)
                 except (ValueError, TypeError):
                     raise OpenTokException(u('Cannot generate token, invalid expire time {0}').format(expire_time))
         else:
-            expire_time = calendar.timegm(time.gmtime()) + (60*60*24) # 1 day
+            expire_time = int(time.time()) + (60*60*24) # 1 day
 
         # validations
         if not text_type(session_id):
             raise OpenTokException(u('Cannot generate token, session_id was not valid {0}').format(session_id))
         if not isinstance(role, Roles):
             raise OpenTokException(u('Cannot generate token, {0} is not a valid role').format(role))
-        now = calendar.timegm(time.gmtime())
+        now = int(time.time())
         if expire_time < now:
             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

setup.py

@@ -72,7 +72,8 @@ def find_version(*file_paths):
     install_requires=[
         'requests>=1,<2',
         'enum34',
-        'six'
+        'six',
+        'pytz'
     ],
 
     # TODO: these aren't in the sample package, but might again become imp

tests/test_token_generation.py

@@ -1,7 +1,10 @@
 import unittest
-from six import text_type, u
+from six import text_type, u, PY2, PY3
 from nose.tools import raises
 import time
+import datetime
+import calendar
+import pytz
 
 from opentok import OpenTok, Roles, OpenTokException
 
@@ -31,11 +34,28 @@ def test_generate_role_token(self):
         assert token_signature_validator(token, self.api_secret)
 
     def test_generate_expires_token(self):
-        expire_time = time.time()
+        # an integer is a valid argument
+        expire_time = int(time.time()) + 100
         token = self.opentok.generate_token(self.session_id, expire_time=expire_time)
         assert isinstance(token, text_type)
-        assert token_decoder(token)[u('expire_time')] == text_type(int(expire_time))
+        assert token_decoder(token)[u('expire_time')] == text_type(expire_time)
         assert token_signature_validator(token, self.api_secret)
+        # anything that can be coerced into an integer is also valid
+        expire_time = text_type(int(time.time()) + 100)
+        token = self.opentok.generate_token(self.session_id, expire_time=expire_time)
+        assert isinstance(token, text_type)
+        assert token_decoder(token)[u('expire_time')] == expire_time
+        assert token_signature_validator(token, self.api_secret)
+        # a datetime object is also valid
+        if PY2:
+            expire_time = datetime.datetime.fromtimestamp(time.time(), pytz.UTC) + datetime.timedelta(days=1)
+        if PY3:
+            expire_time = datetime.datetime.fromtimestamp(time.time(), datetime.timezone.utc) + datetime.timedelta(days=1)
+        token = self.opentok.generate_token(self.session_id, expire_time=expire_time)
+        assert isinstance(token, text_type)
+        assert token_decoder(token)[u('expire_time')] == text_type(calendar.timegm(expire_time.utctimetuple()))
+        assert token_signature_validator(token, self.api_secret)
+
 
     def test_generate_data_token(self):
         data = u('name=Johnny')