From d378a699608c0347b9ac539cccaa5e09ac11312d Mon Sep 17 00:00:00 2001 From: Dwight Townsend Date: Thu, 26 Apr 2018 16:28:04 -0700 Subject: [PATCH] changing jupyterhub_config.py to handle null hosted_domain for GoogleOAuth --- images/hub/jupyterhub_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/hub/jupyterhub_config.py b/images/hub/jupyterhub_config.py index 36f574ba59..58889e56a4 100644 --- a/images/hub/jupyterhub_config.py +++ b/images/hub/jupyterhub_config.py @@ -132,7 +132,7 @@ c.GoogleOAuthenticator.client_id = get_config('auth.google.client-id') c.GoogleOAuthenticator.client_secret = get_config('auth.google.client-secret') c.GoogleOAuthenticator.oauth_callback_url = get_config('auth.google.callback-url') - c.GoogleOAuthenticator.hosted_domain = get_config('auth.google.hosted-domain') + set_config_if_not_none(c.GoogleOAuthenticator, 'hosted_domain', 'auth.google.hosted-domain') c.GoogleOAuthenticator.login_service = get_config('auth.google.login-service') email_domain = get_config('auth.google.hosted-domain') elif auth_type == 'github':