[taler-merchant] branch master updated: use POST instead of PATCH

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 778176a6 use POST instead of PATCH
778176a6 is described below

commit 778176a664c9ecf96073ffbc2e1823a4366fd37a
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Apr 16 23:38:46 2021 +0200

    use POST instead of PATCH
---
 src/include/taler_merchant_service.h               | 24 ++++++++---
 src/lib/Makefile.am                                |  2 +-
 ...ce_auth.c => merchant_api_post_instance_auth.c} | 50 +++++++++++-----------
 3 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index e45aded7..953b1301 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -613,7 +613,19 @@ TALER_MERCHANT_instance_patch_cancel (
 /**
  * Handle for an operation to modify authentication settings.
  */
-struct TALER_MERCHANT_InstanceAuthPatchHande;
+struct TALER_MERCHANT_InstanceAuthPostHande;
+
+
+/**
+ * Function called with the result of the GET /instances/$ID operation.
+ *
+ * @param cls closure
+ * @param hr HTTP response data
+ */
+typedef void
+(*TALER_MERCHANT_InstanceAuthPostCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_HttpResponse *hr);
 
 
 /**
@@ -630,13 +642,13 @@ struct TALER_MERCHANT_InstanceAuthPatchHande;
  * @param cb_cls closure for @a config_cb
  * @return the instances handle; NULL upon error
  */
-struct TALER_MERCHANT_InstanceAuthPatchHandle *
-TALER_MERCHANT_instance_auth_patch (
+struct TALER_MERCHANT_InstanceAuthPostHandle *
+TALER_MERCHANT_instance_auth_post (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *instance_id,
   const char *auth_token,
-  TALER_MERCHANT_InstancePatchCallback cb,
+  TALER_MERCHANT_InstanceAuthPostCallback cb,
   void *cb_cls);
 
 
@@ -648,8 +660,8 @@ TALER_MERCHANT_instance_auth_patch (
  * @param iaph request to cancel.
  */
 void
-TALER_MERCHANT_instance_auth_patch_cancel (
-  struct TALER_MERCHANT_InstanceAuthPatchHandle *iaph);
+TALER_MERCHANT_instance_auth_post_cancel (
+  struct TALER_MERCHANT_InstanceAuthPostHandle *iaph);
 
 
 /**
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a06089b3..08ef97ab 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -34,7 +34,7 @@ libtalermerchant_la_SOURCES = \
   merchant_api_patch_instance.c \
   merchant_api_patch_order_forget.c \
   merchant_api_patch_product.c \
-  merchant_api_patch_instance_auth.c \
+  merchant_api_post_instance_auth.c \
   merchant_api_post_instances.c \
   merchant_api_post_orders.c \
   merchant_api_post_order_abort.c \
diff --git a/src/lib/merchant_api_patch_instance_auth.c 
b/src/lib/merchant_api_post_instance_auth.c
similarity index 79%
rename from src/lib/merchant_api_patch_instance_auth.c
rename to src/lib/merchant_api_post_instance_auth.c
index d0bf56d1..1111deb5 100644
--- a/src/lib/merchant_api_patch_instance_auth.c
+++ b/src/lib/merchant_api_post_instance_auth.c
@@ -15,8 +15,8 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file merchant_api_patch_instance_auth.c
- * @brief Implementation of the PATCH /instance/$ID/private/auth request
+ * @file merchant_api_post_instance_auth.c
+ * @brief Implementation of the POST /instance/$ID/private/auth request
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -32,9 +32,9 @@
 
 
 /**
- * Handle for a PATCH /instances/$ID/private/auth operation.
+ * Handle for a POST /instances/$ID/private/auth operation.
  */
-struct TALER_MERCHANT_InstanceAuthPatchHandle
+struct TALER_MERCHANT_InstanceAuthPostHandle
 {
   /**
    * The url for this request.
@@ -49,7 +49,7 @@ struct TALER_MERCHANT_InstanceAuthPatchHandle
   /**
    * Function to call with the result.
    */
-  TALER_MERCHANT_InstancePatchCallback cb;
+  TALER_MERCHANT_InstanceAuthPostCallback cb;
 
   /**
    * Closure for @a cb.
@@ -73,16 +73,16 @@ struct TALER_MERCHANT_InstanceAuthPatchHandle
  * Function called when we're done processing the
  * HTTP GET /instances/$ID/private/auth request.
  *
- * @param cls the `struct TALER_MERCHANT_InstanceAuthPatchHandle`
+ * @param cls the `struct TALER_MERCHANT_InstanceAuthPostHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response response body, NULL if not in JSON
  */
 static void
-handle_patch_instance_auth_finished (void *cls,
-                                     long response_code,
-                                     const void *response)
+handle_post_instance_auth_finished (void *cls,
+                                    long response_code,
+                                    const void *response)
 {
-  struct TALER_MERCHANT_InstanceAuthPatchHandle *iaph = cls;
+  struct TALER_MERCHANT_InstanceAuthPostHandle *iaph = cls;
   const json_t *json = response;
   struct TALER_MERCHANT_HttpResponse hr = {
     .http_status = (unsigned int) response_code,
@@ -114,23 +114,23 @@ handle_patch_instance_auth_finished (void *cls,
   }
   iaph->cb (iaph->cb_cls,
             &hr);
-  TALER_MERCHANT_instance_auth_patch_cancel (iaph);
+  TALER_MERCHANT_instance_auth_post_cancel (iaph);
 }
 
 
-struct TALER_MERCHANT_InstanceAuthPatchHandle *
-TALER_MERCHANT_instance_auth_patch (
-                                    struct GNUNET_CURL_Context *ctx,
+struct TALER_MERCHANT_InstanceAuthPostHandle *
+TALER_MERCHANT_instance_auth_post (
+  struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *instance_id,
   const char *auth_token,
-  TALER_MERCHANT_InstancePatchCallback cb,
+  TALER_MERCHANT_InstanceAuthPostCallback cb,
   void *cb_cls)
 {
-  struct TALER_MERCHANT_InstanceAuthPatchHandle *iaph;
+  struct TALER_MERCHANT_InstanceAuthPostHandle *iaph;
   json_t *req_obj;
 
-  iaph = GNUNET_new (struct TALER_MERCHANT_InstanceAuthPatchHandle);
+  iaph = GNUNET_new (struct TALER_MERCHANT_InstanceAuthPostHandle);
   iaph->ctx = ctx;
   iaph->cb = cb;
   iaph->cb_cls = cb_cls;
@@ -142,16 +142,16 @@ TALER_MERCHANT_instance_auth_patch (
                      "instances/%s/private/auth",
                      instance_id);
     iaph->url = TALER_url_join (backend_url,
-                               path,
-                               NULL);
+                                path,
+                                NULL);
     GNUNET_free (path);
   }
   else
   {
     /* backend_url is already identifying the instance */
     iaph->url = TALER_url_join (backend_url,
-                               "/private/auth",
-                               NULL);
+                                "/private/auth",
+                                NULL);
   }
   if (NULL == iaph->url)
   {
@@ -207,10 +207,10 @@ TALER_MERCHANT_instance_auth_patch (
     GNUNET_assert (CURLE_OK ==
                    curl_easy_setopt (eh,
                                      CURLOPT_CUSTOMREQUEST,
-                                     MHD_HTTP_METHOD_POST)); // FIXME: PATCH?
+                                     MHD_HTTP_METHOD_POST)); // FIXME: POST?
     iaph->job = GNUNET_CURL_job_add (ctx,
                                      eh,
-                                     &handle_patch_instance_auth_finished,
+                                     &handle_post_instance_auth_finished,
                                      iaph);
   }
   return iaph;
@@ -218,8 +218,8 @@ TALER_MERCHANT_instance_auth_patch (
 
 
 void
-TALER_MERCHANT_instance_auth_patch_cancel (
-  struct TALER_MERCHANT_InstanceAuthPatchHandle *iaph)
+TALER_MERCHANT_instance_auth_post_cancel (
+  struct TALER_MERCHANT_InstanceAuthPostHandle *iaph)
 {
   if (NULL != iaph->job)
     GNUNET_CURL_job_cancel (iaph->job);

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