From eeea3e62a01638b37c8bb8d6f8fdeac129a4afae Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Tue, 17 Jan 2023 15:58:20 -0300
Subject: stronger type check to be sure that ErrorDetails is consistent

---
 .../src/serviceWorkerHttpLib.ts                       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'packages/taler-wallet-webextension/src/serviceWorkerHttpLib.ts')

diff --git a/packages/taler-wallet-webextension/src/serviceWorkerHttpLib.ts b/packages/taler-wallet-webextension/src/serviceWorkerHttpLib.ts
index 82d11a15a..4b47e89d5 100644
--- a/packages/taler-wallet-webextension/src/serviceWorkerHttpLib.ts
+++ b/packages/taler-wallet-webextension/src/serviceWorkerHttpLib.ts
@@ -104,8 +104,8 @@ export class ServiceWorkerHttpLib implements HttpRequestLibrary {
         status: response.status,
         requestMethod,
         requestUrl,
-        json: makeJsonHandler(response, requestUrl),
-        text: makeTextHandler(response, requestUrl),
+        json: makeJsonHandler(response, requestUrl, requestMethod),
+        text: makeTextHandler(response, requestUrl, requestMethod),
         bytes: async () => (await response.blob()).arrayBuffer(),
       };
     } catch (e) {
@@ -145,7 +145,11 @@ export class ServiceWorkerHttpLib implements HttpRequestLibrary {
   }
 }
 
-function makeTextHandler(response: Response, requestUrl: string) {
+function makeTextHandler(
+  response: Response,
+  requestUrl: string,
+  requestMethod: string,
+) {
   return async function getJsonFromResponse(): Promise<any> {
     let respText;
     try {
@@ -155,6 +159,7 @@ function makeTextHandler(response: Response, requestUrl: string) {
         TalerErrorCode.WALLET_RECEIVED_MALFORMED_RESPONSE,
         {
           requestUrl,
+          requestMethod,
           httpStatusCode: response.status,
         },
         "Invalid JSON from HTTP response",
@@ -164,7 +169,11 @@ function makeTextHandler(response: Response, requestUrl: string) {
   };
 }
 
-function makeJsonHandler(response: Response, requestUrl: string) {
+function makeJsonHandler(
+  response: Response,
+  requestUrl: string,
+  requestMethod: string,
+) {
   return async function getJsonFromResponse(): Promise<any> {
     let responseJson;
     try {
@@ -174,6 +183,7 @@ function makeJsonHandler(response: Response, requestUrl: string) {
         TalerErrorCode.WALLET_RECEIVED_MALFORMED_RESPONSE,
         {
           requestUrl,
+          requestMethod,
           httpStatusCode: response.status,
         },
         "Invalid JSON from HTTP response",
@@ -184,6 +194,7 @@ function makeJsonHandler(response: Response, requestUrl: string) {
         TalerErrorCode.WALLET_RECEIVED_MALFORMED_RESPONSE,
         {
           requestUrl,
+          requestMethod,
           httpStatusCode: response.status,
         },
         "Invalid JSON from HTTP response",
-- 
cgit v1.2.3