Merge branch 'master' into fix/sa_email

uc-cdis · Jun 28, 2021 · 0232562 · 0232562
2 parents 0577576 + 19fd5d0
commit 0232562
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fence/jwt/validate.py b/fence/jwt/validate.py
@@ -105,7 +105,7 @@ def validate_jwt(
     except jwt.InvalidTokenError as e:
         raise JWTError(e)
     attempt_refresh = attempt_refresh and (token_iss != iss)
-    public_key = authutils.token.keys.get_public_key_for_token(
+    public_key = public_key or authutils.token.keys.get_public_key_for_token(
         encoded_token, attempt_refresh=attempt_refresh
     )
     try: