Match port info to spawner based on token

Author: rcthomas

batchspawner/api.py

@@ -12,12 +12,12 @@ def post(self):
         else:
             # Previous jupyterhub, 0.9.4 and before.
             user = self.get_current_user()
-        data = self.get_json_body()
-        if self.allow_named_servers:
-            server_name = data.pop("server_name", "")
-            spawner = user.spawners[server_name]
-        else:
-            spawner = user.spawner
+        token = self.get_auth_token()
+        spawner = None
+        for s in user.spawners.values():
+            if s.api_token == token:
+                spawner = s
+                break
         for key, value in data.items():
             if hasattr(spawner, key):
                 setattr(spawner, key, value)

batchspawner/singleuser.py

@@ -8,15 +8,14 @@
 from jupyterhub.services.auth import HubAuth
 
 def main(argv=None):
-    server_name = os.environ.get('JUPYTERHUB_SERVER_NAME', '')
     port = random_port()
     hub_auth = HubAuth()
     hub_auth.client_ca = os.environ.get('JUPYTERHUB_SSL_CLIENT_CA', '')
     hub_auth.certfile = os.environ.get('JUPYTERHUB_SSL_CERTFILE', '')
     hub_auth.keyfile = os.environ.get('JUPYTERHUB_SSL_KEYFILE', '')
     hub_auth._api_request(method='POST',
                           url=url_path_join(hub_auth.api_url, 'batchspawner'),
-                          json={'server_name': server_name, 'port' : port})
+                          json={'port' : port})
 
     cmd_path = which(sys.argv[1])
     sys.argv = sys.argv[1:] + ['--port={}'.format(port)]