From 2cb59820a8715a0fc7d57e9f321d0917aeb0ec03 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 4 Mar 2021 16:02:07 +0100
Subject: fix #6785

---
 ...er-merchant-httpd_private-delete-instances-ID.c | 43 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 7 deletions(-)

(limited to 'src/backend/taler-merchant-httpd_private-delete-instances-ID.c')

diff --git a/src/backend/taler-merchant-httpd_private-delete-instances-ID.c b/src/backend/taler-merchant-httpd_private-delete-instances-ID.c
index 1b1184cf..baa082a2 100644
--- a/src/backend/taler-merchant-httpd_private-delete-instances-ID.c
+++ b/src/backend/taler-merchant-httpd_private-delete-instances-ID.c
@@ -26,17 +26,14 @@
 /**
  * Handle a DELETE "/instances/$ID" request.
  *
- * @param rh context of the handler
+ * @param mi instance to delete
  * @param connection the MHD connection to handle
- * @param[in,out] hc context with further information about the request
  * @return MHD result code
  */
-MHD_RESULT
-TMH_private_delete_instances_ID (const struct TMH_RequestHandler *rh,
-                                 struct MHD_Connection *connection,
-                                 struct TMH_HandlerContext *hc)
+static MHD_RESULT
+delete_instances_ID (struct TMH_MerchantInstance *mi,
+                     struct MHD_Connection *connection)
 {
-  struct TMH_MerchantInstance *mi = hc->instance;
   const char *purge;
   enum GNUNET_DB_QueryStatus qs;
 
@@ -87,4 +84,36 @@ TMH_private_delete_instances_ID (const struct TMH_RequestHandler *rh,
 }
 
 
+MHD_RESULT
+TMH_private_delete_instances_ID (const struct TMH_RequestHandler *rh,
+                                 struct MHD_Connection *connection,
+                                 struct TMH_HandlerContext *hc)
+{
+  struct TMH_MerchantInstance *mi = hc->instance;
+
+  return delete_instances_ID (mi,
+                              connection);
+}
+
+
+MHD_RESULT
+TMH_private_delete_instances_default_ID (const struct TMH_RequestHandler *rh,
+                                         struct MHD_Connection *connection,
+                                         struct TMH_HandlerContext *hc)
+{
+  struct TMH_MerchantInstance *mi;
+
+  mi = TMH_lookup_instance (hc->infix);
+  if (NULL == mi)
+  {
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_MERCHANT_GENERIC_INSTANCE_UNKNOWN,
+                                       hc->infix);
+  }
+  return delete_instances_ID (mi,
+                              connection);
+}
+
+
 /* end of taler-merchant-httpd_private-delete-instances-ID.c */
-- 
cgit v1.2.3