Skip to content

Commit

Permalink
Merge pull request galaxyproject#18683 from mvdbeek/only_load_authnz_…
Browse files Browse the repository at this point in the history
…routes_when_oidc_enabled

[24.1] Only load authnz routes when oidc enabled
  • Loading branch information
mvdbeek authored Aug 12, 2024
2 parents 6481c7b + 7a06ecb commit 97e7825
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions lib/galaxy/webapps/galaxy/buildapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,18 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs):
webapp.add_route("/activate", controller="user", action="activate")

# Authentication endpoints.
webapp.add_route("/authnz/", controller="authnz", action="index", provider=None)
webapp.add_route("/authnz/{provider}/login", controller="authnz", action="login", provider=None)
webapp.add_route("/authnz/{provider}/callback", controller="authnz", action="callback", provider=None)
webapp.add_route(
"/authnz/{provider}/disconnect/{email}", controller="authnz", action="disconnect", provider=None, email=None
)
webapp.add_route("/authnz/{provider}/logout", controller="authnz", action="logout", provider=None)
webapp.add_route("/authnz/{provider}/create_user", controller="authnz", action="create_user")
# Returns the provider specific logout url for currently logged in provider
webapp.add_route("/authnz/logout", controller="authnz", action="get_logout_url")
webapp.add_route("/authnz/get_cilogon_idps", controller="authnz", action="get_cilogon_idps")
if app.config.enable_oidc:
webapp.add_route("/authnz/", controller="authnz", action="index", provider=None)
webapp.add_route("/authnz/{provider}/login", controller="authnz", action="login", provider=None)
webapp.add_route("/authnz/{provider}/callback", controller="authnz", action="callback", provider=None)
webapp.add_route(
"/authnz/{provider}/disconnect/{email}", controller="authnz", action="disconnect", provider=None, email=None
)
webapp.add_route("/authnz/{provider}/logout", controller="authnz", action="logout", provider=None)
webapp.add_route("/authnz/{provider}/create_user", controller="authnz", action="create_user")
# Returns the provider specific logout url for currently logged in provider
webapp.add_route("/authnz/logout", controller="authnz", action="get_logout_url")
webapp.add_route("/authnz/get_cilogon_idps", controller="authnz", action="get_cilogon_idps")

# These two routes handle our simple needs at the moment
webapp.add_route(
Expand Down

0 comments on commit 97e7825

Please sign in to comment.