@unito/integration-sdk 2.3.9 → 2.3.11

package/dist/src/handler.js

@@ -137,17 +137,25 @@ export class Handler {
                  * This is why we need to use busboy to parse the form data, extract the information about the file and pass it to the handler.
                  */
                 const bb = busboy({ headers: req.headers });
+                const formFields = {};
+                bb.on('field', (name, value) => {
+                    formFields[name] = value;
+                });
                 bb.on('file', async (_name, file, info) => {
                     try {
+                        const body = {
+                            file: file,
+                            mimeType: info.mimeType,
+                            encoding: info.encoding,
+                            filename: info.filename,
+                        };
+                        if (formFields.fileSize) {
+                            body.fileSize = Number(formFields.fileSize);
+                        }
                         const createdBlob = await handler({
                             credentials: res.locals.credentials,
                             secrets: res.locals.secrets,
-                            body: {
-                                file: file,
-                                mimeType: info.mimeType,
-                                encoding: info.encoding,
-                                filename: info.filename,
-                            },
+                            body,
                             logger: res.locals.logger,
                             signal: res.locals.signal,
                             params: req.params,

package/dist/src/index.cjs

@@ -642,17 +642,25 @@ class Handler {
                  * This is why we need to use busboy to parse the form data, extract the information about the file and pass it to the handler.
                  */
                 const bb = busboy({ headers: req.headers });
+                const formFields = {};
+                bb.on('field', (name, value) => {
+                    formFields[name] = value;
+                });
                 bb.on('file', async (_name, file, info) => {
                     try {
+                        const body = {
+                            file: file,
+                            mimeType: info.mimeType,
+                            encoding: info.encoding,
+                            filename: info.filename,
+                        };
+                        if (formFields.fileSize) {
+                            body.fileSize = Number(formFields.fileSize);
+                        }
                         const createdBlob = await handler({
                             credentials: res.locals.credentials,
                             secrets: res.locals.secrets,
-                            body: {
-                                file: file,
-                                mimeType: info.mimeType,
-                                encoding: info.encoding,
-                                filename: info.filename,
-                            },
+                            body,
                             logger: res.locals.logger,
                             signal: res.locals.signal,
                             params: req.params,
@@ -1471,6 +1479,9 @@ class Provider {
         if (/^https?:\/\//.test(endpoint)) {
             absoluteUrl = endpoint;
         }
+        else if (endpoint === '') {
+            absoluteUrl = providerUrl;
+        }
         else {
             absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
         }

package/dist/src/resources/provider.js

@@ -260,6 +260,9 @@ export class Provider {
         if (/^https?:\/\//.test(endpoint)) {
             absoluteUrl = endpoint;
         }
+        else if (endpoint === '') {
+            absoluteUrl = providerUrl;
+        }
         else {
             absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
         }

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

@@ -212,6 +212,33 @@ describe('Provider', () => {
         ]);
         assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
     });
+    it('gets on provider 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('', {
+            credentials: { apiKey: 'apikey#1111', unitoCredentialId: '123' },
+            logger: logger,
+            signal: new AbortController().signal,
+        });
+        assert.equal(fetchMock.mock.calls.length, 1);
+        assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+            'www.myApi.com',
+            {
+                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": "2.3.9",
+  "version": "2.3.11",
   "description": "Integration SDK",
   "type": "module",
   "types": "dist/src/index.d.ts",

package/src/handler.ts

@@ -352,17 +352,29 @@ export class Handler {
          * This is why we need to use busboy to parse the form data, extract the information about the file and pass it to the handler.
          */
         const bb = busboy({ headers: req.headers });
+        const formFields: Record<string, string> = {};
+
+        bb.on('field', (name, value) => {
+          formFields[name] = value;
+        });
+
         bb.on('file', async (_name, file, info: FileInfo) => {
           try {
+            const body: API.CreateBlobRequestPayload = {
+              file: file,
+              mimeType: info.mimeType,
+              encoding: info.encoding,
+              filename: info.filename,
+            };
+
+            if (formFields.fileSize) {
+              body.fileSize = Number(formFields.fileSize);
+            }
+
             const createdBlob = await handler({
               credentials: res.locals.credentials,
               secrets: res.locals.secrets,
-              body: {
-                file: file,
-                mimeType: info.mimeType,
-                encoding: info.encoding,
-                filename: info.filename,
-              },
+              body,
               logger: res.locals.logger,
               signal: res.locals.signal,
               params: req.params,
@@ -371,17 +383,15 @@ export class Handler {
             res.status(201).send(createdBlob);
           } catch (error) {
             if (error instanceof HttpError) {
-              res.status((error as HttpError).status).send(error);
+              res.status(error.status).send(error);
             } else {
               res.status(500).send({ message: `Error creating the blob: ${error}` });
             }
           }
         });
-
         bb.on('error', error => {
           res.status(500).send({ message: `Error parsing the form data: ${error}` });
         });
-
         req.pipe(bb);
       });
     }

package/src/resources/provider.ts

@@ -362,6 +362,8 @@ export class Provider {
 
     if (/^https?:\/\//.test(endpoint)) {
       absoluteUrl = endpoint;
+    } else if (endpoint === '') {
+      absoluteUrl = providerUrl;
     } else {
       absoluteUrl = [providerUrl, endpoint.charAt(0) === '/' ? endpoint.substring(1) : endpoint].join('/');
     }

package/test/resources/provider.test.ts

@@ -253,6 +253,37 @@ describe('Provider', () => {
     assert.deepEqual(actualResponse, { status: 200, headers: response.headers, body: { data: 'value' } });
   });
 
+  it('gets on provider 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('', {
+      credentials: { apiKey: 'apikey#1111', unitoCredentialId: '123' },
+      logger: logger,
+      signal: new AbortController().signal,
+    });
+
+    assert.equal(fetchMock.mock.calls.length, 1);
+    assert.deepEqual(fetchMock.mock.calls[0]?.arguments, [
+      'www.myApi.com',
+      {
+        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,