Merge pull request #667 from townsenddw/GoogleOAuth

changing jupyterhub_config.py to handle null hosted_domain for Google…
jupyterhub · Apr 30, 2018 · 82bed4a · 82bed4a
2 parents b40b8da + d378a69
commit 82bed4a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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':