Merge branch 'master' into verb-to-nout-format

Author: superdiana

opentok/opentok.py

@@ -99,6 +99,8 @@ def __init__(
         self._proxies = None
         self.endpoints = Endpoints(api_url, self.api_key)
         self._app_version = __version__ if app_version == None else app_version
+        # JWT custom claims - Default values
+        self._jwt_livetime = 3  # In minutes
 
     @property
     def proxies(self):
@@ -116,6 +118,14 @@ def app_version(self):
     def app_version(self, value):
         self._app_version = value
 
+    @property
+    def jwt_livetime(self):
+        return self._jwt_livetime
+
+    @jwt_livetime.setter
+    def jwt_livetime(self, minutes):
+        self._jwt_livetime = minutes
+
     def generate_token(
         self,
         session_id,
@@ -1147,7 +1157,8 @@ def _create_jwt_auth_header(self):
             "ist": "project",
             "iss": self.api_key,
             "iat": int(time.time()),  # current time in unix time (seconds)
-            "exp": int(time.time()) + (60 * 3),  # 3 minutes in the future (seconds)
+            "exp": int(time.time())
+            + (60 * self._jwt_livetime),  # 3 minutes in the future (seconds)
             "jti": "{0}".format(0, random.random()),
         }
 

tests/test_custom_jwt_claims.py

@@ -0,0 +1,30 @@
+import unittest
+from six import text_type, u, b, PY2, PY3
+from nose.tools import raises
+from expects import *
+
+from opentok import OpenTok, __version__
+import time
+from jose import jwt
+
+
+class JwtCustomClaimsTest(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_livetime_custom_claim(self):
+        self.opentok.jwt_livetime = 5  # Token will expire 5 minutes in the future
+        jwt_token = self.opentok._create_jwt_auth_header()
+        claims = jwt.decode(jwt_token, self.api_secret, algorithms=[u("HS256")])
+        expect(claims).to(have_key(u("exp")))
+        expect(int(claims[u("exp")])).to(
+            be_above(int(time.time()) + (60 * 4))
+        )  # above of 4 min
+        expect(int(claims[u("exp")])).to(
+            be_below(int(time.time()) + (60 * 6))
+        )  # below of 6 min

tests/test_getter_setter.py

@@ -4,6 +4,7 @@
 from expects import *
 
 from opentok import OpenTok, __version__
+import time
 
 
 class GetterSetterTest(unittest.TestCase):
@@ -14,3 +15,8 @@ def setUp(self):
             "1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4"
         )
         self.opentok = OpenTok(self.api_key, self.api_secret)
+
+    def test_getset_jwt_livetime(self):
+        livetime = self.opentok.jwt_livetime
+        self.opentok.jwt_livetime = 5
+        assert self.opentok.jwt_livetime is not livetime