new CRUD APIs for OTP devices and merchant accounts (fixes #7929, #7824), one minor test is still failing...

1 files changed, 778 insertions, 215 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index c41080be..e92ea3b8 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -524,37 +524,11 @@ typedef void
 
 
 /**
- * Information about an account of the merchant.
- */
-struct TALER_MERCHANT_AccountConfig
-{
-  /**
-   * Payto URI of the account.
-   */
-  const char *payto_uri;
-
-  /**
-   * Optional credit facade for the account.
-   * Can be NULL.
-   */
-  const char *credit_facade_url;
-
-  /**
-   * Credit facade credentials for the account.
-   * Can be NULL.
-   */
-  json_t *credit_facade_credentials;
-
-};
-
-/**
  * Setup an new instance in the backend.
  *
  * @param ctx the context
  * @param backend_url HTTP base URL for the backend
  * @param instance_id identity of the instance to get information about
- * @param accounts_length how many bank accounts this instance has
- * @param accounts the bank accounts of the merchant instance
  * @param name name of the merchant instance
  * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
@@ -573,8 +547,6 @@ TALER_MERCHANT_instances_post (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *instance_id,
-  unsigned int accounts_length,
-  const struct TALER_MERCHANT_AccountConfig accounts[],
   const char *name,
   enum TALER_KYCLOGIC_KycUserType ut,
   const json_t *address,
@@ -599,126 +571,6 @@ TALER_MERCHANT_instances_post_cancel (
 
 
 /**
- * Handle for a POST /instances/$ID/account operation.
- */
-struct TALER_MERCHANT_AccountPostHandle;
-
-
-/**
- * Response for a POST /instances/$ID/account operation.
- */
-struct TALER_MERCHANT_AccountPostResponse
-{
-  /**
-   * HTTP response data
-   */
-  struct TALER_MERCHANT_HttpResponse hr;
-};
-
-
-/**
- * Function called with the result of the POST /instances/$ID/account operation.
- *
- * @param cls closure
- * @param par response data
- */
-typedef void
-(*TALER_MERCHANT_AccountPostCallback)(
-  void *cls,
-  const struct TALER_MERCHANT_AccountPostResponse *par);
-
-
-/**
- * Setup an new account for an instance in the backend.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param account the bank accounts to add to the merchant instance
- * @param cb function to call with the response
- * @param cb_cls closure for @a config_cb
- * @return the instances handle; NULL upon error
- */
-struct TALER_MERCHANT_AccountPostHandle *
-TALER_MERCHANT_account_post (
-  struct GNUNET_CURL_Context *ctx,
-  const char *backend_url,
-  const struct TALER_MERCHANT_AccountConfig *account,
-  TALER_MERCHANT_AccountPostCallback cb,
-  void *cb_cls);
-
-
-/**
- * Cancel /account request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param pah request to cancel.
- */
-void
-TALER_MERCHANT_account_post_cancel (
-  struct TALER_MERCHANT_AccountPostHandle *pah);
-
-
-/**
- * Handle for a DELETE /instances/$ID/account/$H_WIRE operation.
- */
-struct TALER_MERCHANT_AccountDeleteHandle;
-
-
-/**
- * Response for a DELETE /instances/$ID/account operation.
- */
-struct TALER_MERCHANT_AccountDeleteResponse
-{
-  /**
-   * HTTP response data
-   */
-  struct TALER_MERCHANT_HttpResponse hr;
-};
-
-
-/**
- * Function called with the result of the DELETE /instances/$ID/account/$H_WIRE operation.
- *
- * @param cls closure
- * @param par response data
- */
-typedef void
-(*TALER_MERCHANT_AccountDeleteCallback)(
-  void *cls,
-  const struct TALER_MERCHANT_AccountDeleteResponse *par);
-
-
-/**
- * Remove bank account from an instance in the backend.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param h_wire wire hash of the bank accounts to delete
- * @param cb function to call with the response
- * @param cb_cls closure for @a config_cb
- * @return the instances handle; NULL upon error
- */
-struct TALER_MERCHANT_AccountDeleteHandle *
-TALER_MERCHANT_account_delete (
-  struct GNUNET_CURL_Context *ctx,
-  const char *backend_url,
-  const struct TALER_MerchantWireHashP *h_wire,
-  TALER_MERCHANT_AccountDeleteCallback cb,
-  void *cb_cls);
-
-
-/**
- * Cancel /account request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param pah request to cancel.
- */
-void
-TALER_MERCHANT_account_delete_cancel (
-  struct TALER_MERCHANT_AccountDeleteHandle *pah);
-
-
-/**
  * Handle for a PATCH /instances/$ID operation.
  */
 struct TALER_MERCHANT_InstancePatchHandle;
@@ -744,8 +596,6 @@ typedef void
  *                    or base URL of an instance if @a instance_id is NULL)
  * @param instance_id identity of the instance to modify information about; NULL
  *                    if the instance is identified as part of the @a backend_url
