Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jwks_client/client.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio
import dataclasses
import datetime
import datetime as dt
import logging
import math
import time
Expand Down Expand Up @@ -126,7 +126,7 @@ async def decode(
algorithms: Sequence[str],
audience: str | Iterable[str] | None = None,
issuer: str | Container[str] | None = None,
leeway: float | datetime.timedelta = 0,
leeway: float | dt.timedelta = 0,
options: Options | None = None,
) -> dict[str, typing.Any]:
header: typing.Final = jwt.get_unverified_header(token)
Expand Down
8 changes: 4 additions & 4 deletions jwks_client/testing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt
import json
import typing
from collections.abc import Mapping
Expand All @@ -12,7 +12,7 @@
from jwks_client.client import JWKSClient


DEFAULT_TOKEN_LIFETIME: typing.Final = datetime.timedelta(minutes=5)
DEFAULT_TOKEN_LIFETIME: typing.Final = dt.timedelta(minutes=5)


class FakeIdentityProvider:
Expand All @@ -28,10 +28,10 @@ def issue_token(
self,
claims: Mapping[str, typing.Any] | None = None,
*,
expires_in: datetime.timedelta = DEFAULT_TOKEN_LIFETIME,
expires_in: dt.timedelta = DEFAULT_TOKEN_LIFETIME,
headers: Mapping[str, typing.Any] | None = None,
) -> str:
now: typing.Final = datetime.datetime.now(tz=datetime.UTC)
now: typing.Final = dt.datetime.now(tz=dt.UTC)
payload: typing.Final = {"iss": self.issuer, "iat": now, "exp": now + expires_in} | dict(claims or {})
return jwt.encode(
payload, self._private_key, algorithm="RS256", headers={"kid": self.kid} | dict(headers or {})
Expand Down
4 changes: 2 additions & 2 deletions jwks_client/verifier.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt
import typing
from collections.abc import Callable, Container, Iterable, Sequence

Expand All @@ -25,7 +25,7 @@ def __init__(
algorithms: Sequence[str],
audience: str | Iterable[str] | None = None,
issuer: str | Container[str] | None = None,
leeway: float | datetime.timedelta = 0,
leeway: float | dt.timedelta = 0,
options: Options | None = None,
) -> None:
if not algorithms:
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio
import dataclasses
import datetime
import datetime as dt
import json
import typing

Expand Down Expand Up @@ -31,7 +31,7 @@ def to_jwk(self, **extra: str) -> dict[str, typing.Any]:
def issue_token(
self, claims: dict[str, typing.Any] | None = None, *, algorithm: str = "RS256", **headers: str
) -> str:
payload = {"sub": "user-1", "exp": datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(minutes=5)}
payload = {"sub": "user-1", "exp": dt.datetime.now(tz=dt.UTC) + dt.timedelta(minutes=5)}
return jwt.encode(
payload | (claims or {}), self.private_key, algorithm=algorithm, headers={"kid": self.kid} | headers
)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_decode.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt
import typing

import jwt
Expand Down Expand Up @@ -35,7 +35,7 @@ async def test_decode_rejects_expired_token(
) -> None:
server.serve(signing_key.to_jwk())
client = make_client()
expired = datetime.datetime.now(tz=datetime.UTC) - datetime.timedelta(minutes=1)
expired = dt.datetime.now(tz=dt.UTC) - dt.timedelta(minutes=1)

with pytest.raises(jwt.ExpiredSignatureError):
await client.decode(signing_key.issue_token({"exp": expired}), algorithms=["RS256"])
Expand All @@ -46,7 +46,7 @@ async def test_decode_honours_leeway(
) -> None:
server.serve(signing_key.to_jwk())
client = make_client()
expired = datetime.datetime.now(tz=datetime.UTC) - datetime.timedelta(seconds=10)
expired = dt.datetime.now(tz=dt.UTC) - dt.timedelta(seconds=10)

claims = await client.decode(signing_key.issue_token({"exp": expired}), algorithms=["RS256"], leeway=60)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_testing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt

import jwt
import pytest
Expand All @@ -22,7 +22,7 @@ async def test_fake_identity_provider_issues_expired_tokens() -> None:
verifier = JWTVerifier(idp.create_jwks_client(), algorithms=["RS256"])

with pytest.raises(jwt.ExpiredSignatureError):
await verifier.verify(idp.issue_token(expires_in=datetime.timedelta(seconds=-1)))
await verifier.verify(idp.issue_token(expires_in=dt.timedelta(seconds=-1)))


async def test_fake_identity_provider_headers_override_kid() -> None:
Expand Down
Loading