@wise/dynamic-flow-client 3.11.2-experimental-7d4fc19 → 3.11.2-experimental-26093dd

package/build/common/makeHttpClient/makeHttpClient.js

@@ -14,21 +14,18 @@ export var makeHttpClient = function (baseUrl, additionalHeaders) {
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     return function (input, init) {
         var resource = applyBaseUrl(input, baseUrl || '');
-        var requestInit = mergeRequestInit(init !== null && init !== void 0 ? init : {}, { headers: additionalHeaders });
-        var requestHeaders = requestInit.headers;
-        return fetch(resource, requestInit).then(function (response) {
-            if (response.status === 415) {
-                // eslint-disable-next-line no-console
-                console.warn("DF request to ".concat(String(resource), " failed with status 415. Request headers: ").concat(stringifyHeadersInit(requestHeaders)));
-            }
-            return response;
-        });
+        return fetch(resource, mergeRequestInit(init !== null && init !== void 0 ? init : {}, { headers: additionalHeaders }));
     };
 };
 var applyBaseUrl = function (input, baseUrl) {
     return typeof input === 'string' && isRelativePath(input) ? baseUrl + input : input;
 };
-export var mergeRequestInit = function (init, additionalInit) { return (__assign(__assign(__assign({}, init), additionalInit), { headers: mergeHeaders(init === null || init === void 0 ? void 0 : init.headers, additionalInit === null || additionalInit === void 0 ? void 0 : additionalInit.headers) })); };
+export var mergeRequestInit = function (init, additionalInit) { return (__assign(__assign(__assign({}, init), additionalInit), { 
+    // initHeaders takes priority over additionalHeaders, so must come last!
+    // DF Core knows what content-type it's requesting (often JSON, sometimes images)
+    // so we should trust the init headers instead of the additionalInit headers from
+    // when the httpClient is created.
+    headers: mergeHeaders(additionalInit === null || additionalInit === void 0 ? void 0 : additionalInit.headers, init === null || init === void 0 ? void 0 : init.headers) })); };
 var mergeHeaders = function () {
     var headersInits = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -36,19 +33,3 @@ var mergeHeaders = function () {
     }
     return headersInits.reduce(function (acc, headers) { return (__assign(__assign({}, acc), Object.fromEntries(new Headers(headers).entries()))); }, {});
 };
-var stringifyHeadersInit = function (headersInit) {
-    if (headersInit === undefined) {
-        return 'undefined';
-    }
-    if (headersInit === null) {
-        return 'null';
-    }
-    if (headersInit instanceof Headers) {
-        var entries = Array.from(headersInit.entries());
-        return "(Headers instance) ".concat(JSON.stringify(entries));
-    }
-    if (Array.isArray(headersInit)) {
-        return "(Array) ".concat(JSON.stringify(headersInit));
-    }
-    return "(Object) ".concat(JSON.stringify(headersInit));
-};

package/build/common/makeHttpClient/makeHttpClient.spec.js

@@ -4,7 +4,7 @@ describe('makeHttpClient', function () {
     var spyFetch;
     beforeEach(function () {
         originalFetch = global.fetch;
-        spyFetch = jest.spyOn(global, 'fetch').mockResolvedValue(new Response());
+        spyFetch = jest.spyOn(global, 'fetch').mockImplementation();
     });
     afterEach(function () {
         global.fetch = originalFetch;
@@ -125,6 +125,32 @@ describe('mergeRequestInit', function () {
             });
         });
     });
