[GNUnet-SVN] [taler-merchant] branch master updated (ae678a8 -> fc3b858)

[gnunet]

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

marcello pushed a change to branch master
in repository merchant.

    from ae678a8  minor edit
     new fad71ff  Reverting last change.
     new fc3b858  Properly adding Authorization header via GNUnet API.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/include/taler_merchant_service.h                  |  1 +
 src/lib/merchant_api_pay.c                            | 10 +++-------
 src/lib/merchant_api_proposal.c                       | 11 ++++-------
 src/lib/merchant_api_track_transaction.c              | 11 +++--------
 src/lib/merchant_api_track_transfer.c                 | 12 +++++-------
 src/merchant-tools/taler-merchant-generate-payments.c |  2 +-
 6 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 6c0339f..0f30aab 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -28,6 +28,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include <jansson.h>
 
+#define APIKEY_SANDBOX "Authorization: ApiKey sandbox"
 
 /* ********************* /refund ************************** */
 
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index 7340a0a..44518d7 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -475,7 +475,6 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
   json_t *pay_obj;
   json_t *j_coins;
   CURL *eh;
-  struct curl_slist *list = NULL;
   struct TALER_Amount total_fee;
   struct TALER_Amount total_amount;
 
@@ -593,13 +592,10 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
                  curl_easy_setopt (eh,
                                    CURLOPT_POSTFIELDSIZE,
                                    strlen (ph->json_enc)));
+  GNUNET_assert
+    (GNUNET_OK == GNUNET_CURL_append_header
+      (ctx, APIKEY_SANDBOX));
 
-  list = curl_slist_append (list, "Authorization: ApiKey sandbox");
-
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_HTTPHEADER,
-                                   list));
   ph->job = GNUNET_CURL_job_add (ctx,
                                  eh,
                                  GNUNET_YES,
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index f07ad17..47446ee 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -215,7 +215,6 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
   struct TALER_MERCHANT_ProposalOperation *po;
   json_t *req;
   CURL *eh;
-  struct curl_slist *list = NULL;
 
   po = GNUNET_new (struct TALER_MERCHANT_ProposalOperation);
   po->ctx = ctx;
@@ -247,12 +246,10 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
                                    CURLOPT_POSTFIELDSIZE,
                                    strlen (po->json_enc)));
 
-  list = curl_slist_append (list, "Authorization: ApiKey sandbox");
-  GNUNET_assert (NULL != list);
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_HTTPHEADER,
-                                   list));
+  GNUNET_assert
+    (GNUNET_OK == GNUNET_CURL_append_header
+      (ctx, APIKEY_SANDBOX));
+
   po->job = GNUNET_CURL_job_add (ctx,
                                  eh,
                                  GNUNET_YES,
diff --git a/src/lib/merchant_api_track_transaction.c 
b/src/lib/merchant_api_track_transaction.c
index 5462b9a..4336c5a 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -149,7 +149,6 @@ TALER_MERCHANT_track_transaction (struct 
GNUNET_CURL_Context *ctx,
 {
   struct TALER_MERCHANT_TrackTransactionHandle *tdo;
   CURL *eh;
-  struct curl_slist *list = NULL;
   char *base;
 
   tdo = GNUNET_new (struct TALER_MERCHANT_TrackTransactionHandle);
@@ -171,13 +170,9 @@ TALER_MERCHANT_track_transaction (struct 
GNUNET_CURL_Context *ctx,
                  curl_easy_setopt (eh,
                                    CURLOPT_URL,
                                    tdo->url));
-  list = curl_slist_append (list,
-                            "Authorization: ApiKey sandbox");
-
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_HTTPHEADER,
-                                   list));
+  GNUNET_assert
+    (GNUNET_OK == GNUNET_CURL_append_header
+      (ctx, APIKEY_SANDBOX));
 
   tdo->job = GNUNET_CURL_job_add (ctx,
                                   eh,
diff --git a/src/lib/merchant_api_track_transfer.c 
b/src/lib/merchant_api_track_transfer.c
index 36fe8e6..467ffa9 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -234,7 +234,6 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context 
*ctx,
 {
   struct TALER_MERCHANT_TrackTransferHandle *tdo;
   CURL *eh;
-  struct curl_slist *list = NULL;
   char *wtid_str;
 
   wtid_str = GNUNET_STRINGS_data_to_string_alloc (wtid,
@@ -255,12 +254,11 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context 
*ctx,
                  curl_easy_setopt (eh,
                                    CURLOPT_URL,
                                    tdo->url));
-  list = curl_slist_append (list,
-                            "Authorization: ApiKey sandbox");
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_HTTPHEADER,
-                                   list));
+
+  GNUNET_assert
+    (GNUNET_OK == GNUNET_CURL_append_header
+      (ctx, APIKEY_SANDBOX));
+
   tdo->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   GNUNET_YES,
diff --git a/src/merchant-tools/taler-merchant-generate-payments.c 
b/src/merchant-tools/taler-merchant-generate-payments.c
index 58a4200..db27b21 100644
--- a/src/merchant-tools/taler-merchant-generate-payments.c
+++ b/src/merchant-tools/taler-merchant-generate-payments.c
@@ -570,7 +570,7 @@ main (int argc,
 
   GNUNET_assert (GNUNET_SYSERR != result);
   loglev = NULL;
-  GNUNET_log_setup ("taler-merchant-generate-payments",
+  GNUNET_log_setup ("taler-merchant-generate-payments-new",
                     loglev,
                     logfile);
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden