@unito/integration-sdk 1.8.0 → 1.8.2

package/dist/src/index.cjs

@@ -1061,7 +1061,7 @@ class Integration {
         // Express Server initialization
         const app = express();
         // Parse query strings with https://github.com/ljharb/qs.
-        app.set('query parser', 'extended');
+        app.set('query parser', 'simple');
         app.use(express.json());
         // Must be one of the first handlers (to catch all the errors).
         app.use(onFinish);
@@ -1393,11 +1393,11 @@ class Provider {
                 // When we expect octet-stream, we accept any Content-Type the provider sends us, we just want to stream it
                 body = response.body;
             }
-            else if (headers.Accept === 'application/json') {
+            else if (headers.Accept?.match(/application\/.*json/)) {
                 // Validate that the response content type is at least similar to what we expect
                 // (Provider's response Content-Type might be more specific, e.g. application/json;charset=utf-8)
                 // Default to application/json if no Content-Type header is provided
-                if (responseContentType && !responseContentType.includes('application/json')) {
+                if (responseContentType && !responseContentType.match(/application\/.*json/)) {
                     const textResult = await response.text();
                     throw this.handleError(500, `Unsupported content-type, expected 'application/json' but got '${responseContentType}'.
              Original response (${response.status}): "${textResult}"`, options);
@@ -1413,22 +1413,6 @@ class Provider {
                 // Accept text based content types
                 body = (await response.text());
             }
-            else if (headers.Accept?.includes('application/schema+json')) {
-                try {
-                    body = response.body ? await response.json() : undefined;
-                }
-                catch (err) {
-                    throw this.handleError(500, `Invalid JSON schema response`, options);
-                }
-            }
-            else if (headers.Accept?.includes('application/swagger+json')) {
-                try {
-                    body = response.body ? await response.json() : undefined;
-                }
-                catch (err) {
-                    throw this.handleError(500, `Invalid JSON swagger response`, options);
-                }
-            }
             else {
                 throw this.handleError(500, 'Unsupported Content-Type', options);
             }

package/dist/src/integration.js

@@ -111,7 +111,7 @@ export default class Integration {
         // Express Server initialization
         const app = express();
         // Parse query strings with https://github.com/ljharb/qs.
-        app.set('query parser', 'extended');
+        app.set('query parser', 'simple');
         app.use(express.json());
         // Must be one of the first handlers (to catch all the errors).
         app.use(finishMiddleware);

package/dist/src/resources/provider.js

@@ -286,11 +286,11 @@ export class Provider {
                 // When we expect octet-stream, we accept any Content-Type the provider sends us, we just want to stream it
                 body = response.body;
             }
-            else if (headers.Accept === 'application/json') {
+            else if (headers.Accept?.match(/application\/.*json/)) {
                 // Validate that the response content type is at least similar to what we expect
                 // (Provider's response Content-Type might be more specific, e.g. application/json;charset=utf-8)
                 // Default to application/json if no Content-Type header is provided
-                if (responseContentType && !responseContentType.includes('application/json')) {
+                if (responseContentType && !responseContentType.match(/application\/.*json/)) {
                     const textResult = await response.text();
                     throw this.handleError(500, `Unsupported content-type, expected 'application/json' but got '${responseContentType}'.
              Original response (${response.status}): "${textResult}"`, options);
@@ -306,22 +306,6 @@ export class Provider {
                 // Accept text based content types
                 body = (await response.text());
             }
-            else if (headers.Accept?.includes('application/schema+json')) {
-                try {
-                    body = response.body ? await response.json() : undefined;
-                }
-                catch (err) {
-                    throw this.handleError(500, `Invalid JSON schema response`, options);
-                }
-            }
-            else if (headers.Accept?.includes('application/swagger+json')) {
-                try {
-                    body = response.body ? await response.json() : undefined;
-                }
-                catch (err) {
-                    throw this.handleError(500, `Invalid JSON swagger response`, options);
-                }
-            }
             else {
                 throw this.handleError(500, 'Unsupported Content-Type', options);
             }

package/dist/test/resources/provider.test.js

@@ -137,6 +137,35 @@ describe('Provider', () => {
         ]);
         assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
     });
+    it('should accept application/vnd.oracle.resource+json type response', async (context) => {
+        const response = new Response('{"data": "value"}', {
+            status: 200,
+            headers: { 'Content-Type': 'application/vnd.oracle.resource+json; type=collection; charset=UTF-8' },
+        });
+        const fetchMock = context.mock.method(global, 'fetch', () => Promise.resolve(response));
+        const actualResponse = await provider.get('/endpoint', {
+            credentials: { apiKey: 'apikey#1111' },
+            logger: logger,
+            signal: new AbortController().signal,
+            additionnalheaders: { 'X-Additional-Header': 'value1' },
+        });
+        assert.equal(fetchMock.mock.calls.length, 1);
+        assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+            'www.myApi.com/endpoint',
+            {
+                method: 'GET',
+                body: null,
+                signal: new AbortController().signal,
+                headers: {
+                    Accept: 'application/json',
+                    'X-Custom-Provider-Header': 'value',
+                    'X-Provider-Credential-Header': 'apikey#1111',
+                    'X-Additional-Header': 'value1',
+                },
+            },
+        ]);
+        assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
+    });
     it('should return the raw response body if specified', async (context) => {
         const response = new Response(`IMAGINE A HUGE PAYLOAD`, {
             status: 200,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-sdk",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Integration SDK",
   "type": "module",
   "types": "dist/src/index.d.ts",

package/src/integration.ts

@@ -124,7 +124,7 @@ export default class Integration {
     const app: express.Application = express();
 
     // Parse query strings with https://github.com/ljharb/qs.
-    app.set('query parser', 'extended');
+    app.set('query parser', 'simple');
 
     app.use(express.json());
 

package/src/resources/provider.ts

@@ -402,11 +402,11 @@ export class Provider {
       if (options.rawBody || headers.Accept === 'application/octet-stream') {
         // When we expect octet-stream, we accept any Content-Type the provider sends us, we just want to stream it
         body = response.body as T;
-      } else if (headers.Accept === 'application/json') {
+      } else if (headers.Accept?.match(/application\/.*json/)) {
         // Validate that the response content type is at least similar to what we expect
         // (Provider's response Content-Type might be more specific, e.g. application/json;charset=utf-8)
         // Default to application/json if no Content-Type header is provided
-        if (responseContentType && !responseContentType.includes('application/json')) {
+        if (responseContentType && !responseContentType.match(/application\/.*json/)) {
           const textResult = await response.text();
           throw this.handleError(
             500,
@@ -424,18 +424,6 @@ export class Provider {
       } else if (headers.Accept?.includes('text/html')) {
         // Accept text based content types
         body = (await response.text()) as T;
-      } else if (headers.Accept?.includes('application/schema+json')) {
-        try {
-          body = response.body ? await response.json() : undefined;
-        } catch (err) {
-          throw this.handleError(500, `Invalid JSON schema response`, options);
-        }
-      } else if (headers.Accept?.includes('application/swagger+json')) {
-        try {
-          body = response.body ? await response.json() : undefined;
-        } catch (err) {
-          throw this.handleError(500, `Invalid JSON swagger response`, options);
-        }
       } else {
         throw this.handleError(500, 'Unsupported Content-Type', options);
       }

package/test/resources/provider.test.ts

@@ -164,6 +164,41 @@ describe('Provider', () => {
     assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
   });
 
+  it('should accept application/vnd.oracle.resource+json type response', async context => {
+    const response = new Response('{"data": "value"}', {
+      status: 200,
+      headers: { 'Content-Type': 'application/vnd.oracle.resource+json; type=collection; charset=UTF-8' },
+    });
+
+    const fetchMock = context.mock.method(global, 'fetch', () => Promise.resolve(response));
+
+    const actualResponse = await provider.get('/endpoint', {
+      credentials: { apiKey: 'apikey#1111' },
+      logger: logger,
+      signal: new AbortController().signal,
+      additionnalheaders: { 'X-Additional-Header': 'value1' },
+    });
+
+    assert.equal(fetchMock.mock.calls.length, 1);
+
+    assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+      'www.myApi.com/endpoint',
+      {
+        method: 'GET',
+        body: null,
+        signal: new AbortController().signal,
+        headers: {
+          Accept: 'application/json',
+          'X-Custom-Provider-Header': 'value',
+          'X-Provider-Credential-Header': 'apikey#1111',
+          'X-Additional-Header': 'value1',
+        },
+      },
+    ]);
+
+    assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
+  });
+
   it('should return the raw response body if specified', async context => {
     const response = new Response(`IMAGINE A HUGE PAYLOAD`, {
       status: 200,