diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-04-03 21:25:56 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-04-03 21:25:56 +0200 |
| commit | cf0d8b8511f727c4650f86241c0254f30f40362e (patch) | |
| tree | a4669a22e57482100d3d40342a73e7f9a5406769 /src/lib | |
| parent | ca4d806d18f1d6e135e3463cf4cad8271dff3219 (diff) | |
| download | merchant-cf0d8b8511f727c4650f86241c0254f30f40362e.tar.gz merchant-cf0d8b8511f727c4650f86241c0254f30f40362e.tar.bz2 merchant-cf0d8b8511f727c4650f86241c0254f30f40362e.zip | |
work on tipping logic to report exchange errors back to fontend
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/merchant_api_tip_authorize.c | 24 | ||||
| -rw-r--r-- | src/lib/test_merchant_api.c | 6 |
2 files changed, 22 insertions, 8 deletions
diff --git a/src/lib/merchant_api_tip_authorize.c b/src/lib/merchant_api_tip_authorize.c index b9218310..632ee24d 100644 --- a/src/lib/merchant_api_tip_authorize.c +++ b/src/lib/merchant_api_tip_authorize.c @@ -130,27 +130,40 @@ handle_tip_authorize_finished (void *cls, { struct TALER_MERCHANT_TipAuthorizeOperation *tao = cls; const json_t *json = response; + enum TALER_ErrorCode ec; tao->job = NULL; switch (response_code) { case MHD_HTTP_OK: - if (GNUNET_OK != check_ok (tao, - json)) + if (GNUNET_OK == + check_ok (tao, + json)) { - GNUNET_break_op (0); - response_code = 0; + TALER_MERCHANT_tip_authorize_cancel (tao); + return; } + GNUNET_break_op (0); + response_code = 0; + ec = TALER_EC_INVALID_RESPONSE; break; case MHD_HTTP_NOT_FOUND: /* Well-defined status code, pass on to application! */ + ec = TALER_JSON_get_error_code (json); break; case MHD_HTTP_PRECONDITION_FAILED: /* Well-defined status code, pass on to application! */ + ec = TALER_JSON_get_error_code (json); break; case MHD_HTTP_INTERNAL_SERVER_ERROR: /* Server had an internal issue; we should retry, but this API leaves this to the application */ + ec = TALER_JSON_get_error_code (json); + break; + case MHD_HTTP_SERVICE_UNAVAILABLE: + /* Server had an unclear (internal or external) issue; we should retry, + but this API leaves this to the application */ + ec = TALER_JSON_get_error_code (json); break; default: /* unexpected response code */ @@ -158,13 +171,14 @@ handle_tip_authorize_finished (void *cls, "Unexpected response code %u\n", (unsigned int) response_code); GNUNET_break (0); + ec = TALER_JSON_get_error_code (json); response_code = 0; break; } if (NULL != tao->cb) tao->cb (tao->cb_cls, response_code, - TALER_JSON_get_error_code (json), + ec, NULL, NULL); TALER_MERCHANT_tip_authorize_cancel (tao); } diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index 39248178..6791fac0 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -596,10 +596,10 @@ run (void *cls, TALER_TESTING_cmd_tip_authorize_with_ec ("authorize-tip-null", merchant_url_internal ("nulltip"), EXCHANGE_URL, - MHD_HTTP_NOT_FOUND, + MHD_HTTP_SERVICE_UNAVAILABLE, "tip 2", "EUR:5.01", - TALER_EC_RESERVE_STATUS_UNKNOWN), + TALER_EC_TIP_QUERY_RESERVE_UNKNOWN_TO_EXCHANGE), TALER_TESTING_cmd_tip_query ("query-tip-1", merchant_url_internal ("tip"), MHD_HTTP_OK), @@ -663,7 +663,7 @@ run (void *cls, TALER_TESTING_cmd_tip_authorize_with_ec ("authorize-tip-5-notip-instance", merchant_url, EXCHANGE_URL, - MHD_HTTP_NOT_FOUND, + MHD_HTTP_PRECONDITION_FAILED, "tip 5", "EUR:5.01", TALER_EC_TIP_AUTHORIZE_INSTANCE_DOES_NOT_TIP), |