1 files changed, 11 insertions, 19 deletions

diff --git a/packages/taler-util/src/MerchantApiClient.ts b/packages/taler-util/src/MerchantApiClient.ts
index fa9a00176..f58757fb5 100644
--- a/packages/taler-util/src/MerchantApiClient.ts
+++ b/packages/taler-util/src/MerchantApiClient.ts
@@ -19,24 +19,19 @@ import {
   TalerMerchantApi,
   codecForMerchantConfig,
   codecForMerchantOrderPrivateStatusResponse,
+  codecForPostOrderResponse,
 } from "./http-client/types.js";
 import { HttpStatusCode } from "./http-status-codes.js";
 import {
   createPlatformHttpLib,
   expectSuccessResponseOrThrow,
   readSuccessResponseJsonOrThrow,
+  readTalerErrorResponse,
 } from "./http.js";
 import { FacadeCredentials } from "./libeufin-api-types.js";
 import { LibtoolVersion } from "./libtool-version.js";
 import { Logger } from "./logging.js";
 import {
-  MerchantInstancesResponse,
-  MerchantPostOrderRequest,
-  MerchantPostOrderResponse,
-  MerchantTemplateAddDetails,
-  codecForMerchantPostOrderResponse,
-} from "./merchant-api-types.js";
-import {
   FailCasesByMethod,
   OperationFail,
   OperationOk,
@@ -205,7 +200,7 @@ export class MerchantApiClient {
     });
   }
 
-  async getInstances(): Promise<MerchantInstancesResponse> {
+  async getInstances(): Promise<TalerMerchantApi.InstancesResponse> {
     const url = new URL("management/instances", this.baseUrl);
     const resp = await this.httpClient.fetch(url.href, {
       headers: this.makeAuthHeader(),
@@ -226,18 +221,15 @@ export class MerchantApiClient {
   }
 
   async createOrder(
-    req: MerchantPostOrderRequest,
-  ): Promise<MerchantPostOrderResponse> {
+    req: TalerMerchantApi.PostOrderRequest,
+  ): Promise<TalerMerchantApi.PostOrderResponse> {
     let url = new URL("private/orders", this.baseUrl);
     const resp = await this.httpClient.fetch(url.href, {
       method: "POST",
       body: req,
       headers: this.makeAuthHeader(),
     });
-    return readSuccessResponseJsonOrThrow(
-      resp,
-      codecForMerchantPostOrderResponse(),
-    );
+    return readSuccessResponseJsonOrThrow(resp, codecForPostOrderResponse());
   }
 
   async deleteOrder(req: { orderId: string; force?: boolean }): Promise<void> {
@@ -291,7 +283,7 @@ export class MerchantApiClient {
     };
   }
 
-  async createTemplate(req: MerchantTemplateAddDetails) {
+  async createTemplate(req: TalerMerchantApi.MerchantTemplateAddDetails) {
     let url = new URL("private/templates", this.baseUrl);
     const resp = await this.httpClient.fetch(url.href, {
       method: "POST",
@@ -305,7 +297,7 @@ export class MerchantApiClient {
       case HttpStatusCode.NotFound:
         return opKnownHttpFailure(resp.status, resp);
       default:
-        return opUnknownFailure(resp, await resp.text());
+        return opUnknownFailure(resp, await readTalerErrorResponse(resp));
     }
   }
 
@@ -321,7 +313,7 @@ export class MerchantApiClient {
       case HttpStatusCode.NotFound:
         return opKnownHttpFailure(resp.status, resp);
       default:
-        return opUnknownFailure(resp, await resp.text());
+        return opUnknownFailure(resp, await readTalerErrorResponse(resp));
     }
   }
 
@@ -342,7 +334,7 @@ export class MerchantApiClient {
       case HttpStatusCode.Ok:
         return opSuccessFromHttp(resp, codecForMerchantConfig());
       default:
-        return opUnknownFailure(resp, await resp.text());
+        return opUnknownFailure(resp, await readTalerErrorResponse(resp));
     }
   }
 
@@ -362,7 +354,7 @@ export class MerchantApiClient {
       case HttpStatusCode.NotFound:
         return opKnownHttpFailure(resp.status, resp);
       default:
-        return opUnknownFailure(resp, await resp.text());
+        return opUnknownFailure(resp, await readTalerErrorResponse(resp));
     }
   }