summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-08-30 10:44:00 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-08-30 10:44:00 +0200
commit68247a1449ed0f9559ee4e1b94fd76f5201bb43e (patch)
tree2c7a86e90c3a366b5b14e48f69141bd17b721ae3
parentcb8472b5b0750c2e6ff22b8e111c220fa189ba4d (diff)
downloadmerchant-68247a1449ed0f9559ee4e1b94fd76f5201bb43e.tar.gz
merchant-68247a1449ed0f9559ee4e1b94fd76f5201bb43e.tar.bz2
merchant-68247a1449ed0f9559ee4e1b94fd76f5201bb43e.zip
no more tip_redirect url, as we're moving to taler:// URIs
-rw-r--r--src/backend/taler-merchant-httpd_tip-authorize.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/backend/taler-merchant-httpd_tip-authorize.c b/src/backend/taler-merchant-httpd_tip-authorize.c
index 4a8ae032..381bb86a 100644
--- a/src/backend/taler-merchant-httpd_tip-authorize.c
+++ b/src/backend/taler-merchant-httpd_tip-authorize.c
@@ -282,7 +282,6 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
{
json_t *tip_token;
char *tip_token_str;
- char *tip_redirect_url;
tip_token = json_pack ("{s:o, s:o, s:o, s:s, s:s, s:s}",
"tip_id", GNUNET_JSON_from_data_auto (&tip_id),
@@ -293,23 +292,14 @@ 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 = TALER_url_absolute_mhd (connection, "public/trigger-pay",
- "tip_token", tip_token_str,
- NULL);
- GNUNET_assert (NULL != tip_redirect_url);
- /* FIXME: This is pretty redundant, but we want to support some older
- * merchant implementations. Newer ones should only get the
- * tip_redirect_url. */
res = TMH_RESPONSE_reply_json_pack (connection,
MHD_HTTP_OK,
"{s:o, s:o, s:s, s:o, s:s}",
"tip_id", GNUNET_JSON_from_data_auto (&tip_id),
"expiration", GNUNET_JSON_from_time_abs (expiration),
"exchange_url", mi->tip_exchange,
- "tip_token", tip_token,
- "tip_redirect_url", tip_redirect_url);
+ "tip_token", tip_token);
GNUNET_free (tip_token_str);
- GNUNET_free (tip_redirect_url);
return res;
}
}