@unito/integration-sdk 1.0.7 → 1.0.9

package/dist/src/index.cjs

@@ -919,6 +919,11 @@ class Integration {
         app.use(middleware$5);
         app.use(middleware$4);
         app.use(middleware$6);
+        // Making sure we log all incomming requests, prior to any processing.
+        app.use((req, res, next) => {
+            res.locals.logger.info(`Initializing request for ${req.originalUrl}`);
+            next();
+        });
         // Load handlers as needed.
         if (this.handlers.length) {
             for (const handler of this.handlers) {
@@ -1093,7 +1098,13 @@ class Provider {
     }
     async fetchWrapper(endpoint, body, options) {
         const { url: providerUrl, headers: providerHeaders } = this.prepareRequest(options);
-        let absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+        let absoluteUrl;
+        if (/^https?:\/\//.test(endpoint)) {
+            absoluteUrl = endpoint;
+        }
+        else {
+            absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+        }
         if (options.queryParams) {
             absoluteUrl = `${absoluteUrl}?${new URLSearchParams(options.queryParams)}`;
         }

package/dist/src/integration.js

@@ -120,6 +120,11 @@ export default class Integration {
         app.use(secretsMiddleware);
         app.use(selectsMiddleware);
         app.use(signalMiddleware);
+        // Making sure we log all incomming requests, prior to any processing.
+        app.use((req, res, next) => {
+            res.locals.logger.info(`Initializing request for ${req.originalUrl}`);
+            next();
+        });
         // Load handlers as needed.
         if (this.handlers.length) {
             for (const handler of this.handlers) {

package/dist/src/resources/provider.js

@@ -150,7 +150,13 @@ export class Provider {
     }
     async fetchWrapper(endpoint, body, options) {
         const { url: providerUrl, headers: providerHeaders } = this.prepareRequest(options);
-        let absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+        let absoluteUrl;
+        if (/^https?:\/\//.test(endpoint)) {
+            absoluteUrl = endpoint;
+        }
+        else {
+            absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+        }
         if (options.queryParams) {
             absoluteUrl = `${absoluteUrl}?${new URLSearchParams(options.queryParams)}`;
         }

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

@@ -50,6 +50,33 @@ describe('Provider', () => {
         ]);
         assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
     });
+    it('gets an endpoint which is an absolute url', async (context) => {
+        const response = new Response('{"data": "value"}', {
+            status: 200,
+            headers: { 'Content-Type': 'application/json' },
+        });
+        const fetchMock = context.mock.method(global, 'fetch', () => Promise.resolve(response));
+        const actualResponse = await provider.get('https://my-cdn.my-domain.com/file.png', {
+            credentials: { apiKey: 'apikey#1111' },
+            logger: logger,
+            signal: new AbortController().signal,
+        });
+        assert.equal(fetchMock.mock.calls.length, 1);
+        assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+            'https://my-cdn.my-domain.com/file.png',
+            {
+                method: 'GET',
+                body: null,
+                signal: new AbortController().signal,
+                headers: {
+                    Accept: 'application/json',
+                    'X-Custom-Provider-Header': 'value',
+                    'X-Provider-Credential-Header': 'apikey#1111',
+                },
+            },
+        ]);
+        assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
+    });
     it('post with url encoded body', async (context) => {
         const response = new Response('{"data": "value"}', {
             status: 201,

package/package.json

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

package/src/integration.ts

@@ -137,6 +137,13 @@ export default class Integration {
     app.use(selectsMiddleware);
     app.use(signalMiddleware);
 
+    // Making sure we log all incomming requests, prior to any processing.
+    app.use((req, res, next) => {
+      res.locals.logger.info(`Initializing request for ${req.originalUrl}`);
+
+      next();
+    });
+
     // Load handlers as needed.
     if (this.handlers.length) {
       for (const handler of this.handlers) {

package/src/resources/provider.ts

@@ -224,7 +224,13 @@ export class Provider {
   ): Promise<Response<T>> {
     const { url: providerUrl, headers: providerHeaders } = this.prepareRequest(options);
 
-    let absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+    let absoluteUrl;
+
+    if (/^https?:\/\//.test(endpoint)) {
+      absoluteUrl = endpoint;
+    } else {
+      absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
+    }
 
     if (options.queryParams) {
       absoluteUrl = `${absoluteUrl}?${new URLSearchParams(options.queryParams)}`;

package/test/resources/provider.test.ts

@@ -59,6 +59,37 @@ describe('Provider', () => {
     assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
   });
 
+  it('gets an endpoint which is an absolute url', async context => {
+    const response = new Response('{"data": "value"}', {
+      status: 200,
+      headers: { 'Content-Type': 'application/json' },
+    });
+
+    const fetchMock = context.mock.method(global, 'fetch', () => Promise.resolve(response));
+
+    const actualResponse = await provider.get('https://my-cdn.my-domain.com/file.png', {
+      credentials: { apiKey: 'apikey#1111' },
+      logger: logger,
+      signal: new AbortController().signal,
+    });
+
+    assert.equal(fetchMock.mock.calls.length, 1);
+    assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+      'https://my-cdn.my-domain.com/file.png',
+      {
+        method: 'GET',
+        body: null,
+        signal: new AbortController().signal,
+        headers: {
+          Accept: 'application/json',
+          'X-Custom-Provider-Header': 'value',
+          'X-Provider-Credential-Header': 'apikey#1111',
+        },
+      },
+    ]);
+    assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
+  });
+
   it('post with url encoded body', async context => {
     const response = new Response('{"data": "value"}', {
       status: 201,