diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index faa4f5158d1736274471ed2ff93cb8f5312af60d..d5a36c3ecbe876bd7d86a74afdcd09511b0b0630 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}" CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base" CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit" - GALAXY_VERSION_PYTHON: 24.2.dev7+ornl - GALAXY_VERSION_DOCKER: 24.2.dev7.ornl + GALAXY_VERSION_PYTHON: 24.2.dev8+ornl + GALAXY_VERSION_DOCKER: 24.2.dev8.ornl # This import is for the func_rse_docker_* functions before_script: diff --git a/lib/galaxy/authnz/managers.py b/lib/galaxy/authnz/managers.py index 117258dafac211b07e20923c6f67f3ead7a60e03..b80e6385d613a43e6c6878ea6b0ce663866e1011 100644 --- a/lib/galaxy/authnz/managers.py +++ b/lib/galaxy/authnz/managers.py @@ -333,6 +333,8 @@ class AuthnzManager: success, message, backend = self._get_authnz_backend(provider, idphint=idphint) if success is False: return False, message, None + if trans.user: + trans.handle_user_logout(logout_all=True) elif provider in KEYCLOAK_BACKENDS: if self.allowed_idps and (idphint not in self.allowed_idps): msg = f"An error occurred when authenticating a user. Invalid EntityID: `{idphint}`"