remove auth token from PATCH instance

5 files changed, 1 insertions, 33 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 9937750b..8a8cc25b 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -503,7 +503,6 @@ typedef void
  * @param default_max_deposit_fee default maximum deposit fee merchant is willing to pay
  * @param default_wire_transfer_delay default wire transfer delay merchant will ask for
  * @param default_pay_delay default validity period for offers merchant makes
- * @param auth_token authorization token needed to access the instance, can be NULL
  * @param cb function to call with the
  *        backend's instances information
  * @param cb_cls closure for @a config_cb
@@ -595,7 +594,6 @@ TALER_MERCHANT_instance_patch (
   const struct TALER_Amount *default_max_deposit_fee,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
-  const char *auth_token,
   TALER_MERCHANT_InstancePatchCallback cb,
   void *cb_cls);
 
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index 4eafd6fa..2e872406 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -177,7 +177,6 @@ TALER_TESTING_cmd_merchant_post_instances2 (
  * @param default_max_deposit_fee default maximum deposit fee merchant is willing to pay
  * @param default_wire_transfer_delay default wire transfer delay merchant will ask for
  * @param default_pay_delay default validity period for offers merchant makes
- * @param auth_token authorization token needed to access the instance, can be NULL
  * @param http_status expected HTTP response code.
  * @return the command.
  */
@@ -196,7 +195,6 @@ TALER_TESTING_cmd_merchant_patch_instance (
   const char *default_max_deposit_fee,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
-  const char *auth_token,
   unsigned int http_status);
 
 
diff --git a/src/lib/merchant_api_patch_instance.c b/src/lib/merchant_api_patch_instance.c
index 536fbdcf..bd69a8ba 100644
--- a/src/lib/merchant_api_patch_instance.c
+++ b/src/lib/merchant_api_patch_instance.c
@@ -169,7 +169,6 @@ TALER_MERCHANT_instance_patch (
   const struct TALER_Amount *default_max_deposit_fee,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
-  const char *auth_token,
   TALER_MERCHANT_InstancePatchCallback cb,
   void *cb_cls)
 {
@@ -177,19 +176,6 @@ TALER_MERCHANT_instance_patch (
   json_t *jpayto_uris;
   json_t *req_obj;
 
-  if (NULL != auth_token)
-  {
-    if (0 != strncasecmp (RFC_8959_PREFIX,
-                          auth_token,
-                          strlen (RFC_8959_PREFIX)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Authentication token must start with `%s'\n",
-                  RFC_8959_PREFIX);
-      return NULL;
-    }
-    auth_token += strlen (RFC_8959_PREFIX);
-  }
   jpayto_uris = json_array ();
   if (NULL == jpayto_uris)
   {
@@ -207,10 +193,8 @@ TALER_MERCHANT_instance_patch (
       return NULL;
     }
   }
-  req_obj = json_pack ("{s:s?, s:o, s:s, s:O, s:O"
+  req_obj = json_pack ("{s:o, s:s, s:O, s:O"
                        " s:o, s:I: s:o, s:o, s:o}",
-                       "auth_token",
-                       auth_token,
                        "payto_uris",
                        jpayto_uris,
                        "name",
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index b1932cd6..ea1e1258 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -1181,7 +1181,6 @@ run (void *cls,
                                                "USD:0.5",
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_TIME_UNIT_MINUTES,
-                                               NULL,
                                                MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-i1",
                                                merchant_url,
@@ -1200,7 +1199,6 @@ run (void *cls,
                                                "EUR:0.5",
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_TIME_UNIT_MINUTES,
-                                               NULL,
                                                MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_merchant_get_instance2 ("instances-get-i1-2",
                                               merchant_url,
@@ -1229,7 +1227,6 @@ run (void *cls,
       "EUR:0.5",
       GNUNET_TIME_UNIT_MINUTES,
       GNUNET_TIME_UNIT_MINUTES,
-      NULL,
       MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_merchant_get_instance2 ("instances-get-i1-3",
                                               merchant_url,
@@ -1284,7 +1281,6 @@ run (void *cls,
                                                "EUR:0.5",
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_TIME_UNIT_MINUTES,
-                                               RFC_8959_PREFIX "SANDBOX",
                                                MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_merchant_post_instances ("instance-create-i2",
                                                merchant_url,
diff --git a/src/testing/testing_api_cmd_patch_instance.c b/src/testing/testing_api_cmd_patch_instance.c
index 2cbd0e5b..a7a82ef7 100644
--- a/src/testing/testing_api_cmd_patch_instance.c
+++ b/src/testing/testing_api_cmd_patch_instance.c
@@ -80,11 +80,6 @@ struct PatchInstanceState
   json_t *jurisdiction;
 
   /**
-   * Authentication token to require, can be NULL.
-   */
-  const char *auth_token;
-
-  /**
    * Wire fee to use.
    */
   struct TALER_Amount default_max_wire_fee;
@@ -183,7 +178,6 @@ patch_instance_run (void *cls,
                                             &pis->default_max_deposit_fee,
                                             pis->default_wire_transfer_delay,
                                             pis->default_pay_delay,
-                                            pis->auth_token,
                                             &patch_instance_cb,
                                             pis);
   GNUNET_assert (NULL != pis->iph);
@@ -286,7 +280,6 @@ TALER_TESTING_cmd_merchant_patch_instance (
   const char *default_max_deposit_fee,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
-  const char *auth_token,
   unsigned int http_status)
 {
   struct PatchInstanceState *pis;
@@ -313,7 +306,6 @@ TALER_TESTING_cmd_merchant_patch_instance (
                                          &pis->default_max_deposit_fee));
   pis->default_wire_transfer_delay = default_wire_transfer_delay;
   pis->default_pay_delay = default_pay_delay;
-  pis->auth_token = auth_token;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = pis,