- * @param accounts_length length of the @a accounts array
- * @param accounts the bank accounts of the merchant instance
  * @param name name of the merchant instance
  * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
@@ -763,8 +613,6 @@ TALER_MERCHANT_instance_patch (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *instance_id,
-  unsigned int accounts_length,
-  const struct TALER_MERCHANT_AccountConfig accounts[static accounts_length],
   const char *name,
   enum TALER_KYCLOGIC_KycUserType ut,
   const json_t *address,
@@ -848,39 +696,6 @@ struct TALER_MERCHANT_InstanceGetHandle;
 
 
 /**
- * Details about a merchant's bank account.
- */
-struct TALER_MERCHANT_Account
-{
-  /**
-   * salt used to compute h_wire
-   */
-  struct TALER_WireSaltP salt;
-
-  /**
-   * payto:// URI of the account.
-   */
-  const char *payto_uri;
-
-  /**
-   * Credit facade URL of the account.
-   */
-  const char *credit_facade_url;
-
-  /**
-   * Hash of @e payto_uri and @e salt.
-   */
-  struct TALER_MerchantWireHashP h_wire;
-
-  /**
-   * true if the account is active,
-   * false if it is historic.
-   */
-  bool active;
-};
-
-
-/**
  * Details about an instance.
  */
 struct TALER_MERCHANT_InstanceDetails
@@ -944,16 +759,6 @@ struct TALER_MERCHANT_InstanceGetResponse
     struct
     {
       /**
-       * Length of the @e accounts array.
-       */
-      unsigned int accounts_length;
-
-      /**
-       * bank accounts of the merchant instance
-       */
-      const struct TALER_MERCHANT_Account *accounts;
-
-      /**
        * Details about the instance.
        */
       struct TALER_MERCHANT_InstanceDetails details;
@@ -1093,6 +898,420 @@ TALER_MERCHANT_instance_delete_cancel (
   TALER_MERCHANT_instance_delete_cancel (arg)
 
 
+/* *************** Accounts **************** */
+
+/**
+ * Handle for a POST /instances/$ID/accounts operation.
+ */
+struct TALER_MERCHANT_AccountsPostHandle;
+
+
+/**
+ * Response for a POST /instances/$ID/account operation.
+ */
+struct TALER_MERCHANT_AccountsPostResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  /**
+   * Details depending on HTTP status.
+   */
+  union {
+
+    /**
+     * Details returned on #MHD_HTTP_OK.
+     */
+    struct {
+
+      /**
+       * Hash of @e payto_uri and @e salt.
+       */
+      struct TALER_MerchantWireHashP h_wire;
+
+      /**
+       * salt used to compute h_wire
+       */
+      struct TALER_WireSaltP salt;
+    } ok;
+
+  } details;
+};
+
+
+/**
+ * Function called with the result of the POST /instances/$ID/accounts operation.
+ *
+ * @param cls closure
+ * @param par response data
+ */
+typedef void
+(*TALER_MERCHANT_AccountsPostCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_AccountsPostResponse *par);
+
+
+/**
+ * Setup an new account for an instance in the backend.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param payto_uri URI of the bank account as per RFC 8905
+ * @param credit_facade_url credit facade for the account, can be NULL
+ * @param credit_facade_credentials credentials for credit facade, can be NULL
+ * @param account the bank accounts to add to the merchant instance
+ * @param cb function to call with the response
+ * @param cb_cls closure for @a config_cb
+ * @return the instances handle; NULL upon error
+ */
+struct TALER_MERCHANT_AccountsPostHandle *
+TALER_MERCHANT_accounts_post (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *payto_uri,
+  const char *credit_facade_url,
+  const json_t *credit_facade_credentials,
+  TALER_MERCHANT_AccountsPostCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel POST /accounts request.  Must not be called by clients after
+ * the callback was invoked.
+ *
+ * @param pah request to cancel.
+ */
+void
+TALER_MERCHANT_accounts_post_cancel (
+  struct TALER_MERCHANT_AccountsPostHandle *pah);
+
+
+/**
+ * Handle for a GET /accounts/$ID operation.
+ */
+struct TALER_MERCHANT_AccountGetHandle;
+
+
+/**
+ * Details about a merchant's bank account.
+ */
+struct TALER_MERCHANT_AccountDetails
+{
+  /**
+   * salt used to compute h_wire
+   */
+  struct TALER_WireSaltP salt;
+
+  /**
+   * payto:// URI of the account.
+   */
+  const char *payto_uri;
+
+  /**
+   * Credit facade URL of the account.
+   */
+  const char *credit_facade_url;
+
+  /**
+   * Hash of @e payto_uri and @e salt.
+   */
+  struct TALER_MerchantWireHashP h_wire;
+
+  /**
+   * true if the account is active,
+   * false if it is historic.
+   */
+  bool active;
+};
+
+
+/**
+ * Response returned with details about an account.
+ */
+struct TALER_MERCHANT_AccountGetResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  union
+  {
+
+    /**
+     * Data returned on #MHD_HTTP_OK.
+     */
+    struct
+    {
+
+      /**
+       * bank accounts of the merchant instance
+       */
+      struct TALER_MERCHANT_AccountDetails ad;
+
+    } ok;
+  }
+  details;
+};
+
+
+/**
+ * Function called with the result of the GET /instances/$ID/accounts/$H_WIRE operation.
+ *
+ * @param cls closure
+ * @param igr response details
+ */
+typedef void
+(*TALER_MERCHANT_AccountGetCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_AccountGetResponse *igr);
+
+
+/**
+ * Get the details on one of the accounts of an instance. Will connect to the
+ * merchant backend and obtain information about the account.  The respective
+ * information will be passed to the @a cb once available.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param instance_id identity of the instance to get information about
+ * @param h_wire hash of the wire details
+ * @param cb function to call with the
+ *        backend's instances information
+ * @param cb_cls closure for @a config_cb
+ * @return the instances handle; NULL upon error
+ */
+struct TALER_MERCHANT_AccountGetHandle *
+TALER_MERCHANT_account_get (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *instance_id,
+  const struct TALER_MerchantWireHashP *h_wire,
+  TALER_MERCHANT_AccountGetCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel GET /accounts/$H_WIRE request.  Must not be called by clients after
+ * the callback was invoked.
+ *
+ * @param igh request to cancel.
+ */
+void
+TALER_MERCHANT_account_get_cancel (
+  struct TALER_MERCHANT_AccountGetHandle *igh);
+
+
+/**
+ * Handle for a GET /accounts operation.
+ */
+struct TALER_MERCHANT_AccountsGetHandle;
+
+/**
+ * Individual account (minimal information
+ * returned via GET /accounts).
+ */
+struct TALER_MERCHANT_AccountEntry
+{
+  /**
+   * account payto URI.
+   */
+  const char *payto_uri;
+
+  /**
+   * Hash of @e payto_uri and salt.
+   */
+  struct TALER_MerchantWireHashP h_wire;
+
+};
+
+
+/**
+ * Response to a GET /accounts operation.
+ */
+struct TALER_MERCHANT_AccountsGetResponse
+{
+  /**
+   * HTTP response details
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  /**
+   * Details depending on status.
+   */
+  union
+  {
+    /**
+     * Details if status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * length of the @e accounts array
+       */
+      unsigned int accounts_length;
+
+      /**
+       * array of accounts the requested instance offers
+       */
+      const struct TALER_MERCHANT_AccountEntry *accounts;
+    } ok;
+  } details;
+};
+
+
+/**
+ * Function called with the result of the GET /accounts operation.
+ *
+ * @param cls closure
+ * @param tgr response details
+ */
+typedef void
+(*TALER_MERCHANT_AccountsGetCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_AccountsGetResponse *tgr);
+
+
+/**
+ * Make a GET /accounts request.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param cb function to call with the backend information
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_AccountsGetHandle *
+TALER_MERCHANT_accounts_get (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  TALER_MERCHANT_AccountsGetCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel GET /accounts operation.
+ *
+ * @param tgh operation to cancel
+ */
+void
+TALER_MERCHANT_accounts_get_cancel (
+  struct TALER_MERCHANT_AccountsGetHandle *tgh);
+
+
+/**
+ * Handle for a PATCH /account operation.
+ */
+struct TALER_MERCHANT_AccountPatchHandle;
+
+
+/**
+ * Function called with the result of the PATCH /account operation.
+ *
+ * @param cls closure
+ * @param hr HTTP response details
+ */
+typedef void
+(*TALER_MERCHANT_AccountPatchCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_HttpResponse *hr);
+
+
+/**
+ * Make a PATCH /accounts/$H_WIRE request to update account details. Cannot be used to change the payto URI or the salt.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param h_wire identifies the account to patch
+ * @param credit_facade_url credit facade for the account, can be NULL
+ * @param credit_facade_credentials credentials for credit facade, can be NULL
+ * @param cb function to call with the backend's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_AccountPatchHandle *
+TALER_MERCHANT_account_patch (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const char *credit_facade_url,
+  const json_t *credit_facade_credentials,
+  TALER_MERCHANT_AccountPatchCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel PATCH /accounts/$H_WIRE operation.
+ *
+ * @param[in] tph operation to cancel
+ */
+void
+TALER_MERCHANT_account_patch_cancel (
+  struct TALER_MERCHANT_AccountPatchHandle *tph);
+
+
+/**
+ * Handle for a DELETE /instances/$ID/account/$H_WIRE operation.
+ */
+struct TALER_MERCHANT_AccountDeleteHandle;
+
+
+/**
+ * Response for a DELETE /instances/$ID/account operation.
+ */
+struct TALER_MERCHANT_AccountDeleteResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+};
+
+
+/**
+ * Function called with the result of the DELETE /instances/$ID/account/$H_WIRE operation.
+ *
+ * @param cls closure
+ * @param par response data
+ */
+typedef void
+(*TALER_MERCHANT_AccountDeleteCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_AccountDeleteResponse *par);
+
+
+/**
+ * Remove bank account from an instance in the backend.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param h_wire wire hash of the bank accounts to delete
+ * @param cb function to call with the response
+ * @param cb_cls closure for @a config_cb
+ * @return the instances handle; NULL upon error
+ */
+struct TALER_MERCHANT_AccountDeleteHandle *
+TALER_MERCHANT_account_delete (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const struct TALER_MerchantWireHashP *h_wire,
+  TALER_MERCHANT_AccountDeleteCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel /account request.  Must not be called by clients after
+ * the callback was invoked.
+ *
+ * @param pah request to cancel.
+ */
+void
+TALER_MERCHANT_account_delete_cancel (
+  struct TALER_MERCHANT_AccountDeleteHandle *pah);
+
+
 /* ********************* /products *********************** */
 
 
@@ -4922,6 +5141,364 @@ TALER_MERCHANT_kyc_get_cancel (
   struct TALER_MERCHANT_KycGetHandle *kyc);
 
 
+/* ********************* /otp-devices *********************** */
+
+
+/**
+ * Handle for a GET /otp-devices operation.
+ */
+struct TALER_MERCHANT_OtpDevicesGetHandle;
+
+/**
+ * Individual OTP device (minimal information
+ * returned via GET /otp-devices).
+ */
+struct TALER_MERCHANT_OtpDeviceEntry
+{
+  /**
+   * OTP device identifier.
+   */
+  const char *otp_device_id;
+
+  /**
+   * OTP device description.
+   */
+  const char *device_description;
+
+};
+
+
+/**
+ * Response to a GET /otp-devices operation.
+ */
+struct TALER_MERCHANT_OtpDevicesGetResponse
+{
+  /**
+   * HTTP response details
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  /**
+   * Details depending on status.
+   */
+  union
+  {
+    /**
+     * Details if status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * length of the @e otp_devices array
+       */
+      unsigned int otp_devices_length;
+
+      /**
+       * array of otp_devices the requested instance offers
+       */
+      const struct TALER_MERCHANT_OtpDeviceEntry *otp_devices;
+    } ok;
+  } details;
+};
+
+
+/**
+ * Function called with the result of the GET /otp-devices operation.
+ *
+ * @param cls closure
+ * @param tgr response details
+ */
+typedef void
+(*TALER_MERCHANT_OtpDevicesGetCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_OtpDevicesGetResponse *tgr);
+
+
+/**
+ * Make a GET /otp-devices request.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param cb function to call with the backend information
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_OtpDevicesGetHandle *
+TALER_MERCHANT_otp_devices_get (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  TALER_MERCHANT_OtpDevicesGetCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel GET /otp-devices operation.
+ *
+ * @param tgh operation to cancel
+ */
+void
+TALER_MERCHANT_otp_devices_get_cancel (
+  struct TALER_MERCHANT_OtpDevicesGetHandle *tgh);
+
+
+/**
+ * Handle for a GET /otp-device/$ID operation. Gets details
+ * about a single otp_device. Do not confused with a
+ * `struct TALER_MERCHANT_OtpDevicesGetHandle`, which
+ * obtains a list of all otp_devices.
+ */
+struct TALER_MERCHANT_OtpDeviceGetHandle;
+
+
+/**
+ * Details in a response to a GET /otp-devices request.
+ */
+struct TALER_MERCHANT_OtpDeviceGetResponse
+{
+  /**
+   * HTTP response details.
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Information returned if the status was #MHD_HTTP_OK.
+     */
+    struct
+    {
+
+      /**
+       * description of the otp_device
+       */
+      const char *otp_device_description;
+
+      /**
+       * OTP device key.
+       */
+      const char *otp_key;
+
+      /**
+       * current counter.
+       */
+      uint64_t otp_ctr;
+
+      /**
+       * OTP algorithm used.
+       */
+      enum TALER_MerchantConfirmationAlgorithm otp_alg;
+
+    } ok;
+
+  } details;
+
+};
+
+
+/**
+ * Function called with the result of the GET /otp-device/$ID operation.
+ *
+ * @param cls closure
+ * @param tgr HTTP response details
+ */
+typedef void
+(*TALER_MERCHANT_OtpDeviceGetCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_OtpDeviceGetResponse *tgr);
+
+
+/**
+ * Make a GET /otp-device/$ID request to get details about an
+ * individual OTP device.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param otp_device_id identifier of the otp_device to inquire about
+ * @param cb function to call with the backend's otp_device information
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_OtpDeviceGetHandle *
+TALER_MERCHANT_otp_device_get (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *otp_device_id,
+  TALER_MERCHANT_OtpDeviceGetCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel GET /otp-devices/$ID operation.
+ *
+ * @param tgh operation to cancel
+ */
+void
+TALER_MERCHANT_otp_device_get_cancel (
+  struct TALER_MERCHANT_OtpDeviceGetHandle *tgh);
+
+
+/**
+ * Handle for a POST /otp-devices operation.
+ */
+struct TALER_MERCHANT_OtpDevicesPostHandle;
+
+
+/**
+ * Function called with the result of the POST /otp-devices operation.
+ *
+ * @param cls closure
+ * @param hr HTTP response details
+ */
+typedef void
+(*TALER_MERCHANT_OtpDevicesPostCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_HttpResponse *hr);
+
+
+/**
+ * Make a POST /otp-devices request to add an OTP device
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param otp_id identifier to use for the OTP device
+ * @param otp_device_description description of the OTP device
+ * @param otp_key key of the OTP device
+ * @param otp_alg OTP algorithm used
+ * @param otp_ctr counter for counter-based OTP
+ * @param cb function to call with the backend's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_OtpDevicesPostHandle *
+TALER_MERCHANT_otp_devices_post (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *otp_id,
+  const char *otp_device_description,
+  const char *otp_key,
+  enum TALER_MerchantConfirmationAlgorithm otp_alg,
+  uint64_t otp_ctr,
+  TALER_MERCHANT_OtpDevicesPostCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel POST /otp-devices operation.
+ *
+ * @param[in] tph operation to cancel
+ */
+void
+TALER_MERCHANT_otp_devices_post_cancel (
+  struct TALER_MERCHANT_OtpDevicesPostHandle *tph);
+
+
+/**
+ * Handle for a PATCH /otp-device operation.
+ */
+struct TALER_MERCHANT_OtpDevicePatchHandle;
+
+
+/**
+ * Function called with the result of the PATCH /otp-device operation.
+ *
+ * @param cls closure
+ * @param hr HTTP response details
+ */
+typedef void
+(*TALER_MERCHANT_OtpDevicePatchCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_HttpResponse *hr);
+
+
+/**
+ * Make a PATCH /otp-device request to update OTP device details
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param otp_id identifier to use for the OTP device; the OTP device must exist,
+ *                    or the transaction will fail with a #MHD_HTTP_NOT_FOUND
+ *                    HTTP status code
+ * @param otp_device_description description of the otp_device
+ * @param otp_key key of the OTP device
+ * @param otp_alg OTP algorithm used
+ * @param otp_ctr counter for counter-based OTP
+ * @param cb function to call with the backend's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_OtpDevicePatchHandle *
+TALER_MERCHANT_otp_device_patch (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *otp_id,
+  const char *otp_device_description,
+  const char *otp_key,
+  enum TALER_MerchantConfirmationAlgorithm otp_alg,
+  uint64_t otp_ctr,
+  TALER_MERCHANT_OtpDevicePatchCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel PATCH /otp-device operation.
+ *
+ * @param[in] tph operation to cancel
+ */
+void
+TALER_MERCHANT_otp_device_patch_cancel (
+  struct TALER_MERCHANT_OtpDevicePatchHandle *tph);
+
+
+/**
+ * Handle for a DELETE /otp-device/$ID operation.
+ */
+struct TALER_MERCHANT_OtpDeviceDeleteHandle;
+
+
+/**
+ * Function called with the result of the DELETE /otp-device/$ID operation.
+ *
+ * @param cls closure
+ * @param hr HTTP response details
+ */
+typedef void
+(*TALER_MERCHANT_OtpDeviceDeleteCallback)(
+  void *cls,
+  const struct TALER_MERCHANT_HttpResponse *hr);
+
+
+/**
+ * Make a DELETE /otp-device/$ID request to delete an OTP device.
+ *
+ * @param ctx the context
+ * @param backend_url HTTP base URL for the backend
+ * @param otp_device_id identifier of the OTP device
+ * @param cb function to call with the backend's deletion status
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_MERCHANT_OtpDeviceDeleteHandle *
+TALER_MERCHANT_otp_device_delete (
+  struct GNUNET_CURL_Context *ctx,
+  const char *backend_url,
+  const char *otp_device_id,
+  TALER_MERCHANT_OtpDeviceDeleteCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel DELETE /otp-device/$ID operation.
+ *
+ * @param[in] tdh operation to cancel
+ */
+void
+TALER_MERCHANT_otp_device_delete_cancel (
+  struct TALER_MERCHANT_OtpDeviceDeleteHandle *tdh);
+
+
 /* ********************* /templates *********************** */
 
 
