Merge pull request #3564 from minrk/no-rm-servers

don't omit server model if it's empty

jupyterhub/apihandlers/base.py

@@ -243,7 +243,10 @@ class APIHandler(BaseHandler):
                 # (this includes pending events)
                 if spawner.active and scope_filter(spawner, kind='server'):
                     servers[name] = self.server_model(spawner)
-            if not servers:
+            if not servers and 'servers' not in allowed_keys:
+                # omit servers if no access
+                # leave present and empty
+                # if request has access to read servers in general
                 model.pop('servers')
         return model
 

jupyterhub/tests/test_api.py

@@ -154,11 +154,10 @@ def fill_user(model):
     model.setdefault('roles', [])
     model.setdefault('groups', [])
     model.setdefault('admin', False)
-    model.setdefault('server', None)
     model.setdefault('pending', None)
     model.setdefault('created', TIMESTAMP)
     model.setdefault('last_activity', TIMESTAMP)
-    # model.setdefault('servers', {})
+    model.setdefault('servers', {})
     return model