@forge/bridge 2.5.6 → 2.6.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/bridge
 
+## 2.6.0-next.1
+
+### Minor Changes
+
+- cf983b29: Fix for downloading binary data from requestJira/requestConfluence API calls
+
+## 2.6.0-next.0
+
+### Minor Changes
+
+- 139a2cc: Fix support for uploading attachments via product fetch APIs
+
 ## 2.5.6
 
 ### Patch Changes

package/out/fetch/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/fetch/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqB1C,eAAO,MAAM,eAAe,eAAgB,WAAW,oBAAoB,CAAC;kCAuB1C,MAAM,iBAAiB,WAAW,KAAG,QAAQ,QAAQ,CAAC;4BAG5D,MAAM,iBAAiB,WAAW,KAAG,QAAQ,QAAQ,CAAC;CAGjF,CAAC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/fetch/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqD1C,eAAO,MAAM,eAAe,eAAgB,WAAW,oBAAoB,CAAC;kCAyB1C,MAAM,iBAAiB,WAAW,KAAG,QAAQ,QAAQ,CAAC;4BAG5D,MAAM,iBAAiB,WAAW,KAAG,QAAQ,QAAQ,CAAC;CAGjF,CAAC"}

package/out/fetch/fetch.js

@@ -2,28 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.productFetchApi = void 0;
 const tslib_1 = require("tslib");
-const parseBodyAndHeaders = (init) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const req = new Request('', { body: init === null || init === void 0 ? void 0 : init.body, method: init === null || init === void 0 ? void 0 : init.method, headers: init === null || init === void 0 ? void 0 : init.headers });
-    const body = req.method !== 'GET' ? yield req.text() : null;
+const blobParser_1 = require("../utils/blobParser");
+const parseFormData = (form) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const parsed = {};
+    for (const [key, value] of form.entries()) {
+        if (key === 'file') {
+            const fileName = value.name;
+            const fileType = value.type;
+            parsed['file'] = yield (0, blobParser_1.blobToBase64)(value);
+            parsed['__fileName'] = fileName;
+            parsed['__fileType'] = fileType;
+        }
+        else {
+            parsed[key] = value;
+        }
+    }
+    return JSON.stringify(parsed);
+});
+const parseRequest = (init) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const isFormData = (init === null || init === void 0 ? void 0 : init.body) instanceof FormData ? true : false;
+    const requestBody = isFormData ? yield parseFormData(init === null || init === void 0 ? void 0 : init.body) : init === null || init === void 0 ? void 0 : init.body;
+    const req = new Request('', { body: requestBody, method: init === null || init === void 0 ? void 0 : init.method, headers: init === null || init === void 0 ? void 0 : init.headers });
     const headers = Object.fromEntries(req.headers.entries());
+    const body = req.method !== 'GET' ? yield req.text() : null;
     return {
         body,
-        headers: new Headers(headers)
+        headers: new Headers(headers),
+        isMultipartFormData: isFormData
     };
 });
 const productFetchApi = (callBridge) => {
     const fetch = (product, restPath, init) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const { body: requestBody, headers: requestHeaders } = yield parseBodyAndHeaders(init);
+        const { body: requestBody, headers: requestHeaders, isMultipartFormData } = yield parseRequest(init);
         if (!requestHeaders.has('X-Atlassian-Token')) {
             requestHeaders.set('X-Atlassian-Token', 'no-check');
         }
         const fetchPayload = {
             product,
             restPath,
-            fetchRequestInit: Object.assign(Object.assign({}, init), { body: requestBody, headers: [...requestHeaders.entries()] })
+            fetchRequestInit: Object.assign(Object.assign({}, init), { body: requestBody, headers: [...requestHeaders.entries()] }),
+            isMultipartFormData
         };
-        const { body, headers, statusText, status } = yield callBridge('fetchProduct', fetchPayload);
-        return new Response(body || null, { headers, status, statusText });
+        const { body, headers, statusText, status, isAttachment } = yield callBridge('fetchProduct', fetchPayload);
+        const responseBody = isAttachment ? (0, blobParser_1.base64ToBlob)(body, headers['content-type']) : body;
+        return new Response(responseBody || null, { headers, status, statusText });
     });
     return {
         requestConfluence: (restPath, fetchOptions) => fetch('confluence', restPath, fetchOptions),

package/out/types.d.ts

@@ -4,7 +4,11 @@ export declare type InvokePayload = {
 export declare type InvokeResponse = Record<string, any> | void;
 export declare type ProductFetchResponse = {
     body?: string;
-} & Pick<ResponseInit, 'headers' | 'status' | 'statusText'>;
+    headers: {
+        [key: string]: string;
+    };
+    isAttachment?: boolean;
+} & Pick<ResponseInit, 'status' | 'statusText'>;
 export interface FullContext {
     accountId?: string;
     cloudId?: string;

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa,GAAG;KACzB,GAAG,IAAI,MAAM,GAAG,MAAM,GAAG,GAAG;CAC9B,CAAC;AAEF,oBAAY,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AAExD,oBAAY,oBAAoB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC;AAE/G,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,UAAU,aAAa;IACrB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,oBAAY,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa,GAAG;KACzB,GAAG,IAAI,MAAM,GAAG,MAAM,GAAG,GAAG;CAC9B,CAAC;AAEF,oBAAY,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AAExD,oBAAY,oBAAoB,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,YAAY,CAAC,CAAC;AAEhD,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,UAAU,aAAa;IACrB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,oBAAY,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB,CAAC"}

package/out/utils/blobParser.d.ts

@@ -0,0 +1,3 @@
+export declare const base64ToBlob: (b64string: string | undefined, mimeType: string) => Blob | null;
+export declare const blobToBase64: (blob: Blob) => Promise<string>;
+//# sourceMappingURL=blobParser.d.ts.map

package/out/utils/blobParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blobParser.d.ts","sourceRoot":"","sources":["../../src/utils/blobParser.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,cAAe,MAAM,GAAG,SAAS,YAAY,MAAM,KAAG,IAAI,GAAG,IAgBrF,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,IAAI,KAAG,QAAQ,MAAM,CAUvD,CAAC"}

package/out/utils/blobParser.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.blobToBase64 = exports.base64ToBlob = void 0;
+const base64ToBlob = (b64string, mimeType) => {
+    if (!b64string) {
+        return null;
+    }
+    const base64Data = b64string.includes(';base64') ? b64string.split(',')[1] : b64string;
+    const byteCharacters = atob(base64Data);
+    const byteNumbers = new Array(byteCharacters.length);
+    for (let i = 0; i < byteCharacters.length; i++) {
+        byteNumbers[i] = byteCharacters.charCodeAt(i);
+    }
+    const byteArray = new Uint8Array(byteNumbers);
+    return new Blob([byteArray], { type: mimeType });
+};
+exports.base64ToBlob = base64ToBlob;
+const blobToBase64 = (blob) => {
+    return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onloadend = () => {
+            resolve(reader.result);
+        };
+        reader.onerror = reject;
+        reader.readAsDataURL(blob);
+    });
+};
+exports.blobToBase64 = blobToBase64;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bridge",
-  "version": "2.5.6",
+  "version": "2.6.0-next.1",
   "description": "Forge bridge API for custom UI apps",
   "author": "Atlassian",
   "license": "UNLICENSED",