diff options
| author | Florian Dold <florian.dold@gmail.com> | 2019-08-26 01:28:38 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2019-08-26 01:28:38 +0200 |
| commit | 7eba0bcd293d10e49c0e6cb4011b0eda2e65f756 (patch) | |
| tree | 2d44f02d21aaabcee0a3dac39d3955686522c703 /src/lib | |
| parent | 42d19f3b3e5269c9ce61864265e60e47c34748cf (diff) | |
do not consider an order paid if last session id does not match
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/merchant_api_check_payment.c | 8 | ||||
| -rw-r--r-- | src/lib/test_merchant_api_twisted.c | 2 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_pay.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/merchant_api_check_payment.c b/src/lib/merchant_api_check_payment.c index eb5c4202..4605f476 100644 --- a/src/lib/merchant_api_check_payment.c +++ b/src/lib/merchant_api_check_payment.c @@ -111,11 +111,11 @@ handle_check_payment_finished (void *cls, if (! json_boolean_value (json_object_get (json, "paid"))) { - const char *payment_redirect_url = json_string_value (json_object_get (json, "payment_redirect_url")); - if (NULL == payment_redirect_url) + const char *fallback_request_payment_url = json_string_value (json_object_get (json, "fallback_request_payment_url")); + if (NULL == fallback_request_payment_url) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "no payment_redirect_url in unpaid check-payment response\n"); + "no fallback_request_payment_url in unpaid check-payment response\n"); GNUNET_break_op (0); cpo->cb (cpo->cb_cls, 0, @@ -131,7 +131,7 @@ handle_check_payment_finished (void *cls, GNUNET_NO, GNUNET_NO, &refund_amount, - payment_redirect_url); + fallback_request_payment_url); } TALER_MERCHANT_check_payment_cancel (cpo); return; diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c index f5403bf6..9646fd16 100644 --- a/src/lib/test_merchant_api_twisted.c +++ b/src/lib/test_merchant_api_twisted.c @@ -303,7 +303,7 @@ run (void *cls, TALER_TESTING_cmd_delete_object ("hack-check-payment-0", PROXY_MERCHANT_CONFIG_FILE, - "payment_redirect_url"), + "fallback_request_payment_url"), TALER_TESTING_cmd_check_payment ("check-payment-fail-invalid", twister_merchant_url, diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c index 68e8b22c..a9947a50 100644 --- a/src/lib/testing_api_cmd_pay.c +++ b/src/lib/testing_api_cmd_pay.c @@ -316,7 +316,7 @@ check_payment_cleanup (void *cls, * refunded (not refunded). * @param refund_amount the amount that was refunded to this * contract. - * @param payment_redirect_url URL where the payment has to be + * @param fallback_request_payment_url URL where the payment has to be * addressed. */ static void @@ -326,7 +326,7 @@ check_payment_cb (void *cls, int paid, int refunded, struct TALER_Amount *refund_amount, - const char *payment_redirect_url) + const char *fallback_request_payment_url) { struct CheckPaymentState *cps = cls; @@ -341,7 +341,7 @@ check_payment_cb (void *cls, paid); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "check payment: url: %s\n", - payment_redirect_url); + fallback_request_payment_url); if (paid != cps->expect_paid) TALER_TESTING_FAIL (cps->is); |