[taler-merchant] branch master updated: allow patch template to edit when image is null

[gnunet]

This is an automated email from the git hooks/post-receive script.

priscilla-huang pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new ded3b469 allow patch template to edit when image is null
ded3b469 is described below

commit ded3b469c3f1ee6e8ebe43ad8788fb62c41e48af
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Thu Feb 2 04:45:00 2023 -0500

    allow patch template to edit when image is null
---
 src/backend/.#taler-merchant-httpd.c      |   1 +
 src/backend/taler-merchant-httpd_helper.c |   4 +-
 src/testing/test.conf                     | 172 ++++++++++++++++++++++++++++++
 src/testing/testing_api_cmd_webhook.c     |  10 +-
 4 files changed, 180 insertions(+), 7 deletions(-)

diff --git a/src/backend/.#taler-merchant-httpd.c 
b/src/backend/.#taler-merchant-httpd.c
new file mode 120000
index 00000000..37ec71da
--- /dev/null
+++ b/src/backend/.#taler-merchant-httpd.c
@@ -0,0 +1 @@
+priscilla@dhcp-147-87-107-42.2280:1675328542
\ No newline at end of file
diff --git a/src/backend/taler-merchant-httpd_helper.c 
b/src/backend/taler-merchant-httpd_helper.c
index b875f6f3..f6f80d1c 100644
--- a/src/backend/taler-merchant-httpd_helper.c
+++ b/src/backend/taler-merchant-httpd_helper.c
@@ -296,7 +296,7 @@ bool
 TMH_image_data_url_valid (const char *image_data_url)
 {
   if (0 == strcmp (image_data_url,
-                   ""))
+                   NULL))
     return true;
   if (0 != strncasecmp ("data:image/",
                         image_data_url,
@@ -573,7 +573,7 @@ trigger_webhook_cb (void *cls,
     if (0 != ret)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to expand webhook header template for webhook %llu 
(%d)\n",
+                  "Failed to expand webhook body template for webhook %llu 
(%d)\n",
                   (unsigned long long) webhook_serial,
                   ret);
       t->rv = GNUNET_DB_STATUS_HARD_ERROR;
diff --git a/src/testing/test.conf b/src/testing/test.conf
new file mode 100644
index 00000000..502d807a
--- /dev/null
+++ b/src/testing/test.conf
@@ -0,0 +1,172 @@
+# This file is in the public domain.
+#
+[PATHS]
+# Persistent data storage for the testcase
+TALER_TEST_HOME = test_merchant_api_home/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
+
+# Persistent data storage
+TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
+
+# Configuration files
+TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
+
+# Cached data, no big deal if lost
+TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
+
+[taler]
+# What currency do we use?
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
+
+[taler-helper-crypto-rsa]
+# Reduce from 1 year to speed up test
+LOOKAHEAD_SIGN = 24 days
+
+[taler-helper-crypto-eddsa]
+# Reduce from 1 year to speed up test
+LOOKAHEAD_SIGN = 24 days
+# Reduce from 12 weeks to ensure we have multiple
+DURATION = 14 days
+
+[bank]
+HTTP_PORT = 8082
+
+##########################################
+# Configuration for the merchant backend #
+##########################################
+
+[merchant]
+
+# Which port do we run the backend on? (HTTP server)
+PORT = 8080
+
+# Which plugin (backend) do we use for the DB.
+DB = postgres
+
+# This specifies which database the postgres backend uses.
+[merchantdb-postgres]
+CONFIG = postgres:///talercheck
+
+# Sections starting with "merchant-exchange-" specify trusted exchanges
+# (by the merchant)
+[merchant-exchange-test]
+MASTER_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
+EXCHANGE_BASE_URL = http://localhost:8081/
+CURRENCY = EUR
+
+
+#######################################################
+# Configuration for the auditor for the testcase
+#######################################################
+[auditor]
+BASE_URL = http://the.auditor/
+
+
+#######################################################
+# Configuration for ??? Is this used?
+#######################################################
+
+# Auditors must be in sections "auditor-", the rest of the section
+# name could be anything.
+[auditor-ezb]
+# Informal name of the auditor. Just for the user.
+NAME = European Central Bank
+
+# URL of the auditor (especially for in the future, when the
+# auditor offers an automated issue reporting system).
+# Not really used today.
+URL = http://taler.ezb.eu/
+
+# This is the important bit: the signing key of the auditor.
+PUBLIC_KEY = 9QXF7XY7E9VPV47B5Z806NDFSX2VJ79SVHHD29QEQ3BG31ANHZ60
+
+# Which currency is this auditor trusted for?
+CURRENCY = EUR
+
+
+###################################################
+# Configuration for the exchange for the testcase #
+###################################################
+
+[exchange]
+# How to access our database
+DB = postgres
+
+# HTTP port the exchange listens to
+PORT = 8081
+
+# Our public key
+MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
+
+# Base URL of the exchange.
+BASE_URL = "http://localhost:8081/";
+
+
+[exchangedb-postgres]
+CONFIG = "postgres:///talercheck"
+
+
+[auditordb-postgres]
+CONFIG = postgres:///talercheck
+
+
+# Account of the EXCHANGE
+[exchange-account-exchange]
+# What is the exchange's bank account (with the "Taler Bank" demo system)?
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-exchange]
+WIRE_GATEWAY_URL = "http://localhost:8082/2/";
+WIRE_GATEWAY_AUTH_METHOD = NONE
+
+
+[coin_eur_ct_1]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+CIPHER = CS
+
+[coin_eur_ct_10]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+CIPHER = CS
+
+[coin_eur_1]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+CIPHER = CS
+
+[coin_eur_5]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+CIPHER = CS
diff --git a/src/testing/testing_api_cmd_webhook.c 
b/src/testing/testing_api_cmd_webhook.c
index 519e46a6..fc94495c 100644
--- a/src/testing/testing_api_cmd_webhook.c
+++ b/src/testing/testing_api_cmd_webhook.c
@@ -35,12 +35,12 @@ struct WebhookState
 {
 
   /**
-   * Process for the wwebhook.
+   * Process for the webhook.
    */
   struct GNUNET_OS_Process *webhook_proc;
 
   /**
-   * Configuration file used by the wwebhook.
+   * Configuration file used by the webhook.
    */
   const char *config_filename;
 };
@@ -64,8 +64,8 @@ webhook_run (void *cls,
   ws->webhook_proc
     = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
                                NULL, NULL, NULL,
-                               "taler-merchant-webhook",
-                               "taler-merchant-webhook",
+                               "taler-merchant-webhook.c",
+                               "taler-merchant-webhook.c",
                                "-c", ws->config_filename,
                                "-t", /* exit when done */
                                "-L", "DEBUG",
@@ -91,7 +91,7 @@ static void
 webhook_cleanup (void *cls,
                  const struct TALER_TESTING_Command *cmd)
 {
-  struct WwebhookState *ws = cls;
+  struct WebhookState *ws = cls;
 
   (void) cmd;
   if (NULL != ws->webhook_proc)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.