Fix linting and testing errors exposed by update

.pre-commit-config.yaml

@@ -1,6 +1,3 @@
-default_language_version:
-  python: python3.8
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0

fastapi_oidc/auth.py

@@ -110,7 +110,7 @@ def authenticate_user(auth_header: str = Depends(oauth2_scheme)) -> IDToken:
                 # Disabled at_hash check since we aren't using the access token
                 options={"verify_at_hash": False},
             )
-            return token_type.parse_obj(token)
+            return token_type.model_validate(token)
 
         except (ExpiredSignatureError, JWTError, JWTClaimsError) as err:
             raise HTTPException(status_code=401, detail=f"Unauthorized: {err}")

fastapi_oidc/discovery.py

@@ -13,7 +13,7 @@ def get_authentication_server_public_keys(OIDC_spec: Dict):
         for signing OIDC ID tokens.
         """
         keys_uri = OIDC_spec["jwks_uri"]
-        r = requests.get(keys_uri)
+        r = requests.get(keys_uri, timeout=15)
         keys = r.json()
         return keys
 
@@ -24,7 +24,7 @@ def get_signing_algos(OIDC_spec: Dict):
     @cached(TTLCache(1, cache_ttl))
     def discover_auth_server(*_, base_url: str) -> Dict:
         discovery_url = f"{base_url}/.well-known/openid-configuration"
-        r = requests.get(discovery_url)
+        r = requests.get(discovery_url, timeout=15)
         # If the auth server is failing we can't verify tokens.
         # Soooo panic I guess?
         r.raise_for_status()

fastapi_oidc/types.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from pydantic import BaseModel
-from pydantic import Extra
+from pydantic import ConfigDict
 
 
 class OIDCConfig(BaseModel):
@@ -29,15 +29,14 @@ class IDToken(BaseModel):
 
     """
 
+    model_config = ConfigDict(extra="allow")
+
     iss: str
     sub: str
     aud: str
     exp: int
     iat: int
 
-    class Config:
-        extra = Extra.allow
-
 
 class OktaIDToken(IDToken):
     """Pydantic Model for the IDToken returned by Okta's OIDC implementation."""

tests/test_auth.py

@@ -1,3 +1,4 @@
+# type: ignore
 import pytest
 
 from fastapi_oidc import auth

tests/test_import.py

@@ -1,3 +1,4 @@
+# type: ignore
 import fastapi_oidc
 
 

tests/test_types.py

@@ -1,3 +1,4 @@
+# type: ignore
 import pydantic
 import pytest
 
@@ -21,7 +22,7 @@ def test_IDToken_only_requires_fields_in_OIDC_spec():
         iss="ClearAirTurbulence",
         sub="ValueJudgement",
         aud="SoberCounsel",
-        exp=3.12,
+        exp=312,
         iat=42,
     )
 
@@ -31,7 +32,7 @@ def test_IDToken_takes_arbitrary_extra_fields():
         iss="ClearAirTurbulence",
         sub="ValueJudgement",
         aud="SoberCounsel",
-        exp=3.12,
+        exp=312,
         iat=42,
         arbitrary_extra_field="Laskuil-Hliz",
     )