diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86d3c74e27172ea77edf80413dd6e3341be3874d..adbdbdda1714625cc2f934509ad32cc588b6c3fc 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: 25.1.dev2+ornl - GALAXY_VERSION_DOCKER: 25.1.dev2.ornl + GALAXY_VERSION_PYTHON: 25.1.dev3+ornl + GALAXY_VERSION_DOCKER: 25.1.dev3.ornl # This import is for the func_rse_docker_* functions before_script: diff --git a/lib/galaxy/authnz/custos_authnz.py b/lib/galaxy/authnz/custos_authnz.py index ecf8488da3f6289f41c9d2ec4fc883794d44a85c..521733771b3cf5402d0dbe3d9d9aa8b10bfa8906 100644 --- a/lib/galaxy/authnz/custos_authnz.py +++ b/lib/galaxy/authnz/custos_authnz.py @@ -343,7 +343,7 @@ class OIDCAuthnzBase(IdentityProvider): custos_authnz_token.refresh_token = refresh_token custos_authnz_token.expiration_time = expiration_time custos_authnz_token.refresh_expiration_time = refresh_expiration_time - redirect_url = "/" + redirect_url = login_redirect_url trans.sa_session.add(custos_authnz_token) trans.sa_session.commit() diff --git a/test/unit/app/authnz/test_custos_authnz.py b/test/unit/app/authnz/test_custos_authnz.py index 190936c7a4b8d458c7554fcec877aa6a8bc3c0bd..f8fed172916826bb133faa28493338e6b1e9700e 100644 --- a/test/unit/app/authnz/test_custos_authnz.py +++ b/test/unit/app/authnz/test_custos_authnz.py @@ -369,7 +369,7 @@ class TestCustosAuthnz(TestCase): assert self._create_oauth2_session_called assert self._fetch_token_called assert self._get_userinfo_called - assert login_redirect_url == "/" + assert login_redirect_url == "http://localhost:8000/" assert user is not None def test_callback_nonce_validation_with_bad_nonce(self):