gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] 169/277: implement POST /private/reserves


From: gnunet
Subject: [taler-merchant] 169/277: implement POST /private/reserves
Date: Sun, 05 Jul 2020 20:51:22 +0200

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

grothoff pushed a commit to branch master
in repository merchant.

commit f3a9cffa1a119eea9413b2fe236499cdc90403d1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jun 1 23:39:22 2020 +0200

    implement POST /private/reserves
---
 src/include/taler_merchant_service.h  |   6 +-
 src/lib/Makefile.am                   |   1 +
 src/lib/merchant_api_post_reserves.c  | 258 ++++++++++++++++++++++++++++++++++
 src/lib/merchant_api_post_transfers.c |   4 +-
 4 files changed, 264 insertions(+), 5 deletions(-)

diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 68550be..19f059b 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -2385,14 +2385,14 @@ struct TALER_MERCHANT_PostReservesHandle;
  * @param cls closure
  * @param hr HTTP response details
  * @param reserve_pub public key of the created reserve, NULL on error
- * @param payto_url where to make the payment to for filling the reserve, NULL 
on error
+ * @param payto_uri where to make the payment to for filling the reserve, NULL 
on error
  */
 typedef void
 (*TALER_MERCHANT_PostReservesCallback) (
   void *cls,
   const struct TALER_MERCHANT_HttpResponse *hr,
   const struct TALER_ReservePublicKeyP *reserve_pub,
-  const char *payto_url);
+  const char *payto_uri);
 
 
 /**
@@ -2415,7 +2415,7 @@ TALER_MERCHANT_reserves_post (
   const char *exchange_url,
   const char *wire_method,
   TALER_MERCHANT_PostReservesCallback cb,
-  void *cls);
+  void *cb_cls);
 
 
 /**
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 482cfb3..8e505b8 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -36,6 +36,7 @@ libtalermerchant_la_SOURCES = \
   merchant_api_post_order_pay.c \
   merchant_api_post_order_refund.c \
   merchant_api_post_products.c \
+  merchant_api_post_reserves.c \
   merchant_api_post_transfers.c \
  \
   merchant_api_tip_authorize.c \
diff --git a/src/lib/merchant_api_post_reserves.c 
b/src/lib/merchant_api_post_reserves.c
new file mode 100644
index 0000000..35ad548
--- /dev/null
+++ b/src/lib/merchant_api_post_reserves.c
@@ -0,0 +1,258 @@
+/*
+  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_reserves.c
+ * @brief Implementation of the POST /reserves 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 reserve data.
+ */
+struct TALER_MERCHANT_PostReservesHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_MERCHANT_PostReservesCallback 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 /reserves request.
+ *
+ * @param cls the `struct TALER_MERCHANT_PostReservesHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param json response body, NULL if not in JSON
+ */
+static void
+handle_post_reserves_finished (void *cls,
+                               long response_code,
+                               const void *response)
+{
+  struct TALER_MERCHANT_PostReservesHandle *prh = cls;
+  const json_t *json = response;
+  struct TALER_MERCHANT_HttpResponse hr = {
+    .http_status = (unsigned int) response_code,
+    .reply = json
+  };
+
+  prh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    hr.ec = TALER_EC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    {
+      const char *payto_uri;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                     &reserve_pub),
+        GNUNET_JSON_spec_string ("payto_uri",
+                                 &payto_uri),
+        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
+      {
+        prh->cb (prh->cb_cls,
+                 &hr,
+                 &reserve_pub,
+                 payto_uri);
+        GNUNET_JSON_parse_free (spec);
+        TALER_MERCHANT_reserves_post_cancel (prh);
+        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;
+  }
+  prh->cb (prh->cb_cls,
+           &hr,
+           NULL,
+           NULL);
+  TALER_MERCHANT_reserves_post_cancel (prh);
+}
+
+
+/**
+ * Request backend to create a reserve.
+ *
+ * @param ctx execution context
+ * @param backend_url base URL of the backend
+ * @param initial_balance desired initial balance for the reserve
+ * @param exchange_url what is the URL of the exchange where the reserve 
should be set up
+ * @param wire_method desired wire method, for example "iban" or "x-taler-bank"
+ * @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_PostReservesHandle *
+TALER_MERCHANT_reserves_post (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const struct TALER_Amount *initial_balance,
+  const char *exchange_url,
+  const char *wire_method,
+  TALER_MERCHANT_PostReservesCallback cb,
+  void *cb_cls)
+{
+  struct TALER_MERCHANT_PostReservesHandle *prh;
+  CURL *eh;
+  json_t *req;
+
+  prh = GNUNET_new (struct TALER_MERCHANT_PostReservesHandle);
+  prh->ctx = ctx;
+  prh->cb = cb;
+  prh->cb_cls = cb_cls;
+  prh->url = TALER_url_join (backend_url,
+                             "reserves",
+                             NULL);
+  if (NULL == prh->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (prh);
+    return NULL;
+  }
+  req = json_pack ("{s:o, s:s, s:s}",
+                   "initial_balance", TALER_JSON_from_amount (initial_balance),
+                   "wire_method", wire_method,
+                   "exchange_url", exchange_url);
+  GNUNET_assert (NULL != req);
+  eh = curl_easy_init ();
+  GNUNET_assert (NULL != eh);
+  if (GNUNET_OK != TALER_curl_easy_post (&prh->post_ctx,
+                                         eh,
+                                         req))
+  {
+    GNUNET_break (0);
+    json_decref (req);
+    GNUNET_free (prh);
+    return NULL;
+  }
+  json_decref (req);
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_URL,
+                                   prh->url));
+  prh->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   prh->post_ctx.headers,
+                                   &handle_post_reserves_finished,
+                                   prh);
+  return prh;
+}
+
+
+/**
+ * Cancel a POST /reserves request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param prh handle to the tracking operation being cancelled
+ */
+void
+TALER_MERCHANT_reserves_post_cancel (
+  struct TALER_MERCHANT_PostReservesHandle *prh)
+{
+  if (NULL != prh->job)
+  {
+    GNUNET_CURL_job_cancel (prh->job);
+    prh->job = NULL;
+  }
+  GNUNET_free (prh->url);
+  TALER_curl_easy_post_finished (&prh->post_ctx);
+  GNUNET_free (prh);
+}
+
+
+/* end of merchant_api_post_reserves.c */
diff --git a/src/lib/merchant_api_post_transfers.c 
b/src/lib/merchant_api_post_transfers.c
index 0dd67ce..d304ed9 100644
--- a/src/lib/merchant_api_post_transfers.c
+++ b/src/lib/merchant_api_post_transfers.c
@@ -262,7 +262,7 @@ TALER_MERCHANT_transfers_post (
   pth->cb = cb;
   pth->cb_cls = cb_cls;
   pth->url = TALER_url_join (backend_url,
-                             "transfers",
+                             "private/transfers",
                              NULL);
   if (NULL == pth->url)
   {
@@ -275,7 +275,7 @@ TALER_MERCHANT_transfers_post (
                    "credit_amount", TALER_JSON_from_amount (credit_amount),
                    "wtid", GNUNET_JSON_from_data_auto (wtid),
                    "payto_uri", payto_uri,
-                   "exchange_url", "exchange_url");
+                   "exchange_url", exchange_url);
   GNUNET_assert (NULL != req);
   eh = curl_easy_init ();
   GNUNET_assert (NULL != eh);

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]