commit 7580c75599d06f7a4a9ffe1cb79ca9859346d083 parent 71c7b948b95d6a05826479bf7bc7ca13e3f06641 Author: Florian Dold <florian.dold@gmail.com> Date: Mon, 29 Jan 2018 18:06:08 +0100 put customer-facing endpoints under /public/ Diffstat:
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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)))