[25.0] Fix refresh token expiration retrieval logic #21213
Merged
+2
−2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the following traceback when refresh_token is None:
Oct 31 01:14:47 dev galaxyctl[3357277]: Traceback (most recent call last):
Oct 31 01:14:47 dev galaxyctl[3357277]: File "/mnt/galaxy/galaxy-app/lib/galaxy/authnz/managers.py", line 306, in refresh_expiring_oidc_tokens_for_provider
Oct 31 01:14:47 dev galaxyctl[3357277]: refreshed = backend.refresh(trans, auth)
Oct 31 01:14:47 dev galaxyctl[3357277]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Oct 31 01:14:47 dev galaxyctl[3357277]: File "/mnt/galaxy/galaxy-app/lib/galaxy/authnz/psa_authnz.py", line 206, in refresh
Oct 31 01:14:47 dev galaxyctl[3357277]: expires = self._try_to_locate_refresh_token_expiration(user_authnz_token.extra_data)
Oct 31 01:14:47 dev galaxyctl[3357277]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Oct 31 01:14:47 dev galaxyctl[3357277]: File "/mnt/galaxy/galaxy-app/lib/galaxy/authnz/psa_authnz.py", line 228, in _try_to_locate_refresh_token_expiration
Oct 31 01:14:47 dev galaxyctl[3357277]: or extra_data["refresh_token"].get("expires", None)
Oct 31 01:14:47 dev galaxyctl[3357277]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Oct 31 01:14:47 dev galaxyctl[3357277]: AttributeError: 'NoneType' object has no attribute 'get'
How to test the changes?
(Select all options that apply)
License