GetStream · tbarbugli · Oct 10, 2018 · Oct 8, 2018 · Oct 8, 2018 · Oct 8, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,13 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7
 
 matrix:
   fast_finish: true
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 
 cache: pip
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,14 @@
  Change history
 ================
 
+======
+2.12.0
+======
+:release-date: 2018-10-08
+:by: Peter van Kampen
+
+Add user-session-token support
+
 ======
 2.11.0
 ======

diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@
 if sys.version_info < (2, 7, 0):
     install_requires.append('pyOpenSSL<18.0.0')
     install_requires.append('pyjwt>=1.3.0,<1.6.0')
+    install_requires.append('pycparser<2.19')
 else:
     install_requires.append('pyjwt>=1.3.0,<1.7.0')
 

diff --git a/stream/__init__.py b/stream/__init__.py
@@ -5,7 +5,7 @@
 __copyright__ = 'Copyright 2014, Stream.io, Inc'
 __credits__ = ['Thierry Schellenbach, mellowmorning.com, @tschellenbach']
 __license__ = 'BSD-3-Clause'
-__version__ = '2.11.0'
+__version__ = '2.12.0'
 __maintainer__ = 'Thierry Schellenbach'
 __email__ = 'support@getstream.io'
 __status__ = 'Production'

diff --git a/stream/client.py b/stream/client.py
@@ -174,6 +174,17 @@ def _make_signed_request(self, method_name, relative_url, params=None, data=None
                      response.url, headers, data)
         return self._parse_response(response)
 
+    def create_user_session_token(self, user_id, **extra_data):
+        '''Setup the payload for the given user_id with optional
+        extra data (key, value pairs) and encode it using jwt
+        '''
+        payload = {
+            'user_id': user_id,
+        }
+        for k, v in extra_data.items():
+            payload[k] = v
+        return jwt.encode(payload, self.api_secret, algorithm='HS256').decode("utf-8")
+
     def create_jwt_token(self, resource, action, feed_id=None, user_id=None):
         '''
         Setup the payload for the given resource, action, feed or user

diff --git a/stream/tests/test_client.py b/stream/tests/test_client.py
@@ -372,6 +372,16 @@ def test_token_retrieval(self):
         self.user1.token
         self.user1.get_readonly_token()
 
+    def test_user_session_token(self):
+        client = stream.connect(self.c.api_key, self.c.api_secret)
+        token = client.create_user_session_token("user")
+        payload = jwt.decode(token, self.c.api_secret)
+        self.assertEqual(payload["user_id"], "user")
+        token = client.create_user_session_token("user", client="python", testing=True)
+        payload = jwt.decode(token, self.c.api_secret)
+        self.assertEqual(payload["client"], "python")
+        self.assertEqual(payload["testing"], True)
+
     def test_add_activity(self):
         feed = getfeed("user", "py1")
         activity_data = {"actor": 1, "verb": "tweet", "object": 1}