Merge pull request #18818 from bgruening/oidc_fix

[24.1] Fix unspecified ``oidc_endpoint`` variable overwriting specified ``redirect_url``
galaxyproject · Sep 16, 2024 · 106b038 · 106b038
2 parents 972c3c7 + 103879e
commit 106b038
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/galaxy/authnz/psa_authnz.py b/lib/galaxy/authnz/psa_authnz.py
@@ -135,9 +135,10 @@ def _setup_idp(self, oidc_backend_config):
         self.config["KEY"] = oidc_backend_config.get("client_id")
         self.config["SECRET"] = oidc_backend_config.get("client_secret")
         self.config["TENANT_ID"] = oidc_backend_config.get("tenant_id")
-        self.config["OIDC_ENDPOINT"] = oidc_backend_config.get("oidc_endpoint")
         self.config["redirect_uri"] = oidc_backend_config.get("redirect_uri")
         self.config["EXTRA_SCOPES"] = oidc_backend_config.get("extra_scopes")
+        if oidc_backend_config.get("oidc_endpoint"):
+            self.config["OIDC_ENDPOINT"] = oidc_backend_config["oidc_endpoint"]
         if oidc_backend_config.get("prompt") is not None:
             self.config[setting_name("AUTH_EXTRA_ARGUMENTS")]["prompt"] = oidc_backend_config.get("prompt")
         if oidc_backend_config.get("api_url") is not None: