challenger

commit fc3440fe1e2e41ae55face57c5c0a583d8b6c26e
parent 424489cfc265a452fe0105d31a5df556d445fd04
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat,  6 May 2023 22:36:16 +0200

fix challenger-admin

Diffstat:
M
src/challenger/challenger-admin.c
 | 
2
+-
M
src/challenger/test-challenger.sh
 | 
5
+++++
M
src/challengerdb/pg_client_add.c
 | 
7
++++---

3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/challenger/challenger-admin.c b/src/challenger/challenger-admin.c
@@ -162,7 +162,7 @@ main (int argc,
   (void) TALER_project_data_default ();
   GNUNET_OS_init (CHALLENGER_project_data_default ());
   ret = GNUNET_PROGRAM_run (argc, argv,
-                            "challenger-admin CLIENT_URL CLIENT_SECRET",
+                            "challenger-admin CLIENT_URL",
                             "Tool to add or remove clients from challenger",
                             options,
                             &run, NULL);
diff --git a/src/challenger/test-challenger.sh b/src/challenger/test-challenger.sh
@@ -48,6 +48,10 @@ echo -n "Initialize challenger database ..."
 challenger-dbinit -r -c "${CONF}" &> dbinit.log
 echo " OK"
 
+echo -n "Add challenger client ..."
+challenger-admin -c "${CONF}" -a "secret" "http://client.com/" &> admin.log
+echo " OK"
+
 echo -n "Start challenger-httpd ..."
 challenger-httpd -c "${CONF}" &> httpd.log &
 
@@ -67,6 +71,7 @@ then
     exit_skip "Failed to launch challenger service"
 fi
 
+# FIXME: actually use service!
 
 
 exit 0
diff --git a/src/challengerdb/pg_client_add.c b/src/challengerdb/pg_client_add.c
@@ -48,9 +48,10 @@ CH_PG_client_add (void *cls,
            "INSERT INTO clients"
            " (url"
            " ,client_secret"
-           ") "
-           "ON CONFLICT DO NOTHING" /* CONFLICT on (url) */
-           "RETURNING client_serial_id");
+           ") VALUES "
+           "($1, $2)"
+           " ON CONFLICT DO NOTHING" /* CONFLICT on (url) */
+           " RETURNING client_serial_id");
   return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
                                                    "client_add",
                                                    params,