Commit 3053c327 authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch 'dev' into 'main' 

Merge 'dev' into 'main'

See merge request !142
parents ace1bec3 01c05cdb

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -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:

lib/galaxy/authnz/custos_authnz.py

+1 −1
Original line number Diff line number Diff line
@@ -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()

test/unit/app/authnz/test_custos_authnz.py

+1 −1
Original line number Diff line number Diff line
@@ -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):