Skip to content

Commit

Permalink
Fixing the internal vs. external url issue
Browse files Browse the repository at this point in the history
  • Loading branch information
costrouc committed Aug 19, 2021
1 parent 9e20005 commit b47ce2e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion conda-store-server/conda_store_server/server/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ def _login_html_default(self):
"""


class JupyterHub(GenericOAuthAuthentication):
class JupyterHubOAuthAuthentication(GenericOAuthAuthentication):
jupyterhub_url = Unicode(
help="base url for jupyterhub not including the '/hub/'",
config=True,
Expand Down
6 changes: 6 additions & 0 deletions tests/assets/conda_store_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
c.JupyterHubOAuthAuthentication.jupyterhub_url = "http://jupyterhub"
c.JupyterHubOAuthAuthentication.client_id = "this-is-a-jupyterhub-client"
c.JupyterHubOAuthAuthentication.client_secret = "this-is-a-jupyterhub-secret"
# in the case of docker-compose the internal and external dns
# routes do not match. Inside the docker compose deployment
# jupyterhub is accessible via the `jupyterhub` hostname in dns
# however outside of the docker it is accessible via localhost
# hence this small change needed for testing
c.JupyterHubOAuthAuthentication.authorize_url = "http://localhost:8000/hub/api/oauth2/authorize"

# ==================================
# worker settings
Expand Down

0 comments on commit b47ce2e

Please sign in to comment.