[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: put customer-facing
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: put customer-facing endpoints under /public/ |
|
Date: |
Mon, 29 Jan 2018 18:06:15 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 7580c75 put customer-facing endpoints under /public/
7580c75 is described below
commit 7580c75599d06f7a4a9ffe1cb79ca9859346d083
Author: Florian Dold <address@hidden>
AuthorDate: Mon Jan 29 18:06:08 2018 +0100
put customer-facing endpoints under /public/
---
src/backend/taler-merchant-httpd.c | 14 +++++++-------
src/backend/taler-merchant-httpd_check-payment.c | 2 +-
src/backend/taler-merchant-httpd_proposal.c | 2 +-
src/backend/taler-merchant-httpd_refund.c | 2 +-
src/backend/taler-merchant-httpd_tip-authorize.c | 2 +-
src/backend/taler-merchant-httpd_trigger-pay.c | 2 +-
src/lib/merchant_api_pay.c | 2 +-
src/lib/merchant_api_proposal.c | 4 ++--
src/lib/merchant_api_refund.c | 2 +-
src/lib/merchant_api_tip_pickup.c | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index d5be71b..5390b00 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -200,10 +200,10 @@ url_handler (void *cls,
{ "/", MHD_HTTP_METHOD_GET, "text/plain",
"Hello, I'm a merchant's Taler backend. This HTTP server is not for
humans.\n", 0,
&TMH_MHD_handler_static_response, MHD_HTTP_OK },
- { "/pay", MHD_HTTP_METHOD_POST, "application/json",
+ { "/public/pay", MHD_HTTP_METHOD_POST, "application/json",
NULL, 0,
&MH_handler_pay, MHD_HTTP_OK },
- { "/pay", NULL, "text/plain",
+ { "/public/pay", NULL, "text/plain",
"Only POST is allowed", 0,
&TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED },
{ "/track/transfer", MHD_HTTP_METHOD_GET, "application/json",
@@ -221,10 +221,10 @@ url_handler (void *cls,
{ "/history", MHD_HTTP_METHOD_GET, "text/plain",
"Only GET is allowed", 0,
&MH_handler_history, MHD_HTTP_OK},
- { "/proposal", MHD_HTTP_METHOD_POST, "application/json",
+ { "/order", MHD_HTTP_METHOD_POST, "application/json",
NULL, 0,
&MH_handler_proposal_put, MHD_HTTP_OK },
- { "/proposal", MHD_HTTP_METHOD_GET, "text/plain",
+ { "/public/proposal", MHD_HTTP_METHOD_GET, "text/plain",
NULL, 0,
&MH_handler_proposal_lookup, MHD_HTTP_OK},
{ "/proposal", NULL, "text/plain",
@@ -233,7 +233,7 @@ url_handler (void *cls,
{ "/refund", MHD_HTTP_METHOD_POST, "application/json",
NULL, 0,
&MH_handler_refund_increase, MHD_HTTP_OK},
- { "/refund", MHD_HTTP_METHOD_GET, "text/plain",
+ { "/public/refund", MHD_HTTP_METHOD_GET, "text/plain",
NULL, 0,
&MH_handler_refund_lookup, MHD_HTTP_OK},
{ "/refund", NULL, "application/json",
@@ -245,7 +245,7 @@ url_handler (void *cls,
{ "/tip-authorize", NULL, "application/json",
"Only POST is allowed", 0,
&TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED},
- { "/tip-pickup", MHD_HTTP_METHOD_POST, "text/plain",
+ { "/public/tip-pickup", MHD_HTTP_METHOD_POST, "text/plain",
NULL, 0,
&MH_handler_tip_pickup, MHD_HTTP_OK},
{ "/tip-pickup", NULL, "application/json",
@@ -257,7 +257,7 @@ url_handler (void *cls,
{ "/check-payment", MHD_HTTP_METHOD_GET, "text/plain",
NULL, 0,
&MH_handler_check_payment, MHD_HTTP_OK},
- { "/trigger-pay", MHD_HTTP_METHOD_GET, "text/plain",
+ { "/public/trigger-pay", MHD_HTTP_METHOD_GET, "text/plain",
NULL, 0,
&MH_handler_trigger_pay, MHD_HTTP_OK},
{NULL, NULL, NULL, NULL, 0, 0 }
diff --git a/src/backend/taler-merchant-httpd_check-payment.c
b/src/backend/taler-merchant-httpd_check-payment.c
index 7a24864..29cdbdb 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -314,7 +314,7 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
do_pay:
{
- char *url = TMH_make_absolute_backend_url (connection, "trigger-pay",
+ char *url = TMH_make_absolute_backend_url (connection,
"public/trigger-pay",
"contract_url",
final_contract_url,
"session_id", session_id,
"resource_url", resource_url,
diff --git a/src/backend/taler-merchant-httpd_proposal.c
b/src/backend/taler-merchant-httpd_proposal.c
index e67a5cf..a5756d1 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -261,7 +261,7 @@ proposal_put (struct MHD_Connection *connection,
char *url;
url = TMH_make_absolute_backend_url (connection,
- "pay",
+ "/public/pay",
NULL);
json_object_set_new (order,
"pay_url",
diff --git a/src/backend/taler-merchant-httpd_refund.c
b/src/backend/taler-merchant-httpd_refund.c
index c81db6e..faf3af6 100644
--- a/src/backend/taler-merchant-httpd_refund.c
+++ b/src/backend/taler-merchant-httpd_refund.c
@@ -301,7 +301,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
NULL);
GNUNET_assert (NULL != refund_pickup_url);
refund_redirect_url = TMH_make_absolute_backend_url (connection,
- "trigger-pay",
+ "public/trigger-pay",
"refund_url",
refund_pickup_url,
NULL);
diff --git a/src/backend/taler-merchant-httpd_tip-authorize.c
b/src/backend/taler-merchant-httpd_tip-authorize.c
index a4b48fb..3650acf 100644
--- a/src/backend/taler-merchant-httpd_tip-authorize.c
+++ b/src/backend/taler-merchant-httpd_tip-authorize.c
@@ -436,7 +436,7 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
"pickup_url", tac->pickup_url);
tip_token_str = json_dumps (tip_token, JSON_COMPACT);
GNUNET_assert (NULL != tip_token_str);
- tip_redirect_url = TMH_make_absolute_backend_url (connection,
"trigger-pay",
+ tip_redirect_url = TMH_make_absolute_backend_url (connection,
"public/trigger-pay",
"tip_token",
tip_token_str,
NULL);
GNUNET_assert (NULL != tip_redirect_url);
diff --git a/src/backend/taler-merchant-httpd_trigger-pay.c
b/src/backend/taler-merchant-httpd_trigger-pay.c
index 8a85404..1b0a7ba 100644
--- a/src/backend/taler-merchant-httpd_trigger-pay.c
+++ b/src/backend/taler-merchant-httpd_trigger-pay.c
@@ -15,7 +15,7 @@
*/
/**
* @file backend/taler-merchant-httpd_trigger-pay.c
- * @brief implementation of /trigger-pay handler
+ * @brief implementation of /public/trigger-pay handler
* @author Florian Dold
*/
#include "platform.h"
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index d8c5971..9b05467 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -565,7 +565,7 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
ph->pay_cb = pay_cb;
ph->pay_cb_cls = pay_cb_cls;
ph->url = MAH_path_to_url_ (merchant_url,
- "/pay");
+ "/public/pay");
ph->num_coins = num_coins;
ph->coins = GNUNET_new_array (num_coins,
struct TALER_MERCHANT_PaidCoin);
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index 9a82f75..17b2315 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -216,7 +216,7 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
po->cb = proposal_cb;
po->cb_cls = proposal_cb_cls;
po->url = MAH_path_to_url_ (backend_uri,
- "/proposal");
+ "/order");
req = json_pack ("{s:O}",
"order", (json_t *) order);
eh = curl_easy_init ();
@@ -374,7 +374,7 @@ TALER_MERCHANT_proposal_lookup (struct GNUNET_CURL_Context
*ctx,
plo->cb = plo_cb;
plo->cb_cls = plo_cb_cls;
base = MAH_path_to_url_ (backend_uri,
- "/proposal");
+ "/public/proposal");
if (NULL != nonce)
{
char *nonce_str;
diff --git a/src/lib/merchant_api_refund.c b/src/lib/merchant_api_refund.c
index d9b6157..75a7899 100644
--- a/src/lib/merchant_api_refund.c
+++ b/src/lib/merchant_api_refund.c
@@ -325,7 +325,7 @@ TALER_MERCHANT_refund_lookup (struct GNUNET_CURL_Context
*ctx,
rlo->cb_cls = cb_cls;
GNUNET_asprintf (&rlo->url,
- "%s/refund?instance=%s&order_id=%s",
+ "%s/public/refund?instance=%s&order_id=%s",
backend_uri,
instance,
order_id);
diff --git a/src/lib/merchant_api_tip_pickup.c
b/src/lib/merchant_api_tip_pickup.c
index 4e1df08..e5343e3 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -283,7 +283,7 @@ TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
tpo->cb = pickup_cb;
tpo->cb_cls = pickup_cb_cls;
tpo->url = MAH_path_to_url_ (backend_uri,
- "/tip-pickup");
+ "/public/tip-pickup");
if (NULL == (tpo->json_enc =
json_dumps (tp_obj,
JSON_COMPACT)))
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: put customer-facing endpoints under /public/,
gnunet <=