Updated to account for new default in ujson - ultrajson/ultrajson#266

willnx · Jun 3, 2020 · 11848c5 · 11848c5
1 parent b1b7436
commit 11848c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/test_generate_token.py b/tests/test_generate_token.py
@@ -29,12 +29,12 @@ def test_basic_usage(self):
         self.assertTrue(token is not None)
 
     def test_return_type(self):
-        """Return type for generate_token function is Bytes"""
+        """Return type for generate_token function is String"""
         token = generate_token.generate_token(username=self.username,
                                               version=self.version,
                                               memberOf=self.memberOf,
                                               issued_at_timestamp=time.time())
-        self.assertTrue(isinstance(token, bytes))
+        self.assertTrue(isinstance(token, str))
 
     def test_token_content_keys(self):
         """The JSON Web Token contains all expected data"""
@@ -72,13 +72,13 @@ def test_basic_usage(self):
         self.assertTrue(token is not None)
 
     def test_return_type(self):
-        """Return type for generate_v2_token function is Bytes"""
+        """Return type for generate_v2_token function is String"""
         token = generate_token.generate_v2_token(username=self.username,
                                                  version=self.version,
                                                  client_ip='127.0.0.1',
                                                  issued_at_timestamp=time.time())
 
-        self.assertTrue(isinstance(token, bytes))
+        self.assertTrue(isinstance(token, str))
 
     def test_token_content_keys(self):
         """The JSON Web Token contains all expected data"""

diff --git a/vlab_auth_service/lib/generate_token.py b/vlab_auth_service/lib/generate_token.py
@@ -28,7 +28,7 @@ def generate_token(username, version, memberOf, issued_at_timestamp):
               'version' : version,
               'memberOf' : memberOf,
              }
-    return jwt.encode(claims, const.AUTH_TOKEN_SECRET, algorithm=const.AUTH_TOKEN_ALGORITHM)
+    return jwt.encode(claims, const.AUTH_TOKEN_SECRET, algorithm=const.AUTH_TOKEN_ALGORITHM).decode()
 
 
 def generate_v2_token(username, version, client_ip, issued_at_timestamp):
@@ -52,4 +52,4 @@ def generate_v2_token(username, version, client_ip, issued_at_timestamp):
               'version' : version,
               'client_ip' : client_ip,
              }
-    return jwt.encode(claims, const.AUTH_TOKEN_SECRET, algorithm=const.AUTH_TOKEN_ALGORITHM)
+    return jwt.encode(claims, const.AUTH_TOKEN_SECRET, algorithm=const.AUTH_TOKEN_ALGORITHM).decode()