taler-docs

commit 31e5e0753daccc69fccb5ae0b353969f838e0b60
parent 9f1626c7605b6b348135ca1e6bae80b28880e4c5
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 23 Apr 2023 17:48:26 +0200

gone

Diffstat:
M
core/api-exchange.rst
 | 
6
+++---
M
core/api-merchant.rst
 | 
33
+++++++++++++++++++++++++++++++++
M
manpages/taler.conf.5.rst
 | 
26
--------------------------

3 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
@@ -571,8 +571,8 @@ possibly by using HTTPS.
   .. ts:def:: AccountRestriction
 
     type AccountRestriction =
-      RegexAccountRestriction |
-      DenyAllAccountRestriction
+      | RegexAccountRestriction
+      | DenyAllAccountRestriction
 
   .. ts:def:: DenyAllAccountRestriction
 
@@ -2070,7 +2070,7 @@ Withdraw
 
   .. ts:def:: WithdrawPrepareResponse
 
-    type WithdrawPrepareResponse
+    type WithdrawPrepareResponse =
       | ExchangeWithdrawValue;
 
   .. ts:def:: ExchangeWithdrawValue
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
@@ -1223,11 +1223,44 @@ Inspecting instances
       // Salt used to compute h_wire.
       salt: HashCode;
 
+      // URL from where the merchant can download information
+      // about incoming wire transfers to this account.
+      credit_facade_url?: string;
+
+      // Credentials to use when accessing the credit facade.
+      credit_facade_credentials?: FacadeCredentials;
+
       // true if this account is active,
       // false if it is historic.
       active: boolean;
     }
 
+  .. ts:def:: FacadeCredentials
+
+    type FacadeCredentials =
+      | NoFacadeCredentials
+      | BasicAuthFacadeCredentials;
+
+  .. ts:def:: NoFacadeCredentials
+
+    interface NoFacadeCredentials {
+       type: "none";
+    };
+
+  .. ts:def:: BasicFacadeCredentials
+
+    interface BasicAuthFacadeCredentials {
+       type: "basic";
+
+       // Username to use to authenticate
+       username: string;
+
+       // Password to use to authenticate
+       password: string;
+    };
+
+
+
 
 Deleting instances
 ------------------
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
@@ -579,32 +579,6 @@ CURRENCY
   we use, which must be given in the ``[taler]`` section.
 
 
-MERCHANT WIREWATCH OPTIONS
---------------------------
-
-The name of the configuration section used by taler-merchant-wirewatch
-can be changed via the command-line. By default, it is simply
-"[taler-merchant-wirewatch]".  The options are:
-
-INSTANCE
-  Which instance of the backend should transactions be imported for by this wirewatcher.
-BACKEND_URL
-  URL of the taler merchant backend (including instance) to interact with.
-BACKEND_API_KEY
-  API key (including "secret-token:" prefix) to use to access the BACKEND_URL.
-WIRE_GATEWAY_URL
-  Under which URL is the wire gateway (libeufin facade) reachable that makes bank transfer data availalbe to us.
-WIRE_GATEWAY_AUTH_METHOD
-  Which authentication method should be used (currently only "NONE" or "BASIC" are supported).
-USERNAME
-  Username to give to the wire gateway when using "BASIC" authentication.
-PASSWORD
-  Password to give to the wire gateway when using "BASIC" authentication.
-
-Note that the libeufin facade type to configure for a taler-merchant-wirewatch
-operation is the "Anastasis" facade.
-
-
 AUDITOR OPTIONS
 ---------------