浏览代码

chore: Update PyJWT dependency

* Update pinned dep fromm 1.7.1 to 2.0.1
* Updated usages as per changelog

ref: https://python.libhunt.com/pyjwt-changelog
version-14
Gavin D'souza 4 年前
父节点
当前提交
165ff8e1bf
共有 4 个文件被更改,包括 5 次插入4 次删除
  1. +2
    -1
      frappe/oauth.py
  2. +1
    -1
      frappe/tests/test_oauth20.py
  3. +1
    -1
      frappe/utils/oauth.py
  4. +1
    -1
      requirements.txt

+ 2
- 1
frappe/oauth.py 查看文件

@@ -486,6 +486,7 @@ class OAuthWebRequestValidator(RequestValidator):
user = None user = None
payload = jwt.decode( payload = jwt.decode(
id_token_hint, id_token_hint,
algorithms=["HS256"],
options={ options={
"verify_signature": False, "verify_signature": False,
"verify_aud": False, "verify_aud": False,
@@ -508,7 +509,7 @@ class OAuthWebRequestValidator(RequestValidator):
id_token_hint, id_token_hint,
key=client_secret, key=client_secret,
audience=client_id, audience=client_id,
algorithm="HS256",
algorithms=["HS256"],
options={ options={
"verify_exp": False, "verify_exp": False,
}, },


+ 1
- 1
frappe/tests/test_oauth20.py 查看文件

@@ -302,7 +302,7 @@ class TestOAuth20(unittest.TestCase):
id_token, id_token,
audience=client.client_id, audience=client.client_id,
key=client.client_secret, key=client.client_secret,
algorithm="HS256",
algorithms=["HS256"],
) )


self.assertTrue(payload.get("nonce") == nonce) self.assertTrue(payload.get("nonce") == nonce)


+ 1
- 1
frappe/utils/oauth.py 查看文件

@@ -134,7 +134,7 @@ def get_info_via_oauth(provider, code, decoder=None, id_token=False):


token = parsed_access['id_token'] token = parsed_access['id_token']


info = jwt.decode(token, flow.client_secret, verify=False)
info = jwt.decode(token, flow.client_secret, options={"verify_signature": False})
else: else:
api_endpoint = oauth2_providers[provider].get("api_endpoint") api_endpoint = oauth2_providers[provider].get("api_endpoint")
api_endpoint_args = oauth2_providers[provider].get("api_endpoint_args") api_endpoint_args = oauth2_providers[provider].get("api_endpoint_args")


+ 1
- 1
requirements.txt 查看文件

@@ -43,7 +43,7 @@ psutil~=5.8.0
psycopg2-binary~=2.8.6 psycopg2-binary~=2.8.6
pyasn1~=0.4.8 pyasn1~=0.4.8
pycryptodome~=3.10.1 pycryptodome~=3.10.1
PyJWT~=1.7.1
PyJWT~=2.0.1
PyMySQL~=1.0.2 PyMySQL~=1.0.2
pyngrok~=5.0.5 pyngrok~=5.0.5
pyOpenSSL~=20.0.1 pyOpenSSL~=20.0.1


正在加载...
取消
保存