updated comments

jupyterhub · Feb 16, 2018 · 6356d01 · 6356d01
1 parent 0d49160
commit 6356d01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -101,19 +101,20 @@ c.MyOAuthenticator.client_secret = 'your-client-secret'
 
 
 
+### _Prereqs_:
 
-Requires: **`PyJWT>=1.5.3`**
+* Requires: **`PyJWT>=1.5.3`**
 
 ```
 > pip3 install PyJWT
 ```
 
+* BE SURE TO SET THE **`AAD_TENANT_ID`** environment variable
+* See `run.sh` for an [example](./examples/azuread/)
+
 
 ```
 import os
-os.environ["AAD_TENANT_ID"] = '{AAD-TENANT-ID}'
-# **BE SURE TO SET THE AAD-TENANT-ID ABOVE, HERE! FOR THINGS TO WORK CORRECTLY**
-
 from oauthenticator.azuread import AzureAdOAuthenticator
 c.JupyterHub.authenticator_class = AzureAdOAuthenticator
 
@@ -125,7 +126,6 @@ c.AzureAdOAuthenticator.oauth_callback_url = 'http://{your-domain}/hub/oauth_cal
 c.AzureAdOAuthenticator.client_id = '{AAD-APP-CLIENT-ID}'
 c.AzureAdOAuthenticator.client_secret = '{AAD-APP-CLIENT-SECRET}'
 
-c.Spawner.cmd = ['/usr/local/bin/jupyterhub-singleuser']
 ```
 
 * Run via:
@@ -134,6 +134,7 @@ c.Spawner.cmd = ['/usr/local/bin/jupyterhub-singleuser']
 sudo jupyterhub -f ./path/to/jupyter_config.py –no-ssl –log-level=DEBUG
 ```
 
+
 * [Source Code](oauthenticator/azuread.py)
 
 

diff --git a/examples/azuread/run.sh b/examples/azuread/run.sh
@@ -1,2 +1,3 @@
-sudo jupyterhub -f ./sample_jupyter_config.py –-no-ssl –-log-level=DEBUG
+export AAD_TENANT_ID='{AAD-TENANT-ID}'
+jupyterhub -f ./sample_jupyter_config.py –-log-level=DEBUG
 
diff --git a/examples/azuread/sample_jupyter_config.py b/examples/azuread/sample_jupyter_config.py
@@ -1,7 +1,4 @@
 import os
-# set AAD TENANT ID here
-os.environ["AAD_TENANT_ID"] = '{AAD-TENANT-ID}'
-
 from oauthenticator.azuread import AzureAdOAuthenticator
 c.JupyterHub.authenticator_class = AzureAdOAuthenticator
 
@@ -12,5 +9,3 @@
 c.AzureAdOAuthenticator.oauth_callback_url = 'http://{your-domain}/hub/oauth_callback'
 c.AzureAdOAuthenticator.client_id = '{AAD-APP-CLIENT-ID}'
 c.AzureAdOAuthenticator.client_secret = '{AAD-APP-CLIENT-SECRET}'
-
-c.Spawner.cmd = ['/usr/local/bin/jupyterhub-singleuser']
diff --git a/oauthenticator/azuread.py b/oauthenticator/azuread.py
@@ -96,9 +96,7 @@ def authenticate(self, handler, data=None):
         resp = yield http_client.fetch(req)
         resp_json = json.loads(resp.body.decode('utf8', 'replace'))
 
-        self.log.info(resp_json)
-
-        app_log.info("Response %s", resp_json)
+        # app_log.info("Response %s", resp_json)
         access_token = resp_json['access_token']
 
         id_token = resp_json['id_token']