Merge pull request #357 from supertokens/fix/remove-cryptography-constraints

rishabhpoddar · web-flow · commit 45dba0555c59 · 2023-06-21T14:37:28.000+05:30
fix: Remove constraints on cryptography lib dependency
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.14.5] - 2023-06-21
+
+### Changes and fixes
+
+- Remove constraints on `cryptograpy` dependency version and let `pyjwt` library handle it
+
 ## [0.14.4] - 2023-06-14
 
 ### Changes and fixes
diff --git a/setup.py b/setup.py
@@ -70,7 +70,7 @@
 
 setup(
     name="supertokens_python",
-    version="0.14.4",
+    version="0.14.5",
     author="SuperTokens",
     license="Apache 2.0",
     author_email="team@supertokens.com",
@@ -99,14 +99,15 @@
     ],
     keywords="",
     install_requires=[
-        "PyJWT>=2.6.0 ,<3.0.0",
+        # [crypto] ensures that it installs the `cryptography` library as well
+        # based on constraints specified in https://github.com/jpadilla/pyjwt/blob/master/setup.cfg#L50
+        "PyJWT[crypto]>=2.6.0 ,<3.0.0",
         "httpx>=0.15.0 ,<0.24.0",
         "pycryptodome==3.10.*",
         "tldextract==3.1.0",
         "asgiref>=3.4.1,<4",
         "typing_extensions>=4.1.1,<5.0.0",
         "Deprecated==1.2.13",
-        "cryptography>=35.0,<37.0",
         "phonenumbers==8.12.48",
         "twilio==7.9.1",
         "aiosmtplib==1.1.6",
diff --git a/supertokens_python/constants.py b/supertokens_python/constants.py
@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 SUPPORTED_CDI_VERSIONS = ["2.21"]
-VERSION = "0.14.4"
+VERSION = "0.14.5"
 TELEMETRY = "/telemetry"
 USER_COUNT = "/users/count"
 USER_DELETE = "/user/remove"
diff --git a/supertokens_python/recipe/thirdparty/providers/apple.py b/supertokens_python/recipe/thirdparty/providers/apple.py
@@ -16,11 +16,13 @@
 from re import sub
 from time import time
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Union
-
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
 from httpx import AsyncClient
 from jwt import decode, encode
+
+# You must have cryptography library installed for these imports to work:
 from jwt.algorithms import RSAAlgorithm
+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
+
 from supertokens_python.recipe.thirdparty.api.implementation import (
     get_actual_client_id_from_development_client_id,
 )
diff --git a/tests/thirdparty/test_thirdparty.py b/tests/thirdparty/test_thirdparty.py
@@ -1,3 +1,6 @@
+import respx
+import httpx
+
 from pytest import fixture, mark
 from fastapi import FastAPI
 from supertokens_python.framework.fastapi import get_middleware
@@ -21,6 +24,8 @@
 
 pytestmark = mark.asyncio
 
+respx_mock = respx.MockRouter
+
 
 @fixture(scope="function")
 async def fastapi_client():
@@ -64,3 +69,56 @@ async def test_thirdpary_parsing_works(fastapi_client: TestClient):
         res.content
         == b'<html><head><script>window.location.replace("http://supertokens.io/auth/callback/apple?state=afc596274293e1587315c&code=c7685e261f98e4b3b94e34b3a69ff9cf4.0.rvxt.eE8rO__6hGoqaX1B7ODPmA");</script></head></html>'
     )
+
+
+async def test_apple_provider_can_fetch_keys():
+    from supertokens_python.recipe.thirdparty.providers.apple import Apple
+    from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
+
+    def api_side_effect(_: httpx.Request):
+        return httpx.Response(
+            200,
+            json={
+                "keys": [
+                    {
+                        "kty": "RSA",
+                        "kid": "W6WcOKB",
+                        "use": "sig",
+                        "alg": "RS256",
+                        "n": "2Zc5d0-zkZ5AKmtYTvxHc3vRc41YfbklflxG9SWsg5qXUxvfgpktGAcxXLFAd9Uglzow9ezvmTGce5d3DhAYKwHAEPT9hbaMDj7DfmEwuNO8UahfnBkBXsCoUaL3QITF5_DAPsZroTqs7tkQQZ7qPkQXCSu2aosgOJmaoKQgwcOdjD0D49ne2B_dkxBcNCcJT9pTSWJ8NfGycjWAQsvC8CGstH8oKwhC5raDcc2IGXMOQC7Qr75d6J5Q24CePHj_JD7zjbwYy9KNH8wyr829eO_G4OEUW50FAN6HKtvjhJIguMl_1BLZ93z2KJyxExiNTZBUBQbbgCNBfzTv7JrxMw",
+                        "e": "AQAB",
+                    },
+                    {
+                        "kty": "RSA",
+                        "kid": "fh6Bs8C",
+                        "use": "sig",
+                        "alg": "RS256",
+                        "n": "u704gotMSZc6CSSVNCZ1d0S9dZKwO2BVzfdTKYz8wSNm7R_KIufOQf3ru7Pph1FjW6gQ8zgvhnv4IebkGWsZJlodduTC7c0sRb5PZpEyM6PtO8FPHowaracJJsK1f6_rSLstLdWbSDXeSq7vBvDu3Q31RaoV_0YlEzQwPsbCvD45oVy5Vo5oBePUm4cqi6T3cZ-10gr9QJCVwvx7KiQsttp0kUkHM94PlxbG_HAWlEZjvAlxfEDc-_xZQwC6fVjfazs3j1b2DZWsGmBRdx1snO75nM7hpyRRQB4jVejW9TuZDtPtsNadXTr9I5NjxPdIYMORj9XKEh44Z73yfv0gtw",
+                        "e": "AQAB",
+                    },
+                    {
+                        "kty": "RSA",
+                        "kid": "YuyXoY",
+                        "use": "sig",
+                        "alg": "RS256",
+                        "n": "1JiU4l3YCeT4o0gVmxGTEK1IXR-Ghdg5Bzka12tzmtdCxU00ChH66aV-4HRBjF1t95IsaeHeDFRgmF0lJbTDTqa6_VZo2hc0zTiUAsGLacN6slePvDcR1IMucQGtPP5tGhIbU-HKabsKOFdD4VQ5PCXifjpN9R-1qOR571BxCAl4u1kUUIePAAJcBcqGRFSI_I1j_jbN3gflK_8ZNmgnPrXA0kZXzj1I7ZHgekGbZoxmDrzYm2zmja1MsE5A_JX7itBYnlR41LOtvLRCNtw7K3EFlbfB6hkPL-Swk5XNGbWZdTROmaTNzJhV-lWT0gGm6V1qWAK2qOZoIDa_3Ud0Gw",
+                        "e": "AQAB",
+                    },
+                ]
+            },
+        )
+
+    with respx_mock(assert_all_mocked=False) as mocker:
+        mocked_route = mocker.get("https://appleid.apple.com/auth/keys").mock(
+            side_effect=api_side_effect
+        )
+
+        apple = Apple(
+            "client-id", "client-key-id", "client-private-key", "client-team-id"
+        )
+        # pylint: disable=protected-access
+        keys = await apple._fetch_apple_public_keys()  # type: ignore
+
+        assert mocked_route.call_count == 1
+        assert len(keys) == 3
+        assert isinstance(keys[0], RSAPublicKey)