@@ -5053,25 +5630,15 @@ struct TALER_MERCHANT_TemplateGetResponse
       const char *template_description;
 
       /**
-       * Shared key with the POS
+       * OTP device ID used by the POS, NULL if none.
        */
-      const char *pos_key;
-
-      /**
-       * Option that add amount of the order
-       */
-      const enum TALER_MerchantConfirmationAlgorithm pos_alg;
+      const char *otp_id;
 
       /**
        * Template for the contract.
        */
       const json_t *template_contract;
 
-      /**
-       * Algorithm used to generate confirmations for the merchant.
-       */
-      enum TALER_MerchantConfirmationAlgorithm mca;
-
     } ok;
 
   } details;
@@ -5146,8 +5713,7 @@ typedef void
  * @param backend_url HTTP base URL for the backend
  * @param template_id identifier to use for the template
  * @param template_description description of the template
- * @param pos_key shared key with the POS
- * @param mca algorithm used to generate confirmations
+ * @param otp_id ID of the OTP device, or NULL if OTP is not used
  * @param template_contract is the contract of the company
  * @param cb function to call with the backend's result
  * @param cb_cls closure for @a cb
@@ -5159,8 +5725,7 @@ TALER_MERCHANT_templates_post (
   const char *backend_url,
   const char *template_id,
   const char *template_description,
-  const char *pos_key,
-  enum TALER_MerchantConfirmationAlgorithm mca,
+  const char *otp_id,
   const json_t *template_contract,
   TALER_MERCHANT_TemplatesPostCallback cb,
   void *cb_cls);
@@ -5203,8 +5768,7 @@ typedef void
  *                    or the transaction will fail with a #MHD_HTTP_NOT_FOUND
  *                    HTTP status code
  * @param template_description description of the template
- * @param pos_key shared key with the POS
- * @param mca algorithm used to generate confirmations
+ * @param otp_id device ID of the OTP device, or NULL if OTP is not used
  * @param template_contract is the contract of the company
  * @param cb function to call with the backend's result
  * @param cb_cls closure for @a cb
@@ -5216,8 +5780,7 @@ TALER_MERCHANT_template_patch (
   const char *backend_url,
   const char *template_id,
   const char *template_description,
-  const char *pos_key,
-  enum TALER_MerchantConfirmationAlgorithm mca,
+  const char *otp_id,
   json_t *template_contract,
   TALER_MERCHANT_TemplatePatchCallback cb,
   void *cb_cls);