commit 7a1c1c6ed948abfde5a2d5dc7c935ff15352a6bb parent 3041f1111e5878b02c7ec48999966fd7c1a047d3 Author: Christian Grothoff <christian@grothoff.org> Date: Wed, 25 Mar 2026 23:40:15 +0100 fix MFA order (11295) and some EC codes Diffstat:
6 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c @@ -45,7 +45,6 @@ TMH_private_delete_donau_instance_ID (const struct TMH_RequestHandler *rh, char dummy; GNUNET_assert (NULL != mi); - if (1 != sscanf (hc->infix, "%lu%c", &donau_serial_id, @@ -67,20 +66,17 @@ TMH_private_delete_donau_instance_ID (const struct TMH_RequestHandler *rh, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, "delete_donau_instance"); - case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, "delete_donau_instance (soft)"); - case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: return TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, - TALER_EC_MERCHANT_GENERIC_INSTANCE_UNKNOWN, - hc->infix); - + TALER_EC_MERCHANT_GENERIC_DONAU_UNKNOWN, + NULL); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: return TALER_MHD_reply_static (connection, MHD_HTTP_NO_CONTENT, @@ -90,4 +86,4 @@ TMH_private_delete_donau_instance_ID (const struct TMH_RequestHandler *rh, } GNUNET_assert (0); return MHD_NO; -} -\ No newline at end of file +} diff --git a/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c @@ -29,10 +29,10 @@ MHD_RESULT -TMH_private_delete_instances_ID_token_SERIAL (const struct TMH_RequestHandler * - rh, - struct MHD_Connection *connection, - struct TMH_HandlerContext *hc) +TMH_private_delete_instances_ID_token_SERIAL ( + const struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + struct TMH_HandlerContext *hc) { struct TMH_MerchantInstance *mi = hc->instance; enum GNUNET_DB_QueryStatus qs; @@ -66,10 +66,11 @@ TMH_private_delete_instances_ID_token_SERIAL (const struct TMH_RequestHandler * TALER_EC_GENERIC_DB_STORE_FAILED, "delete_login_token_by_serial"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_NOT_FOUND, - TALER_EC_MERCHANT_GENERIC_CATEGORY_UNKNOWN, - hc->infix); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_NOT_FOUND, + TALER_EC_MERCHANT_GENERIC_ACCESS_TOKEN_UNKNOWN, + hc->infix); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: return TALER_MHD_reply_static (connection, MHD_HTTP_NO_CONTENT, diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c @@ -596,6 +596,11 @@ TMH_private_get_statistics_report_transactions ( .default_counter = 95, }, { + .name = "week", + .period = GNUNET_TIME_UNIT_WEEKS, + .default_counter = 12, + }, + { .name = "month", .period = GNUNET_TIME_UNIT_MONTHS, .default_counter = 36, @@ -744,7 +749,7 @@ TMH_private_get_statistics_report_transactions ( return TALER_MHD_reply_with_error ( connection, MHD_HTTP_NOT_IMPLEMENTED, - TALER_EC_EXCHANGE_GENERIC_NO_TYPST_OR_PDFTK, + TALER_EC_MERCHANT_GENERIC_NO_TYPST_OR_PDFTK, NULL); } GNUNET_CONTAINER_DLL_insert (rctx_head, diff --git a/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c @@ -335,14 +335,14 @@ patch_instances_ID (struct TMH_MerchantInstance *mi, ret = TMH_mfa_challenges_do (hc, TALER_MERCHANT_MFA_CO_INSTANCE_PROVISION, true, - TALER_MERCHANT_MFA_CHANNEL_SMS, - mi->settings.phone, TALER_MERCHANT_MFA_CHANNEL_EMAIL, mi->settings.email, - TALER_MERCHANT_MFA_CHANNEL_SMS, - is.phone, TALER_MERCHANT_MFA_CHANNEL_EMAIL, is.email, + TALER_MERCHANT_MFA_CHANNEL_SMS, + mi->settings.phone, + TALER_MERCHANT_MFA_CHANNEL_SMS, + is.phone, TALER_MERCHANT_MFA_CHANNEL_NONE); break; } diff --git a/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c b/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c @@ -125,10 +125,10 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi, ret = TMH_mfa_challenges_do (hc, TALER_MERCHANT_MFA_CO_AUTH_CONFIGURATION, true, - TALER_MERCHANT_MFA_CHANNEL_SMS, - mi->settings.phone, TALER_MERCHANT_MFA_CHANNEL_EMAIL, mi->settings.email, + TALER_MERCHANT_MFA_CHANNEL_SMS, + mi->settings.phone, TALER_MERCHANT_MFA_CHANNEL_NONE); break; } diff --git a/src/backend/taler-merchant-httpd_post-management-instances.c b/src/backend/taler-merchant-httpd_post-management-instances.c @@ -416,10 +416,10 @@ post_instances (const struct TMH_RequestHandler *rh, ret = TMH_mfa_challenges_do (hc, TALER_MERCHANT_MFA_CO_INSTANCE_PROVISION, true, - TALER_MERCHANT_MFA_CHANNEL_SMS, - is.phone, TALER_MERCHANT_MFA_CHANNEL_EMAIL, is.email, + TALER_MERCHANT_MFA_CHANNEL_SMS, + is.phone, TALER_MERCHANT_MFA_CHANNEL_NONE); break; }