implement merchant_api_post_transfers.c

5 files changed, 335 insertions, 8 deletions

diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 519e69f5..0b9b6728 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -885,7 +885,7 @@ queue:
   {
     /* First request, parse it! */
     struct GNUNET_JSON_Specification spec[] = {
-      GNUNET_JSON_spec_string ("exchange",
+      GNUNET_JSON_spec_string ("exchange_url",
                                &ptc->exchange_url),
       GNUNET_JSON_spec_string ("payto_uri",
                                &ptc->payto_uri),
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 1e62f4ed..7c51d1c0 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -2196,14 +2196,14 @@ struct TALER_MERCHANT_TrackTransferDetail
  * @param details array with details about the combined transactions
  */
 typedef void
-(*TALER_MERCHANT_TrackTransferCallback) (
+(*TALER_MERCHANT_PostTransfersCallback) (
   void *cls,
   const struct TALER_MERCHANT_HttpResponse *hr,
   struct GNUNET_TIME_Absolute execution_time,
   const struct TALER_Amount *total_amount,
   const struct TALER_Amount *wire_fee,
   unsigned int details_length,
-  const struct TALER_MERCHANT_TrackTransferDetails details[]);
+  const struct TALER_MERCHANT_TrackTransferDetail details[]);
 
 
 /**
@@ -2229,7 +2229,7 @@ TALER_MERCHANT_transfers_post (
   const struct TALER_WireTransferIdentifierRawP *wtid,
   const char *payto_uri,
   const char *exchange_url,
-  TALER_MERCHANT_TrackTransferCallback cb,
+  TALER_MERCHANT_PostTransfersCallback cb,
   void *cls);
 
 
@@ -2345,7 +2345,7 @@ typedef void
  * @return a handle for this request
  */
 struct TALER_MERCHANT_GetTransfersHandle *
-TALER_MERCHANT_transfers_post (
+TALER_MERCHANT_transfers_get (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *payto_uri,
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 96ee166a..e0d164db 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -27,19 +27,20 @@ libtalermerchant_la_SOURCES = \
   merchant_api_patch_instance.c \
   merchant_api_patch_product.c \
   merchant_api_post_instances.c \
-  merchant_api_post_products.c \
   merchant_api_post_orders.c \
   merchant_api_post_order_abort.c \
   merchant_api_post_order_claim.c \
   merchant_api_post_order_pay.c \
   merchant_api_post_order_refund.c \
+  merchant_api_post_products.c \
+  merchant_api_post_transfers.c \
  \
   merchant_api_tip_authorize.c \
   merchant_api_tip_pickup.c \
   merchant_api_tip_pickup2.c \
   merchant_api_tip_query.c \
-  merchant_api_track_transaction.c \
-  merchant_api_track_transfer.c
+  merchant_api_track_transaction.c
+#  merchant_api_get_transfers.c
 #  merchant_api_get_order.c \
 #  merchant_api_get_order2.c \
 #  merchant_api_get_order3.c
diff --git a/src/lib/merchant_api_track_transfer.c b/src/lib/merchant_api_get_transfers.c
index 5743f2fe..5743f2fe 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_get_transfers.c
diff --git a/src/lib/merchant_api_post_transfers.c b/src/lib/merchant_api_post_transfers.c
new file mode 100644
index 00000000..2583dbe7
--- /dev/null
+++ b/src/lib/merchant_api_post_transfers.c
@@ -0,0 +1,326 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.LGPL.  If not, see
+  <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file lib/merchant_api_post_transfers.c
+ * @brief Implementation of the POST /transfers request of the merchant's HTTP API
+ * @author Marcello Stanisci
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <curl/curl.h>
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_merchant_service.h"
+#include <taler/taler_curl_lib.h>
+#include <taler/taler_json_lib.h>
+
+
+/**
+ * @brief A handle for POSTing transfer data.
+ */
+struct TALER_MERCHANT_PostTransfersHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_MERCHANT_PostTransfersCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reference to the execution context.
+   */
+  struct GNUNET_CURL_Context *ctx;
+
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP POST /transfers request.
+ *
+ * @param cls the `struct TALER_MERCHANT_PostTransfersHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param json response body, NULL if not in JSON
+ */
+static void
+handle_post_transfers_finished (void *cls,
+                                long response_code,
+                                const void *response)
+{
+  struct TALER_MERCHANT_PostTransfersHandle *pth = cls;
+  const json_t *json = response;
+  struct TALER_MERCHANT_HttpResponse hr = {
+    .http_status = (unsigned int) response_code,
+    .reply = json
+  };
+
+  pth->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    hr.ec = TALER_EC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    {
+      struct TALER_Amount total;
+      struct TALER_Amount wire_fee;
+      struct GNUNET_TIME_Absolute execution_time;
+      json_t *deposit_sums;
+      struct GNUNET_JSON_Specification spec[] = {
+        TALER_JSON_spec_amount ("total",
+                                &total),
+        TALER_JSON_spec_amount ("wire_fee",
+                                &wire_fee),
+        GNUNET_JSON_spec_absolute_time ("execution_time",
+                                        &execution_time),
+        GNUNET_JSON_spec_json ("deposit_sums",
+                               &deposit_sums),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (json,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        hr.http_status = 0;
+        hr.ec = TALER_EC_INVALID_RESPONSE;
+        break;
+      }
+      else
+      {
+        size_t deposit_sums_length;
+        struct TALER_MERCHANT_TrackTransferDetail *details;
+        json_t *deposit_sum;
+        unsigned int i;
+        bool ok;
+
+        if (! json_is_array (deposit_sums))
+        {
+          GNUNET_break_op (0);
+          GNUNET_JSON_parse_free (spec);
+          hr.http_status = 0;
+          hr.ec = TALER_EC_INVALID_RESPONSE;
+          break;
+        }
+        deposit_sums_length = json_array_size (deposit_sums);
+        details = GNUNET_new_array (deposit_sums_length,
+                                    struct TALER_MERCHANT_TrackTransferDetail);
+        ok = true;
+        json_array_foreach (deposit_sums, i, deposit_sum) {
+          struct TALER_MERCHANT_TrackTransferDetail *d = &details[i];
+          struct GNUNET_JSON_Specification ispec[] = {
+            TALER_JSON_spec_amount ("total",
+                                    &d->deposit_value),
+            TALER_JSON_spec_amount ("deposit_fee",
+                                    &d->deposit_fee),
+            GNUNET_JSON_spec_string ("order_id",
+                                     &d->order_id),
+            GNUNET_JSON_spec_end ()
+          };
+
+          if (GNUNET_OK !=
+              GNUNET_JSON_parse (json,
+                                 ispec,
+                                 NULL, NULL))
+          {
+            GNUNET_break_op (0);
+            ok = false;
+            break;
+          }
+        }
+
+        if (! ok)
+        {
+          GNUNET_break_op (0);
+          GNUNET_free (details);
+          GNUNET_JSON_parse_free (spec);
+          hr.http_status = 0;
+          hr.ec = TALER_EC_INVALID_RESPONSE;
+          break;
+        }
+        pth->cb (pth->cb_cls,
+                 &hr,
+                 execution_time,
+                 &total,
+                 &wire_fee,
+                 deposit_sums_length,
+                 details);
+        GNUNET_free (details);
+        GNUNET_JSON_parse_free (spec);
+        TALER_MERCHANT_transfers_post_cancel (pth);
+        return;
+      }
+    }
+  case MHD_HTTP_ACCEPTED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Did not find any data\n");
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    TALER_MERCHANT_parse_error_details_ (json,
+                                         response_code,
+                                         &hr);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d\n",
+                (unsigned int) response_code,
+                (int) hr.ec);
+    break;
+  }
+  pth->cb (pth->cb_cls,
+           &hr,
+           GNUNET_TIME_UNIT_FOREVER_ABS,
+           NULL,
+           NULL,
+           0,
+           NULL);
+  TALER_MERCHANT_transfers_post_cancel (pth);
+}
+
+
+/**
+ * Request backend to remember that we received the given
+ * wire transfer and to request details about the aggregated
+ * transactions from the exchange.
+ *
+ * @param ctx execution context
+ * @param backend_url base URL of the backend
+ * @param credit_amount how much money did we receive (without wire fee)
+ * @param wtid base32 string indicating a wtid
+ * @param payto_uri which account was credited by the wire transfer
+ * @param exchange_url what is the URL of the exchange that made the transfer
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for @a cb
+ * @return a handle for this request
+ */
+struct TALER_MERCHANT_PostTransfersHandle *
+TALER_MERCHANT_transfers_post (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const struct TALER_Amount *credit_amount,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const char *payto_uri,
+  const char *exchange_url,
+  TALER_MERCHANT_PostTransfersCallback cb,
+  void *cb_cls)
+{
+  struct TALER_MERCHANT_PostTransfersHandle *pth;
+  CURL *eh;
+  json_t *req;
+
+  pth = GNUNET_new (struct TALER_MERCHANT_PostTransfersHandle);
+  pth->ctx = ctx;
+  pth->cb = cb;
+  pth->cb_cls = cb_cls;
+  pth->url = TALER_url_join (backend_url,
+                             "transfers",
+                             NULL);
+  if (NULL == pth->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (pth);
+    return NULL;
+  }
+  req = json_pack ("{s:o, s:o, s:s, s:s}",
+                   "credit_amount", TALER_JSON_from_amount (credit_amount),
+                   "wtid", GNUNET_JSON_from_data_auto (wtid),
+                   "payto_uri", payto_uri,
+                   "exchange_url", "exchange_url");
+  GNUNET_assert (NULL != req);
+  eh = curl_easy_init ();
+  GNUNET_assert (NULL != eh);
+  if (GNUNET_OK != TALER_curl_easy_post (&pth->post_ctx,
+                                         eh,
+                                         req))
+  {
+    GNUNET_break (0);
+    json_decref (req);
+    GNUNET_free (pth);
+    return NULL;
+  }
+  json_decref (req);
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_URL,
+                                   pth->url));
+  pth->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   pth->post_ctx.headers,
+                                   &handle_post_transfers_finished,
+                                   pth);
+  return pth;
+}
+
+
+/**
+ * Cancel a POST /transfers request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param pth handle to the tracking operation being cancelled
+ */
+void
+TALER_MERCHANT_transfers_post_cancel (
+  struct TALER_MERCHANT_PostTransfersHandle *pth)
+{
+  if (NULL != pth->job)
+  {
+    GNUNET_CURL_job_cancel (pth->job);
+    pth->job = NULL;
+  }
+  GNUNET_free (pth->url);
+  TALER_curl_easy_post_finished (&pth->post_ctx);
+  GNUNET_free (pth);
+}
+
+
+/* end of merchant_api_post_transfers.c */