Merge pull request #954 from lsst-sqre/u/rra/dependencies

Update dependencies

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.14
+    rev: v0.1.15
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -27,7 +27,7 @@ repos:
     hooks:
       - id: eslint
         additional_dependencies:
-          - '@babel/[email protected].3'
+          - '@babel/[email protected].9'
           - '@babel/[email protected]'
           - [email protected]
           - [email protected]

src/gafaelfawr/services/oidc.py

@@ -207,14 +207,18 @@ async def issue_id_token(
         # list of claims that were requested via either claims or scopes and
         # by dropping any claims that were None.
         now = current_datetime()
+        if token_data.expires:
+            expires = token_data.expires.timestamp()
+        else:
+            expires = (now + self._config.lifetime).timestamp()
         payload: dict[str, Any] = {
             "aud": authorization.client_id,
             "auth_time": int(token_data.created.timestamp()),
             "data_rights": self._build_data_rights_for_user(user_info),
             "iat": int(now.timestamp()),
             "iss": str(self._config.issuer),
             "email": user_info.email,
-            "exp": int(token_data.expires.timestamp()),
+            "exp": expires,
             "jti": authorization.code.key,
             "name": user_info.name,
             "nonce": authorization.nonce,

tests/handlers/oidc_test.py

@@ -145,6 +145,7 @@ async def test_login(
     )
     assert config.oidc_server
     token_data = await create_session_token(factory)
+    assert token_data.expires
     await set_session_cookie(client, token_data.token)
 
     # Authenticate.
@@ -806,6 +807,7 @@ async def test_nonce(
     )
     assert config.oidc_server
     token_data = await create_session_token(factory)
+    assert token_data.expires
     await set_session_cookie(client, token_data.token)
     nonce = os.urandom(16).hex()
 
@@ -852,6 +854,7 @@ async def test_data_rights(
     )
     assert config.oidc_server
     token_data = await create_session_token(factory, group_names=["foo"])
+    assert token_data.expires
     await set_session_cookie(client, token_data.token)
 
     token = await authenticate(
@@ -879,6 +882,7 @@ async def test_data_rights(
     }
 
     token_data = await create_session_token(factory, group_names=["admin"])
+    assert token_data.expires
     await set_session_cookie(client, token_data.token)
 
     token = await authenticate(

tests/services/oidc_test.py

@@ -309,6 +309,7 @@ async def test_issue_id_token(tmp_path: Path, factory: Factory) -> None:
     oidc_service = factory.create_oidc_service()
 
     token_data = await create_session_token(factory)
+    assert token_data.expires
     authorization = OIDCAuthorization(
         client_id="some-id",
         redirect_uri=redirect_uri,