Merge branch 'feat/use-httpx' into feat/support-async

Author: LioriE

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         py:
+          - "3.13"
           - "3.12"
           - "3.11"
           - "3.10"

.gitleaksignore

@@ -0,0 +1,87 @@
+04146e7a83d6212e407c5a46008324d646878fc1:tests/test_auth.py:jwt:257
+1c0c3ca7205fa8fa481b2bc90933d7d1f0400253:tests/test_descope_client.py:jwt:563
+1c0c3ca7205fa8fa481b2bc90933d7d1f0400253:tests/test_descope_client.py:jwt:571
+3ce967512fed2bae5e89dc9ff973e67ff9bc3084:tests/test_password.py:jwt:167
+3ce967512fed2bae5e89dc9ff973e67ff9bc3084:tests/test_password.py:jwt:313
+3ce967512fed2bae5e89dc9ff973e67ff9bc3084:tests/test_password.py:jwt:87
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:122
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:178
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:248
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:249
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:250
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:266
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_descope_client.py:jwt:267
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_magiclink.py:jwt:341
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_magiclink.py:jwt:356
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_otp.py:jwt:246
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_webauthn.py:jwt:127
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_webauthn.py:jwt:220
+602af9d1f4ce24799cfdcb06fc76eaedb39ba31c:tests/test_webauthn.py:jwt:326
+621149e12da145ea6c65ca5a0246ce5f93f9124e:tests/test_magiclink.py:jwt:253
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:606
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:607
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:632
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:648
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:649
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:723
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:724
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:742
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:779
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:780
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:781
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:796
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:797
+66ec16354a25b8d8d22de85ed823c5151fda0940:tests/test_auth.py:jwt:814
+6d4b1f4dbcbef45e4a5bdce952d8bc2bf5a8dd72:tests/test_enchantedlink.py:jwt:246
+6d4b1f4dbcbef45e4a5bdce952d8bc2bf5a8dd72:tests/test_enchantedlink.py:jwt:261
+71ba33c612675bd34fa7830c6b884f1f01efda9b:tests/test_oauth.py:jwt:102
+71ba33c612675bd34fa7830c6b884f1f01efda9b:tests/test_saml.py:jwt:84
+84adfdb469398f4b2263d0e57f8a16389227629d:tests/test_totp.py:jwt:106
+8e5937752bd25ae682e56f9f8e31ee537ea5479d:tests/test_auth.py:jwt:285
+8e5937752bd25ae682e56f9f8e31ee537ea5479d:tests/test_auth.py:jwt:312
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:152
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:153
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:174
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:211
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:212
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:213
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:228
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:229
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:76
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:77
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_descope_client.py:jwt:78
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_exchanger.py:jwt:45
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_magiclink.py:jwt:339
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_magiclink.py:jwt:351
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_otp.py:jwt:245
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_totp.py:jwt:109
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_totp.py:jwt:85
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_webauthn.py:jwt:127
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_webauthn.py:jwt:212
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_webauthn.py:jwt:230
+910e8e7d14b8c53e566a06c55abfb04b5a16cb72:tests/test_webauthn.py:jwt:318
+a753d819979a4864cf4df0226fa9c9a5d06424c9:tests/test_password.py:jwt:399
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:385
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:402
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:403
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:404
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:478
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:479
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:497
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:534
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:535
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:549
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:550
+a76d544894ddac33781df1f9d7e73de4200d177f:tests/test_auth.py:jwt:567
+ad14b0225444f72e8c46527d10acfd19dd6e9352:tests/test_oauth.py:jwt:137
+ad14b0225444f72e8c46527d10acfd19dd6e9352:tests/test_saml.py:jwt:131
+ad14b0225444f72e8c46527d10acfd19dd6e9352:tests/test_totp.py:jwt:87
+ad14b0225444f72e8c46527d10acfd19dd6e9352:tests/test_webauthn.py:jwt:317
+ad14b0225444f72e8c46527d10acfd19dd6e9352:tests/test_webauthn.py:jwt:483
+bc5a7d8928ba27f9eeb2e0e5ddfe925eb5fda5a7:tests/test_sso.py:jwt:128
+e5d19171d5d9e188f1d99369b408388c1032583f:tests/test_descope_client.py:jwt:700
+e7f5ad4253ad82236a5cff5f8c06878bfb190b00:tests/test_descope_client.py:jwt:171
+e7f5ad4253ad82236a5cff5f8c06878bfb190b00:tests/test_descope_client.py:jwt:185
+e7f5ad4253ad82236a5cff5f8c06878bfb190b00:tests/test_descope_client.py:jwt:197
+ece761372c78a9ad8a57da5f6d13431d298a99db:tests/test_auth.py:jwt:562
+f3ec873c83a7067a1226d8b712b756b1b599fb3b:tests/test_descope_client.py:jwt:519

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/pycqa/flake8
-    rev: 7.2.0
+    rev: 7.3.0
     hooks:
       - id: flake8
         additional_dependencies: [Flake8-pyproject]
