Drop Python 3.8 support

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.8, 3.9, '3.10', '3.11', '3.12']
+        python_version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v3
@@ -43,7 +43,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.9'
     - name: Install dependencies
       shell: bash
       run: |

.github/workflows/documentation.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.9'
     - name: Install dependencies
       run: |
           python -m pip install --upgrade pip

httpx_oauth/clients/discord.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Optional, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2
@@ -19,7 +19,7 @@
 """
 
 
-class DiscordOAuth2(BaseOAuth2[Dict[str, Any]]):
+class DiscordOAuth2(BaseOAuth2[dict[str, Any]]):
     """OAuth2 client for Discord."""
 
     display_name = "Discord"
@@ -29,7 +29,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "discord",
     ):
         """
@@ -52,7 +52,7 @@ def __init__(
             revocation_endpoint_auth_method="client_secret_basic",
         )
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.get(
                 PROFILE_ENDPOINT,
@@ -62,7 +62,7 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data = cast(Dict[str, Any], response.json())
+            data = cast(dict[str, Any], response.json())
 
             user_id = data["id"]
             user_email = data.get("email")

httpx_oauth/clients/facebook.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Optional, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2, OAuth2RequestError, OAuth2Token
@@ -23,7 +23,7 @@
 class GetLongLivedAccessTokenError(OAuth2RequestError): ...
 
 
-class FacebookOAuth2(BaseOAuth2[Dict[str, Any]]):
+class FacebookOAuth2(BaseOAuth2[dict[str, Any]]):
     """OAuth2 client for Facebook."""
 
     display_name = "Facebook"
@@ -33,7 +33,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "facebook",
     ):
         """
@@ -89,7 +89,7 @@ async def get_long_lived_access_token(self, token: str) -> OAuth2Token:
             data = self.get_json(response, exc_class=GetLongLivedAccessTokenError)
             return OAuth2Token(data)
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.get(
                 PROFILE_ENDPOINT,
@@ -99,6 +99,6 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data = cast(Dict[str, Any], response.json())
+            data = cast(dict[str, Any], response.json())
 
             return data["id"], data.get("email")

httpx_oauth/clients/franceconnect.py

@@ -1,5 +1,5 @@
 import secrets
-from typing import Any, Dict, List, Literal, Optional, Tuple, TypedDict
+from typing import Any, Literal, Optional, TypedDict
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2
@@ -37,7 +37,7 @@ def __init__(
         client_id: str,
         client_secret: str,
         integration: bool = False,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name="franceconnect",
     ):
         endpoints = ENDPOINTS["integration"] if integration else ENDPOINTS["production"]
@@ -57,7 +57,7 @@ async def get_authorization_url(
         self,
         redirect_uri: str,
         state: Optional[str] = None,
-        scope: Optional[List[str]] = None,
+        scope: Optional[list[str]] = None,
         code_challenge: Optional[str] = None,
         code_challenge_method: Optional[Literal["plain", "S256"]] = None,
         extras_params: Optional[FranceConnectOAuth2AuthorizeParams] = None,
@@ -72,7 +72,7 @@ async def get_authorization_url(
             redirect_uri, state, scope, extras_params=_extras_params
         )
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.get(
                 self.profile_endpoint,
@@ -82,6 +82,6 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data: Dict[str, Any] = response.json()
+            data: dict[str, Any] = response.json()
 
             return str(data["sub"]), data.get("email")

httpx_oauth/clients/github.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, TypedDict, cast
+from typing import Any, Optional, TypedDict, cast
 
 import httpx
 
@@ -36,7 +36,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "github",
     ):
         """
@@ -106,7 +106,7 @@ async def refresh_token(self, refresh_token: str) -> OAuth2Token:
 
             return OAuth2Token(data)
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         """
         Returns the id and the email (if available) of the authenticated user
         from the API provider.
@@ -140,7 +140,7 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data = cast(Dict[str, Any], response.json())
+            data = cast(dict[str, Any], response.json())
 
             id = data["id"]
             email = data.get("email")
@@ -152,7 +152,7 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
                 if response.status_code >= 400:
                     raise GetIdEmailError(response=response)
 
-                emails = cast(List[Dict[str, Any]], response.json())
+                emails = cast(list[dict[str, Any]], response.json())
 
                 # Use the primary email if it exists, otherwise the first
                 email = next(

httpx_oauth/clients/google.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Literal, Optional, Tuple, TypedDict, cast
+from typing import Any, Literal, Optional, TypedDict, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2
@@ -42,7 +42,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "google",
     ):
         """
