[taler-merchant] branch master updated: implement lib functions for paid method

[gnunet]

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

jonathan-buchanan pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new dc41253  implement lib functions for paid method
dc41253 is described below

commit dc4125387b31155a9a5d9622bb22d5b55da2f2fd
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Fri Jul 24 00:57:49 2020 -0400

    implement lib functions for paid method
---
 src/lib/Makefile.am                    |   1 +
 src/lib/merchant_api_post_order_paid.c | 277 +++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index dee3f21..a2218be 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -38,6 +38,7 @@ libtalermerchant_la_SOURCES = \
   merchant_api_post_orders.c \
   merchant_api_post_order_abort.c \
   merchant_api_post_order_claim.c \
+  merchant_api_post_order_paid.c \
   merchant_api_post_order_pay.c \
   merchant_api_post_order_refund.c \
   merchant_api_post_products.c \
diff --git a/src/lib/merchant_api_post_order_paid.c 
b/src/lib/merchant_api_post_order_paid.c
new file mode 100644
index 0000000..d462087
--- /dev/null
+++ b/src/lib/merchant_api_post_order_paid.c
@@ -0,0 +1,277 @@
+/*
+  This file is part of TALER
+  Copyright (C) 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_order_paid.c
+ * @brief Implementation of the POST /order/$ID/paid request
+ *        of the merchant's HTTP API
+ * @author Jonathan Buchanan
+ */
+#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 <gnunet/gnunet_curl_lib.h>
+#include "taler_merchant_service.h"
+#include <taler/taler_json_lib.h>
+#include <taler/taler_signatures.h>
+#include <taler/taler_exchange_service.h>
+#include <taler/taler_curl_lib.h>
+
+
+/**
+ * @brief Handle to a POST /orders/$ID/paid operation at a merchant.
+ */
+struct TALER_MERCHANT_OrderPaidHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_MERCHANT_OrderPaidCallback paid_cb;
+
+  /**
+   * Closure for @a paid_cb.
+   */
+  void *paid_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 /paid request.
+ *
+ * @param cls the `struct TALER_MERCHANT_OrderPaidHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param json response body, NULL if not in JSON
+ */
+static void
+handle_paid_finished (void *cls,
+                      long response_code,
+                      const void *response)
+{
+  struct TALER_MERCHANT_OrderPaidHandle *oph = cls;
+  const json_t *json = response;
+  struct TALER_MERCHANT_HttpResponse hr = {
+    .http_status = (unsigned int) response_code,
+    .reply = json
+  };
+
+  oph->job = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "/paid completed with response code %u\n",
+              (unsigned int) response_code);
+  switch (response_code)
+  {
+  case 0:
+    hr.ec = TALER_EC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    /* This should never happen, either us
+     * or the merchant is buggy (or API version conflict);
+     * just pass JSON reply to the application */
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    /* The signature provided was invalid */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the
+       application */
+    break;
+  case MHD_HTTP_CONFLICT:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    /* The hashed contract terms don't match with the order_id. */
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    /* Server had an internal issue; we should retry,
+       but this API leaves this to the application */
+    break;
+  case MHD_HTTP_SERVICE_UNAVAILABLE:
+    TALER_MERCHANT_parse_error_details_ (json,
+                                         response_code,
+                                         &hr);
+    /* Exchange couldn't respond properly; the retry is
+       left to the application */
+    break;
+  default:
+    TALER_MERCHANT_parse_error_details_ (json,
+                                         response_code,
+                                         &hr);
+    /* unexpected response code */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d\n",
+                (unsigned int) response_code,
+                (int) hr.ec);
+    GNUNET_break_op (0);
+    break;
+  }
+  oph->paid_cb (oph->paid_cb_cls,
+                &hr);
+  TALER_MERCHANT_order_paid_cancel (oph);
+}
+
+
+/**
+ * Send proof of payment to a merchant.
+ *
+ * This is a PUBLIC API, albeit in this form useful for the frontend,
+ * in case the frontend is proxying the request.
+ *
+ * @param ctx execution context
+ * @param merchant_url base URL of the merchant
+ * @param order_id which order should be paid
+ * @param session_id session to pay for, or NULL for none
+ * @param h_contract_terms hash of the contract terms
+ * @param merchant_sig signature from the merchant
+ *        affirming payment, or NULL on errors
+ * @param paid_cb the callback to call when a reply for this request is 
available
+ * @param paid_cb_cls closure for @a paid_cb
+ * @return a handle for this request
+ */
+struct TALER_MERCHANT_OrderPaidHandle *
+TALER_MERCHANT_order_paid (
+  struct GNUNET_CURL_Context *ctx,
+  const char *merchant_url,
+  const char *order_id,
+  const char *session_id,
+  const struct GNUNET_HashCode *h_contract_terms,
+  const struct TALER_MerchantSignatureP *merchant_sig,
+  TALER_MERCHANT_OrderPaidCallback paid_cb,
+  void *paid_cb_cls)
+{
+  struct TALER_MERCHANT_OrderPaidHandle *oph;
+  json_t *req_obj;
+
+  req_obj = json_pack ("{s:o, s:o, s:s}",
+                       "sig",
+                       GNUNET_JSON_from_data_auto (merchant_sig),
+                       "h_contract",
+                       GNUNET_JSON_from_data_auto (h_contract_terms),
+                       "session_id",
+                       session_id);
+  if (NULL == req_obj)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  oph = GNUNET_new (struct TALER_MERCHANT_OrderPaidHandle);
+  oph->ctx = ctx;
+  oph->paid_cb = paid_cb;
+  oph->paid_cb_cls = paid_cb_cls;
+  {
+    char *path;
+
+    GNUNET_asprintf (&path,
+                     "orders/%s/paid",
+                     order_id);
+    oph->url = TALER_url_join (merchant_url,
+                               path,
+                               NULL);
+    GNUNET_free (path);
+  }
+  if (NULL == oph->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    json_decref (req_obj);
+    GNUNET_free (oph);
+    return NULL;
+  }
+  {
+    CURL *eh;
+
+    eh = curl_easy_init ();
+    if (GNUNET_OK !=
+        TALER_curl_easy_post (&oph->post_ctx,
+                              eh,
+                              req_obj))
+    {
+      GNUNET_break (0);
+      json_decref (req_obj);
+      GNUNET_free (oph);
+      return NULL;
+    }
+
+    json_decref (req_obj);
+    GNUNET_assert (CURLE_OK == curl_easy_setopt (eh,
+                                                 CURLOPT_URL,
+                                                 oph->url));
+    oph->job = GNUNET_CURL_job_add2 (ctx,
+                                     eh,
+                                     oph->post_ctx.headers,
+                                     &handle_paid_finished,
+                                     oph);
+  }
+  return oph;
+}
+
+
+/**
+ * Cancel POST /orders/$ID/paid operation.
+ *
+ * @param oph operation to cancel
+ */
+void
+TALER_MERCHANT_order_paid_cancel (
+  struct TALER_MERCHANT_OrderPaidHandle *oph)
+{
+  if (NULL != oph->job)
+  {
+    GNUNET_CURL_job_cancel (oph->job);
+    oph->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&oph->post_ctx);
+  GNUNET_free (oph->url);
+  GNUNET_free (oph);
+}
+
+
+/* end of merchant_api_post_order_paid.c */

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