From 5b3ded24a329d25b77372f17d75ff6b3d68bfa5d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 19 Aug 2021 15:11:17 +0200
Subject: document reducer return values for IBAN auth

---
 .../anastasis_authorization_plugin_iban.c          | 32 ++++++++--------------
 src/authorization/authorization-iban-messages.json |  4 +--
 2 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'src/authorization')

diff --git a/src/authorization/anastasis_authorization_plugin_iban.c b/src/authorization/anastasis_authorization_plugin_iban.c
index 4f43d3f..ef11b88 100644
--- a/src/authorization/anastasis_authorization_plugin_iban.c
+++ b/src/authorization/anastasis_authorization_plugin_iban.c
@@ -319,14 +319,6 @@ respond_with_challenge (struct ANASTASIS_AUTHORIZATION_State *as,
   /* Build HTTP response */
   {
     struct MHD_Response *resp;
-    const char *end;
-    size_t slen;
-
-    slen = strlen (as->iban_number);
-    if (slen > 4)
-      end = &as->iban_number[slen - 4];
-    else
-      end = &as->iban_number[slen / 2];
 
     if (TALER_MHD_xmime_matches (mime,
                                  "application/json"))
@@ -334,16 +326,17 @@ respond_with_challenge (struct ANASTASIS_AUTHORIZATION_State *as,
       resp = TALER_MHD_MAKE_JSON_PACK (
         GNUNET_JSON_pack_string ("method",
                                  "iban"),
-        TALER_JSON_pack_amount ("challenge_amount",
-                                &ctx->expected_amount),
-        GNUNET_JSON_pack_string ("credit_iban",
-                                 ctx->business_iban),
-        GNUNET_JSON_pack_string ("business_name",
-                                 ctx->business_name),
-        GNUNET_JSON_pack_uint64 ("wire_transfer_subject",
-                                 as->code),
-        GNUNET_JSON_pack_string ("debit_account_hint",
-                                 end));
+        GNUNET_JSON_pack_object_steal (
+          "details",
+          GNUNET_JSON_PACK (
+            TALER_JSON_pack_amount ("challenge_amount",
+                                    &ctx->expected_amount),
+            GNUNET_JSON_pack_string ("credit_iban",
+                                     ctx->business_iban),
+            GNUNET_JSON_pack_string ("business_name",
+                                     ctx->business_name),
+            GNUNET_JSON_pack_uint64 ("wire_transfer_subject",
+                                     as->code))));
     }
     else
     {
@@ -357,8 +350,7 @@ respond_with_challenge (struct ANASTASIS_AUTHORIZATION_State *as,
                                    TALER_amount2s (&ctx->expected_amount),
                                    ctx->business_name,
                                    ctx->business_iban,
-                                   (unsigned long long) as->code,
-                                   end);
+                                   (unsigned long long) as->code);
       resp = MHD_create_response_from_buffer (reply_len,
                                               reply,
                                               MHD_RESPMEM_MUST_COPY);
diff --git a/src/authorization/authorization-iban-messages.json b/src/authorization/authorization-iban-messages.json
index 8c6295b..9575856 100644
--- a/src/authorization/authorization-iban-messages.json
+++ b/src/authorization/authorization-iban-messages.json
@@ -1,6 +1,6 @@
 {
-    "instructions" : "To authorize recovery, wire %s to %s at %s using a wire transfer subject of %llu from your bank account ending with %s",
+    "instructions" : "To authorize recovery, wire %s to %s at %s using a wire transfer subject of 'Anastasis %llu' from your bank account",
     "instructions_i18n" : {
-        "en_EN" : "To authorize recovery, wire %s to %s at %s using a wire transfer subject of %llu from your bank account ending with %s"
+        "en_EN" : "To authorize recovery, wire %s to %s at %s using a wire transfer subject of 'Anastasis %llu' from your bank account"
     }
 }
-- 
cgit v1.2.3