@@ -52,7 +52,7 @@ repos:
       - id: tox-ini-fmt
         args: ["-p", "type"]
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.26.0
+    rev: v8.27.2
     hooks:
       - id: gitleaks
   - repo: local

.vscode/settings.json

@@ -1,13 +1,11 @@
 {
   "python.testing.pytestEnabled": true,
-  "python.testing.pytestArgs": ["tests"],
+  "python.testing.pytestArgs": [
+    "tests"
+  ],
   "flake8.importStrategy": "fromEnvironment",
   "mypy-type-checker.importStrategy": "fromEnvironment",
   "isort.importStrategy": "fromEnvironment",
   "black-formatter.importStrategy": "fromEnvironment",
-  "workbench.colorCustomizations": {
-    "activityBar.background": "#4D1C3B",
-    "titleBar.activeBackground": "#6B2752",
-    "titleBar.activeForeground": "#FDF8FB"
-  }
-}
+  "workbench.colorCustomizations": { /* do not change please... */}
+}

descope/flask/__init__.py

@@ -4,7 +4,7 @@
 import uuid
 from functools import wraps
 
-from flask import Response, _request_ctx_stack, redirect, request
+from flask import Response, redirect, request, g
 
 from .. import (
     COOKIE_DATA_NAME,
@@ -143,7 +143,7 @@ def decorated(*args, **kwargs):
                     return Response("Access denied", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             if jwt_response.get(COOKIE_DATA_NAME, None):
@@ -181,7 +181,7 @@ def decorated(*args, **kwargs):
                 return Response("Unauthorized", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             set_cookie_on_response(
@@ -194,7 +194,6 @@ def decorated(*args, **kwargs):
                 jwt_response[REFRESH_SESSION_TOKEN_NAME],
                 jwt_response[COOKIE_DATA_NAME],
             )
-
             return response
 
         return decorated
@@ -224,7 +223,7 @@ def decorated(*args, **kwargs):
                 return Response("Unauthorized", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             set_cookie_on_response(
@@ -267,7 +266,7 @@ def decorated(*args, **kwargs):
                 return Response("Unauthorized", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             set_cookie_on_response(
@@ -310,7 +309,7 @@ def decorated(*args, **kwargs):
                 return Response("Unauthorized", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             set_cookie_on_response(
@@ -400,7 +399,7 @@ def decorated(*args, **kwargs):
                 return Response("Unauthorized", 401)
 
             # Save the claims on the context execute the original API
-            _request_ctx_stack.top.claims = jwt_response
+            g.claims = jwt_response
             response = f(*args, **kwargs)
 
             set_cookie_on_response(

descope/management/user.py

@@ -401,6 +401,7 @@ def invite(
         additional_login_ids: Optional[List[str]] = None,
         sso_app_ids: Optional[List[str]] = None,
         template_id: str = "",
+        test: bool = False,
     ) -> dict:
         """
         Create a new user and invite them via an email / text message.
@@ -429,7 +430,7 @@ def invite(
                 role_names,
                 user_tenants,
                 True,
-                False,
+                test,
                 picture,
                 custom_attributes,
                 verified_email,
@@ -601,6 +602,7 @@ def update(
         verified_phone: Optional[bool] = None,
         additional_login_ids: Optional[List[str]] = None,
         sso_app_ids: Optional[List[str]] = None,
+        test: bool = False,
     ) -> dict:
         """
         Update an existing user with the given various fields. IMPORTANT: All parameters are used as overrides
@@ -622,6 +624,7 @@ def update(
         picture (str): Optional url for user picture
         custom_attributes (dict): Optional, set the different custom attributes values of the keys that were previously configured in Descope console app
         sso_app_ids (List[str]): Optional, list of SSO applications IDs to be associated with the user.
+        test (bool, optional): Set to True to update a test user. Defaults to False.
 
         Return value (dict):
         Return dict in the format
@@ -646,7 +649,7 @@ def update(
                 family_name,
                 role_names,
                 user_tenants,
-                False,
+                test,
                 picture,
                 custom_attributes,
                 verified_email,
@@ -750,6 +753,7 @@ def patch(
         verified_email: Optional[bool] = None,
         verified_phone: Optional[bool] = None,
         sso_app_ids: Optional[List[str]] = None,
+        test: bool = False,
     ) -> dict:
         """
         Patches an existing user with the given various fields. Only the given fields will be used to update the user.
@@ -769,6 +773,7 @@ def patch(
         picture (str): Optional url for user picture
         custom_attributes (dict): Optional, set the different custom attributes values of the keys that were previously configured in Descope console app
         sso_app_ids (List[str]): Optional, list of SSO applications IDs to be associated with the user.
+        test (bool, optional): Set to True to update a test user. Defaults to False.
 
         Return value (dict):
         Return dict in the format
@@ -795,6 +800,7 @@ def patch(
                 verified_email,
                 verified_phone,
                 sso_app_ids,
+                test,
             ),
             pswd=self._auth.management_key,
         )

poetry.lock

@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: MIT License",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Typing :: Typed",