+    it('merges the two objects and the headers, prioritising the init headers in case they match', function () {
+        var result = mergeRequestInit({ headers: { 'Content-Type': 'application/json' } }, { headers: { 'Content-Type': 'application/json,application/json' } });
+        expect(result.headers).toMatchObject({
+            'content-type': 'application/json',
+        });
+    });
+    describe('when called with RequestInits with Headers instances', function () {
+        it('merges the two objects and the headers, prioritising the init headers in case they match', function () {
+            var result = mergeRequestInit({ headers: new Headers([['Content-Type', 'application/json']]) }, {
+                headers: new Headers([['Content-Type', 'application/json,application/json']]),
+            });
+            expect(result.headers).toMatchObject({
+                'content-type': 'application/json',
+            });
+        });
+    });
+    describe('when called with RequestInits with Array headers', function () {
+        it('merges the two objects and the headers, prioritising the init headers in case they match', function () {
+            var result = mergeRequestInit({ headers: [['Content-Type', 'application/json']] }, {
+                headers: [['Content-Type', 'application/json,application/json']],
+            });
+            expect(result.headers).toMatchObject({
+                'content-type': 'application/json',
+            });
+        });
+    });
     describe('when called with undefined as a first argument', function () {
         it('returns the second argument and empty headers', function () {
             var result = mergeRequestInit(undefined, { method: 'POST' });

package/build/legacy/dynamicFlow/DynamicFlow.js

@@ -88,7 +88,7 @@ var DynamicFlowComponent = function (_a) {
         var url = action.url, _b = action.method, method = _b === void 0 ? 'POST' : _b;
         return httpClient(url !== null && url !== void 0 ? url : '', {
             method: method,
-            headers: __assign({}, (etag ? { 'If-None-Match': etag } : {})),
+            headers: __assign({ 'Content-Type': 'application/json' }, (etag ? { 'If-None-Match': etag } : {})),
             body: method === 'GET' ? undefined : JSON.stringify(data),
         });
     }, [httpClient]);

package/build/main.js

@@ -312,42 +312,21 @@ var makeHttpClient = (baseUrl, additionalHeaders) => (
   // eslint-disable-next-line @typescript-eslint/promise-function-async
   (input, init) => {
     const resource = applyBaseUrl(input, baseUrl || "");
-    const requestInit = mergeRequestInit(init != null ? init : {}, { headers: additionalHeaders });
-    const requestHeaders = requestInit.headers;
-    return fetch(resource, requestInit).then((response) => {
-      if (response.status === 415) {
-        console.warn(
-          `DF request to ${String(resource)} failed with status 415. Request headers: ${stringifyHeadersInit(requestHeaders)}`
-        );
-      }
-      return response;
-    });
+    return fetch(resource, mergeRequestInit(init != null ? init : {}, { headers: additionalHeaders }));
   }
 );
 var applyBaseUrl = (input, baseUrl) => typeof input === "string" && isRelativePath(input) ? baseUrl + input : input;
 var mergeRequestInit = (init, additionalInit) => __spreadProps(__spreadValues(__spreadValues({}, init), additionalInit), {
-  headers: mergeHeaders(init == null ? void 0 : init.headers, additionalInit == null ? void 0 : additionalInit.headers)
+  // initHeaders takes priority over additionalHeaders, so must come last!
+  // DF Core knows what content-type it's requesting (often JSON, sometimes images)
+  // so we should trust the init headers instead of the additionalInit headers from
+  // when the httpClient is created.
+  headers: mergeHeaders(additionalInit == null ? void 0 : additionalInit.headers, init == null ? void 0 : init.headers)
 });
 var mergeHeaders = (...headersInits) => headersInits.reduce(
   (acc, headers2) => __spreadValues(__spreadValues({}, acc), Object.fromEntries(new Headers(headers2).entries())),
   {}
 );
-var stringifyHeadersInit = (headersInit) => {
-  if (headersInit === void 0) {
-    return "undefined";
-  }
-  if (headersInit === null) {
-    return "null";
-  }
-  if (headersInit instanceof Headers) {
-    const entries = Array.from(headersInit.entries());
-    return `(Headers instance) ${JSON.stringify(entries)}`;
-  }
-  if (Array.isArray(headersInit)) {
-    return `(Array) ${JSON.stringify(headersInit)}`;
-  }
-  return `(Object) ${JSON.stringify(headersInit)}`;
-};
 
 // src/i18n/de.json
 var de_default = {
@@ -19051,7 +19030,9 @@ var DynamicFlowComponent = ({
       const { url, method = "POST" } = action;
       return httpClient(url != null ? url : "", {
         method,
-        headers: __spreadValues({}, etag2 ? { "If-None-Match": etag2 } : {}),
+        headers: __spreadValues({
+          "Content-Type": "application/json"
+        }, etag2 ? { "If-None-Match": etag2 } : {}),
         body: method === "GET" ? void 0 : JSON.stringify(data)
       });
     },