Commit d5a4910d authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch '139-redirect-to-nova-login' into 'dev' 

Add ORNL specific logic when logging in from NOVA

Closes #139

See merge request !127
parents 77b66bda d64bc93e

.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: 24.2.dev4+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev4.ornl

  GALAXY_VERSION_PYTHON: 24.2.dev5+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev5.ornl



# This import is for the func_rse_docker_* functions

before_script:

lib/galaxy/authnz/custos_authnz.py

+0 −1
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ class OIDCAuthnzBase(IdentityProvider): 


        custos_authnz_token = self._get_custos_authnz_token(sa_session, user_id, self.config.provider)

        user = custos_authnz_token.user if custos_authnz_token else None

        self.refresh(sa_session, custos_authnz_token, 90)

        return user, decoded_jwt

lib/galaxy/authnz/psa_authnz.py

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ class PSAAuthnz(IdentityProvider): 
        user_id = decoded_jwt["unique_name"]

        authnz_token = self._get_authnz_token(sa_session, user_id, self.config["provider"])

        user = authnz_token.user if authnz_token else None

        self.refresh(sa_session, authnz_token, 90)

        return user, decoded_jwt



    @staticmethod

lib/galaxy/config/schemas/config_schema.yml

+8 −0
Original line number Diff line number Diff line
@@ -4168,3 +4168,11 @@ mapping: 
          Number of seconds before file source content listings are refreshed. Shorter times will result in more

          queries while browsing a file sources. Longer times will result in fewer requests to file sources but

          outdated contents might be displayed to the user. Currently only affects s3fs file sources.



      external_login_redirect_cookie:

        type: str

        default: "galaxy-external-login-redirect"

        required: false

        desc: |

          The name of a cookie to check after Galaxy has been logged into via an external third party. If present, Galaxy

          will redirect to the url contained in the cookie.
 
 No newline at end of file

lib/galaxy/managers/configuration.py

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ class ConfigSerializer(base.ModelSerializer): 
            "enable_help_forum_tool_panel_integration": _use_config,

            "disable_batch_input": _use_config,

            "llm_api_configured": lambda item, key, **context: bool(item.openai_api_key),

            "external_login_redirect_cookie": _defaults_to("galaxy-external-login-redirect")

        }