diff options
| author | Florian Dold <florian.dold@gmail.com> | 2019-08-26 20:27:23 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2019-08-26 20:27:23 +0200 |
| commit | 5d128a1adc0acf084949c195451bb1e4b23c20ab (patch) | |
| tree | e5112d7576f64ea66fdc450a528190faaf841fc1 | |
| parent | 8da3379c0a4ec94aa0a6d665307ef0191dee16ec (diff) | |
| download | merchant-5d128a1adc0acf084949c195451bb1e4b23c20ab.tar.gz merchant-5d128a1adc0acf084949c195451bb1e4b23c20ab.tar.bz2 merchant-5d128a1adc0acf084949c195451bb1e4b23c20ab.zip | |
get completely rid of trigger-pay
| -rw-r--r-- | src/backend/Makefile.am | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_trigger-pay.c | 112 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_trigger-pay.h | 45 |
3 files changed, 0 insertions, 158 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index f5476df0..cd221caf 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -30,7 +30,6 @@ taler_merchant_httpd_SOURCES = \ taler-merchant-httpd_track-transfer.c taler-merchant-httpd_track-transfer.h \ taler-merchant-httpd_refund.c taler-merchant-httpd_refund.h \ taler-merchant-httpd_check-payment.c taler-merchant-httpd_check-payment.h \ - taler-merchant-httpd_trigger-pay.c taler-merchant-httpd_trigger-pay.h \ taler-merchant-httpd_config.c taler-merchant-httpd_config.h diff --git a/src/backend/taler-merchant-httpd_trigger-pay.c b/src/backend/taler-merchant-httpd_trigger-pay.c deleted file mode 100644 index 96ee48db..00000000 --- a/src/backend/taler-merchant-httpd_trigger-pay.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - This file is part of TALER - (C) 2017 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> -*/ -/** - * @file backend/taler-merchant-httpd_trigger-pay.c - * @brief implementation of /public/trigger-pay handler - * @author Florian Dold - */ -#include "platform.h" -#include <string.h> -#include <microhttpd.h> -#include <jansson.h> -#include <taler/taler_json_lib.h> -#include <taler/taler_signatures.h> -#include "taler-merchant-httpd.h" -#include "taler-merchant-httpd_mhd.h" -#include "taler-merchant-httpd_parsing.h" -#include "taler-merchant-httpd_exchanges.h" -#include "taler-merchant-httpd_responses.h" -#include "taler-merchant-httpd_trigger-pay.h" - - -/** - * Add a header to the response from a query parameter. - * - * - * @param connection connection to take query parameters from - * @param arg_name name of query parameter - * @param response response that receives the header - * @param header_name name of the header to set - */ -static void -add_header_from_arg (struct MHD_Connection *connection, - const char *arg_name, - struct MHD_Response *response, - const char *header_name) -{ - const char *arg = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - arg_name); - if (NULL == arg) - return; - GNUNET_break (MHD_YES == - MHD_add_response_header (response, header_name, arg)); -} - - -/** - * Serves a request to browsers to trigger a payment. - * Contains all the logic to handle different platforms, so that the frontend - * does not have to handle that. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -MH_handler_trigger_pay (struct TMH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size) -{ - struct MHD_Response *response; - // FIXME: Taler wallet detection! - char *data = "<html><body><p>Processing payment ...</p></body></html>"; - - response = MHD_create_response_from_buffer (strlen (data), - data, - MHD_RESPMEM_PERSISTENT); - add_header_from_arg (connection, - "session_id", - response, - "Taler-Session-Id"); - add_header_from_arg (connection, - "contract_url", - response, - "Taler-Contract-Url"); - add_header_from_arg (connection, - "tip_token", - response, - "Taler-Tip"); - add_header_from_arg (connection, - "refund_url", - response, - "Taler-Refund-Url"); - add_header_from_arg (connection, - "resource_url", - response, - "Taler-Resource-Url"); - - MHD_queue_response (connection, - MHD_HTTP_PAYMENT_REQUIRED, - response); - MHD_destroy_response (response); - return MHD_YES; -} diff --git a/src/backend/taler-merchant-httpd_trigger-pay.h b/src/backend/taler-merchant-httpd_trigger-pay.h deleted file mode 100644 index b3957725..00000000 --- a/src/backend/taler-merchant-httpd_trigger-pay.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - This file is part of TALER - (C) 2018 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> -*/ -/** - * @file backend/taler-merchant-httpd_trigger-pay.h - * @brief headers for /trigger-pay handler - * @author Florian Dold - */ -#ifndef TALER_MERCHANT_HTTPD_TRIGGER_PAY_H -#define TALER_MERCHANT_HTTPD_TRIGGER_PAY_H -#include <microhttpd.h> -#include "taler-merchant-httpd.h" - -/** - * Serves a request to browsers to trigger a payment. - * Contains all the logic to handle different platforms, so that the frontend - * does not have to handle that. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -MH_handler_trigger_pay (struct TMH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size); - -#endif |