Trying to fix python version compatibility

Author: itaihanski

descope/auth.py

@@ -6,20 +6,18 @@
 import re
 from http import HTTPStatus
 from threading import Lock
-from typing import Iterable
+from typing import Iterable, Optional
 
 import jwt
 from email_validator import EmailNotValidError, validate_email
 from jwt import ExpiredSignatureError, ImmatureSignatureError
 
 from descope.common import (
-    COOKIE_DATA_NAME,
     DEFAULT_BASE_URL,
     DEFAULT_DOMAIN,
     DEFAULT_URL_PREFIX,
     PHONE_REGEX,
     REFRESH_SESSION_COOKIE_NAME,
-    REFRESH_SESSION_TOKEN_NAME,
     SESSION_TOKEN_NAME,
     AccessKeyLoginOptions,
     DeliveryMethod,
@@ -47,8 +45,8 @@ class Auth:
 
     def __init__(
         self,
-        project_id: str | None = None,
-        public_key: dict | str | None = None,
+        project_id: Optional[str] = None,
+        public_key: Optional[dict | str] = None,
         jwt_validation_leeway: int = 5,
         *,
         http_client: HTTPClient,
@@ -114,7 +112,7 @@ def http_client(self) -> HTTPClient:
         return self._http
 
     def exchange_token(
-        self, uri, code: str, audience: str | None | Iterable[str] = None
+        self, uri, code: str, audience: Optional[Iterable[str] | str] = None
     ) -> dict:
         if not code:
             raise AuthException(

descope/descope_client.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import os
-from typing import Iterable
+from typing import Iterable, Optional
 
 import requests
 
@@ -27,10 +27,10 @@ class DescopeClient:
     def __init__(
         self,
         project_id: str,
-        public_key: dict | None = None,
+        public_key: Optional[dict] = None,
         skip_verify: bool = False,
-        management_key: str | None = None,
-        auth_management_key: str | None = None,
+        management_key: Optional[str] = None,
+        auth_management_key: Optional[str] = None,
         timeout_seconds: float = DEFAULT_TIMEOUT_SECONDS,
         jwt_validation_leeway: int = 5,
     ):
@@ -310,7 +310,7 @@ def get_matched_tenant_roles(
         return matched
 
     def validate_session(
-        self, session_token: str, audience: str | Iterable[str] | None = None
+        self, session_token: str, audience: Optional[Iterable[str] | str] = None
     ) -> dict:
         """
         Validate a session token. Call this function for every incoming request to your
@@ -333,7 +333,7 @@ def validate_session(
         return self._auth.validate_session(session_token, audience)
 
     def refresh_session(
-        self, refresh_token: str, audience: str | Iterable[str] | None = None
+        self, refresh_token: str, audience: Optional[Iterable[str] | str] = None
     ) -> dict:
         """
         Refresh a session. Call this function when a session expires and needs to be refreshed.
@@ -354,7 +354,7 @@ def validate_and_refresh_session(
         self,
         session_token: str,
         refresh_token: str,
-        audience: str | Iterable[str] | None = None,
+        audience: Optional[Iterable[str] | str] = None,
     ) -> dict:
         """
         Validate the session token and refresh it if it has expired, the session token will automatically be refreshed.
@@ -454,7 +454,7 @@ def my_tenants(
         self,
         refresh_token: str,
         dct: bool = False,
-        ids: list[str] | None = None,
+        ids: Optional[list[str]] = None,
     ) -> dict:
         """
         Retrieve tenant attributes that user belongs to, one of dct/ids must be populated .
@@ -535,8 +535,8 @@ def history(self, refresh_token: str) -> list[dict]:
     def exchange_access_key(
         self,
         access_key: str,
-        audience: str | Iterable[str] | None = None,
-        login_options: AccessKeyLoginOptions | None = None,
+        audience: Optional[Iterable[str] | str] = None,
+        login_options: Optional[AccessKeyLoginOptions] = None,
     ) -> dict:
         """
         Return a new session token for the given access key

descope/http_client.py

@@ -3,6 +3,7 @@
 import os
 import platform
 from http import HTTPStatus
+from typing import Optional, Union
 
 try:
     from importlib.metadata import version
@@ -45,11 +46,11 @@ class HTTPClient:
     def __init__(
         self,
         project_id: str,
-        base_url: str | None = None,
+        base_url: Optional[str] = None,
         *,
         timeout_seconds: float = DEFAULT_TIMEOUT_SECONDS,
         secure: bool = True,
-        management_key: str | None = None,
+        management_key: Optional[str] = None,
     ) -> None:
         if not project_id:
             raise AuthException(
@@ -73,8 +74,8 @@ def get(
         uri: str,
         *,
         params=None,
-        allow_redirects: bool | None = None,
-        pswd: str | None = None,
+        allow_redirects: Optional[bool] = None,
+        pswd: Optional[str] = None,
     ) -> requests.Response:
         response = requests.get(
             f"{self.base_url}{uri}",
@@ -91,9 +92,9 @@ def post(
         self,
         uri: str,
         *,
-        body: dict | list[dict] | list[str] | None = None,
+        body: Optional[Union[dict, list[dict], list[str]]] = None,
         params=None,
-        pswd: str | None = None,
+        pswd: Optional[str] = None,
     ) -> requests.Response:
         response = requests.post(
             f"{self.base_url}{uri}",
@@ -111,9 +112,9 @@ def patch(
         self,
         uri: str,
         *,
-        body: dict | list[dict] | list[str] | None,
+        body: Optional[Union[dict, list[dict], list[str]]],
         params=None,
-        pswd: str | None = None,
+        pswd: Optional[str] = None,
     ) -> requests.Response:
         response = requests.patch(
             f"{self.base_url}{uri}",
@@ -132,7 +133,7 @@ def delete(
         uri: str,
         *,
         params=None,
-        pswd: str | None = None,
+        pswd: Optional[str] = None,
     ) -> requests.Response:
         response = requests.delete(
             f"{self.base_url}{uri}",
@@ -145,7 +146,7 @@ def delete(
         self._raise_from_response(response)
         return response
 
-    def get_default_headers(self, pswd: str | None = None) -> dict:
+    def get_default_headers(self, pswd: Optional[str] = None) -> dict:
         return self._get_default_headers(pswd)
 
     # ------------- helpers -------------
@@ -197,7 +198,7 @@ def _raise_from_response(self, response):
             response.text,
         )
 
-    def _get_default_headers(self, pswd: str | None = None):
+    def _get_default_headers(self, pswd: Optional[str] = None):
         headers = _default_headers.copy()
         headers["x-descope-project-id"] = self.project_id
         bearer = self.project_id

descope/management/audit.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime
 from typing import Any, List, Optional
 

descope/management/authz.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime, timezone
 from typing import Any, List, Optional
 

descope/management/outbound_application.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, List, Optional
 
 from descope._http_base import HTTPBase
@@ -19,7 +21,7 @@ class _OutboundApplicationTokenFetcher:
     def fetch_token_by_scopes(
         *,
         http: HTTPClient,
-        token: str | None = None,
+        token: Optional[str] = None,
         app_id: str,
         user_id: str,
         scopes: List[str],
@@ -45,7 +47,7 @@ def fetch_token_by_scopes(
     def fetch_token(
         *,
         http: HTTPClient,
-        token: str | None = None,
+        token: Optional[str] = None,
         app_id: str,
         user_id: str,
         tenant_id: Optional[str] = None,
@@ -69,7 +71,7 @@ def fetch_token(
     def fetch_tenant_token_by_scopes(
         *,
         http: HTTPClient,
-        token: str | None = None,
+        token: Optional[str] = None,
         app_id: str,
         tenant_id: str,
         scopes: List[str],
@@ -93,7 +95,7 @@ def fetch_tenant_token_by_scopes(
     def fetch_tenant_token(
         *,
         http: HTTPClient,
-        token: str | None = None,
+        token: Optional[str] = None,
         app_id: str,
         tenant_id: str,
         options: Optional[dict] = None,

descope/management/project.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import List, Optional
 
 from descope._http_base import HTTPBase

descope/management/role.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import List, Optional
 
 from descope._http_base import HTTPBase

descope/management/sso_application.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, List, Optional
 
 from descope._http_base import HTTPBase

tests/common.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import platform
 import unittest
@@ -47,7 +49,7 @@ def setUp(self) -> None:
         )
 
     # Test helper to build a default HTTP client
-    def make_http_client(self, management_key: str | None = None):
+    def make_http_client(self, management_key: "str | None" = None):
         from descope.http_client import HTTPClient
 
         return HTTPClient(