@@ -65,7 +65,7 @@ def __init__(
             revocation_endpoint_auth_method="client_secret_post",
         )
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.get(
                 PROFILE_ENDPOINT,
@@ -76,7 +76,7 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data = cast(Dict[str, Any], response.json())
+            data = cast(dict[str, Any], response.json())
 
             user_id = data["resourceName"]
             user_email = next(

httpx_oauth/clients/kakao.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Optional, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2
@@ -19,7 +19,7 @@
 """
 
 
-class KakaoOAuth2(BaseOAuth2[Dict[str, Any]]):
+class KakaoOAuth2(BaseOAuth2[dict[str, Any]]):
     """OAuth2 client for Kakao."""
 
     display_name = "Kakao"
@@ -29,7 +29,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "kakao",
     ):
         """
@@ -52,7 +52,7 @@ def __init__(
             revocation_endpoint_auth_method="client_secret_post",
         )
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.post(
                 PROFILE_ENDPOINT,
@@ -63,7 +63,7 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            payload = cast(Dict[str, Any], response.json())
+            payload = cast(dict[str, Any], response.json())
             account_id = str(payload["id"])
             email = payload["kakao_account"].get("email")
             return account_id, email

httpx_oauth/clients/linkedin.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Optional, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2, OAuth2Token
@@ -19,7 +19,7 @@
 """
 
 
-class LinkedInOAuth2(BaseOAuth2[Dict[str, Any]]):
+class LinkedInOAuth2(BaseOAuth2[dict[str, Any]]):
     """OAuth2 client for LinkedIn."""
 
     display_name = "LinkedIn"
@@ -29,7 +29,7 @@ def __init__(
         self,
         client_id: str,
         client_secret: str,
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "linkedin",
     ):
         """
@@ -74,7 +74,7 @@ async def refresh_token(self, refresh_token: str) -> OAuth2Token:
         """
         return await super().refresh_token(refresh_token)  # pragma: no cover
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             profile_response = await client.get(
                 PROFILE_ENDPOINT,
@@ -94,10 +94,10 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if email_response.status_code >= 400:
                 raise GetIdEmailError(response=email_response)
 
-            profile_data = cast(Dict[str, Any], profile_response.json())
+            profile_data = cast(dict[str, Any], profile_response.json())
             user_id = profile_data["id"]
 
-            email_data = cast(Dict[str, Any], email_response.json())
+            email_data = cast(dict[str, Any], email_response.json())
             user_email = email_data["elements"][0]["handle~"]["emailAddress"]
 
             return user_id, user_email

httpx_oauth/clients/microsoft.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Optional, cast
 
 from httpx_oauth.exceptions import GetIdEmailError
 from httpx_oauth.oauth2 import BaseOAuth2
@@ -19,7 +19,7 @@
 """
 
 
-class MicrosoftGraphOAuth2(BaseOAuth2[Dict[str, Any]]):
+class MicrosoftGraphOAuth2(BaseOAuth2[dict[str, Any]]):
     """OAuth2 client for Microsoft Graph API."""
 
     display_name = "Microsoft"
@@ -30,7 +30,7 @@ def __init__(
         client_id: str,
         client_secret: str,
         tenant: str = "common",
-        scopes: Optional[List[str]] = BASE_SCOPES,
+        scopes: Optional[list[str]] = BASE_SCOPES,
         name: str = "microsoft",
     ):
         """
@@ -63,7 +63,7 @@ def get_authorization_url(
             redirect_uri, state=state, scope=scope, extras_params=extras_params
         )
 
-    async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
+    async def get_id_email(self, token: str) -> tuple[str, Optional[str]]:
         async with self.get_httpx_client() as client:
             response = await client.get(
                 PROFILE_ENDPOINT,
@@ -73,6 +73,6 @@ async def get_id_email(self, token: str) -> Tuple[str, Optional[str]]:
             if response.status_code >= 400:
                 raise GetIdEmailError(response=response)
 
-            data = cast(Dict[str, Any], response.json())
+            data = cast(dict[str, Any], response.json())
 
             return data["id"], data["userPrincipalName"]