summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-08-07 00:31:54 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-08-07 00:31:54 +0530
commitb791a14c6118f4cdb1cf0257ab499324d3859e6d (patch)
tree9bba328d67e2894c2c54a735ebd99a24d3ccf39d /src/lib
parent5698d609efd715668e24c22e20fed9d952723852 (diff)
downloadmerchant-b791a14c6118f4cdb1cf0257ab499324d3859e6d.tar.gz
merchant-b791a14c6118f4cdb1cf0257ab499324d3859e6d.tar.bz2
merchant-b791a14c6118f4cdb1cf0257ab499324d3859e6d.zip
pass status URLs in template instead of using JS, fix remaining #6457 FIXMEs
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/merchant_api_tip_authorize.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/merchant_api_tip_authorize.c b/src/lib/merchant_api_tip_authorize.c
index d2f4cd9a..de71b747 100644
--- a/src/lib/merchant_api_tip_authorize.c
+++ b/src/lib/merchant_api_tip_authorize.c
@@ -83,11 +83,13 @@ static int
check_ok (struct TALER_MERCHANT_TipAuthorizeHandle *tao,
const json_t *json)
{
- const char *taler_tip_url;
+ const char *tip_status_url;
+ const char *taler_tip_uri;
struct GNUNET_HashCode tip_id;
struct GNUNET_TIME_Absolute expiration_time;
struct GNUNET_JSON_Specification spec[] = {
- GNUNET_JSON_spec_string ("tip_redirect_url", &taler_tip_url),
+ GNUNET_JSON_spec_string ("tip_status_url", &tip_status_url),
+ GNUNET_JSON_spec_string ("taler_tip_uri", &taler_tip_uri),
TALER_JSON_spec_absolute_time ("tip_expiration", &expiration_time),
GNUNET_JSON_spec_fixed_auto ("tip_id", &tip_id),
GNUNET_JSON_spec_end ()
@@ -116,7 +118,7 @@ check_ok (struct TALER_MERCHANT_TipAuthorizeHandle *tao,
tao->cb (tao->cb_cls,
&hr,
&tip_id,
- taler_tip_url,
+ taler_tip_uri,
expiration_time);
tao->cb = NULL; /* do not call twice */
GNUNET_JSON_parse_free (spec);