From dfc0070eacc85ebd5e6861a76827edd3824005eb Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 16 Mar 2019 17:58:28 +0200
Subject: Fix: effitool list-members

---
 effitool | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/effitool b/effitool
index cfe0dd0..cb670b9 100755
--- a/effitool
+++ b/effitool
@@ -37,6 +37,10 @@ ADMIN_SCOPES = [
     'uapi_clients_id_delete',
     'uapi_clients_post',
     'uapi_clients_id_secret_put',
+    'show',
+    'create',
+    'update',
+    'delete',
 ]
 
 
@@ -218,6 +222,11 @@ class Tool:
             obj = api.get('/status')
             print('server', name, obj['resources'])
 
+    def token(self, args):
+        server = self.get_chosen_server(args)
+        token = self.get_admin_token(server)
+        print(token)
+
     def register_admin_client(self, args):
         server = self.get_chosen_server(args)
         token = self.get_admin_token(server)
@@ -282,16 +291,17 @@ class Tool:
     def list_members(self, args):
         server = self.get_chosen_server(args)
         token = self.get_admin_token(server)
-        print('token', token)
         api = HTTPAPI(server['url'])
-        cond = [
-            {
-                'where': 'meta',
-                'op': '>=',
-                'field': 'id',
-                'pattern': '',
-            }
-        ]
+        cond = {
+            'cond': [
+                {
+                    'where': 'meta',
+                    'op': '>=',
+                    'field': 'id',
+                    'pattern': '',
+                }
+            ]
+        }
         body = json.dumps(cond).encode('utf-8')
         headers = {
             'Content-Type': 'application/json',
@@ -310,6 +320,7 @@ def process_args(config):
 
     subcommands = [
         ('list-servers', tool.list_servers, []),
+        ('token', tool.token, []),
         ('status', tool.status, []),
         ('register-admin-client', tool.register_admin_client, [
             ('--client-id', {'required':True}),
-- 
cgit v1.2.1