conform str to user id

Author: AlbertSnows

fence/jwt/token.py

@@ -179,7 +179,7 @@ def generate_signed_session_token(kid, private_key, expires_in, context=None):
     claims = {
         "pur": "session",
         "aud": ["fence", issuer],
-        "sub": context.get("user_id", ""),
+        "sub": str(context.get("user_id", "")),
         "iss": issuer,
         "iat": iat,
         "exp": exp,

tests/link/test_link.py

@@ -139,7 +139,7 @@ def test_google_link_session(app, client, encoded_creds_jwt):
     )
 
     assert flask.session.get("google_link") is True
-    assert flask.session.get("user_id") == user_id
+    assert flask.session.get("user_id") == str(user_id)
     assert flask.session.get("google_proxy_group_id") == proxy_group_id
     assert flask.session.get("redirect") == redirect
 

tests/utils/__init__.py

@@ -287,7 +287,7 @@ def unauthorized_context_claims(user_name, user_id):
     iat, exp = iat_and_exp()
     return {
         "aud": [iss],
-        "sub": user_id,
+        "sub": str(user_id),
         "pur": "access",
         "iss": iss,
         "iat": iat,
@@ -320,7 +320,7 @@ def authorized_download_context_claims(user_name, user_id):
     iat, exp = iat_and_exp()
     return {
         "aud": [iss],
-        "sub": user_id,
+        "sub": str(user_id),
         "iss": iss,
         "iat": iat,
         "exp": exp,
@@ -353,7 +353,7 @@ def authorized_service_account_management_claims(user_name, user_id, client_id):
     iat, exp = iat_and_exp()
     return {
         "aud": [iss],
-        "sub": user_id,
+        "sub": str(user_id),
         "iss": iss,
         "iat": iat,
         "exp": exp,
@@ -403,7 +403,7 @@ def authorized_download_credentials_context_claims(
     iat, exp = iat_and_exp()
     return {
         "aud": [iss],
-        "sub": user_id,
+        "sub": str(user_id),
         "iss": iss,
         "iat": iat,
         "exp": exp,
@@ -436,7 +436,7 @@ def authorized_upload_context_claims(user_name, user_id):
     iat, exp = iat_and_exp()
     return {
         "aud": [iss],
-        "sub": user_id,
+        "sub": str(user_id),
         "iss": iss,
         "pur": "access",
         "iat": iat,