global: use invenio_base.jws not itsdangerous

inveniosoftware · Dec 6, 2024 · e1733a5 · e1733a5
1 parent 6e18909
commit e1733a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/invenio_oauthclient/utils.py b/invenio_oauthclient/utils.py
@@ -11,21 +11,14 @@
 
 from flask import current_app, request, session
 from flask_principal import RoleNeed
+from invenio_base.jws import TimedJSONWebSignatureSerializer
 from invenio_db.utils import rebuild_encrypted_properties
 from uritools import uricompose, urisplit
 from werkzeug.local import LocalProxy
 from werkzeug.utils import import_string
 
 from .models import RemoteToken
 
-try:
-    # itsdangerous < 2.1.0
-    from itsdangerous import TimedJSONWebSignatureSerializer
-except ImportError:
-    # itsdangerous >= 2.1.0
-    from invenio_base.jws import TimedJSONWebSignatureSerializer
-
-
 _security = LocalProxy(lambda: current_app.extensions["security"])
 
 

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -17,8 +18,8 @@
 from flask_security import login_user
 from helpers import check_response_redirect_url
 from invenio_accounts.testutils import login_user_via_session
+from invenio_base.jws import TimedJSONWebSignatureSerializer
 from invenio_db import db
-from itsdangerous import TimedJSONWebSignatureSerializer
 from mock import MagicMock
 from simplejson import JSONDecodeError
 

diff --git a/tests/test_views_rest.py b/tests/test_views_rest.py
@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -16,8 +17,8 @@
 from flask_oauthlib.client import OAuth as FlaskOAuth
 from helpers import check_response_redirect_url, check_response_redirect_url_args
 from invenio_accounts.testutils import login_user_via_session
+from invenio_base.jws import TimedJSONWebSignatureSerializer
 from invenio_db import db
-from itsdangerous import TimedJSONWebSignatureSerializer
 from mock import MagicMock
 from simplejson import JSONDecodeError