From 399949f2caf5a83cd385eb6708b6d1ada75e31b2 Mon Sep 17 00:00:00 2001 From: Parisa Date: Fri, 28 Feb 2025 08:22:26 +0100 Subject: [PATCH] Replace deprecated jwk.dumps with JsonWebKey.import_key per AuthlibDeprecationWarning --- sda-doa/test/mock_auth.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sda-doa/test/mock_auth.py b/sda-doa/test/mock_auth.py index f870d3224..a1eea5d35 100644 --- a/sda-doa/test/mock_auth.py +++ b/sda-doa/test/mock_auth.py @@ -1,7 +1,7 @@ """Mock OAUTH2 aiohttp.web server.""" from aiohttp import web -from authlib.jose import jwt, jwk +from authlib.jose import jwt, JsonWebKey from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import rsa @@ -118,15 +118,15 @@ def generate_token(): "exp": 99999999999, "jti": "2b322848-506b-492c-914f-47f9da967cdd" } - public_jwk = jwk.dumps(public_key, kty='RSA') - private_jwk = jwk.dumps(pem, kty='RSA') - dataset_encoded = jwt.encode(header, dataset_payload, private_jwk).decode('utf-8') - empty_encoded = jwt.encode(header, empty_payload, private_jwk).decode('utf-8') - passport_terms_encoded = jwt.encode(header, passport_terms, private_jwk).decode('utf-8') - passport_status_encoded = jwt.encode(header, passport_status, private_jwk).decode('utf-8') - passport_dataset1_encoded = jwt.encode(header, passport_dataset1, private_jwk).decode('utf-8') - passport_dataset2_encoded = jwt.encode(header, passport_dataset2, private_jwk).decode('utf-8') - passport_dataset_gdi_encoded = jwt.encode(header, passport_dataset_gdi, private_jwk).decode('utf-8') + public_jwk = JsonWebKey.import_key(public_key, {'kty': 'RSA', 'kid': 'rsa1', 'use': 'sig'}).as_dict() + private_key_obj = JsonWebKey.import_key(pem, {'kty': 'RSA', 'kid': 'rsa1', 'use': 'sig'}) + dataset_encoded = jwt.encode(header, dataset_payload, private_key_obj).decode('utf-8') + empty_encoded = jwt.encode(header, empty_payload, private_key_obj).decode('utf-8') + passport_terms_encoded = jwt.encode(header, passport_terms, private_key_obj).decode('utf-8') + passport_status_encoded = jwt.encode(header, passport_status, private_key_obj).decode('utf-8') + passport_dataset1_encoded = jwt.encode(header, passport_dataset1, private_key_obj).decode('utf-8') + passport_dataset2_encoded = jwt.encode(header, passport_dataset2, private_key_obj).decode('utf-8') + passport_dataset_gdi_encoded = jwt.encode(header, passport_dataset_gdi, private_key_obj).decode('utf-8') return (public_jwk, dataset_encoded, empty_encoded, passport_terms_encoded, passport_status_encoded, passport_dataset1_encoded, passport_dataset2_encoded, passport_dataset_gdi_encoded)