Merge pull request #20 from pusher/token-json

Return token as dictionary

Author: jonathanlloyd

pusher_push_notifications/__init__.py

@@ -349,7 +349,7 @@ def generate_token(self, user_id):
             user_id (string): user id for which the token will be valid
 
         Returns:
-            auth token for the requested user id (string)
+            Beams token wrapped in dictionary for json serialization (dict)
 
         Raises:
             TypeError: if user_id is not a string
@@ -367,7 +367,7 @@ def generate_token(self, user_id):
         expiry_datetime = now + AUTH_TOKEN_DURATION
         expiry_timestamp = int(time.mktime(expiry_datetime.timetuple()))
 
-        return jwt.encode(
+        token = jwt.encode(
             {
                 'iss': issuer,
                 'sub': user_id,
@@ -377,6 +377,10 @@ def generate_token(self, user_id):
             algorithm='HS256',
         ).decode('utf-8')
 
+        return {
+            'token': token,
+        }
+
     def delete_user(self, user_id):
         """Remove the user with the given ID (and all of their devices) from
         the Pusher Beams database. The user will no longer receive any

tests/test_users.py

@@ -25,9 +25,12 @@ def test_generate_token_should_return_token(self):
             'SECRET_KEY'
         )
 
-        token_string = pn_client.generate_token(user_id)
+        token_object = pn_client.generate_token(user_id)
+        self.assertIsInstance(token_object, dict)
 
+        token_string = token_object.get('token')
         self.assertIsInstance(token_string, six.string_types)
+
         self.assertTrue(len(token_string) > 0)
 
         decoded_token = jwt.decode(