fix: Fix upload in browser (box/box-codegen#524) (#248)

Co-authored-by: box-sdk-build <[email protected]>

Author: box-sdk-build

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "89557a9", "specHash": "e95d6fa", "version": "1.1.0" }
+{ "engineHash": "8ad81db", "specHash": "e95d6fa", "version": "1.1.0" }

src/box/index.ts

@@ -1,4 +1,4 @@
 export { BoxCcgAuth, CcgConfig } from './ccgAuth.generated';
 export { BoxDeveloperTokenAuth } from './developerTokenAuth.generated';
 export { BoxJwtAuth, JwtConfig } from './jwtAuth.generated';
-export { BoxOAuth } from './oauth.generated';
+export { BoxOAuth, OAuthConfig } from './oauth.generated';

src/networking/fetch.ts

@@ -7,6 +7,7 @@ import {
   CancellationToken,
   generateByteStreamFromBuffer,
   isBrowser,
+  readByteStream,
 } from '../internal/utils';
 import { sdkVersion } from './version';
 import {
@@ -124,7 +125,7 @@ async function createRequestInit(options: FetchOptions): Promise<RequestInit> {
   } = options;
 
   const { contentType, body } = await (async (): Promise<{
-    contentType: string;
+    contentType: string | undefined;
     body: Readable | string;
   }> => {
     if (options.multipartData) {
@@ -134,9 +135,10 @@ async function createRequestInit(options: FetchOptions): Promise<RequestInit> {
       const formData = new FormData();
       for (const item of options.multipartData) {
         if (item.fileStream) {
-          const buffer = await readStream(item.fileStream);
+          const buffer = await readByteStream(item.fileStream);
+          const blob = isBrowser() ? new Blob([buffer]) : buffer;
           headers['content-md5'] = await calculateMD5Hash(buffer);
-          formData.append(item.partName, buffer, {
+          formData.append(item.partName, blob, {
             filename: item.fileName ?? 'file',
             contentType: item.contentType ?? 'application/octet-stream',
           });
@@ -150,7 +152,9 @@ async function createRequestInit(options: FetchOptions): Promise<RequestInit> {
       }
 
       return {
-        contentType: `multipart/form-data; boundary=${formData.getBoundary()}`,
+        contentType: !isBrowser()
+          ? `multipart/form-data; boundary=${formData.getBoundary()}`
+          : undefined,
         body: formData,
       };
     }
@@ -183,8 +187,7 @@ async function createRequestInit(options: FetchOptions): Promise<RequestInit> {
   return {
     method,
     headers: {
-      ...options.networkSession?.additionalHeaders,
-      'Content-Type': contentType,
+      ...(contentType && { 'Content-Type': contentType }),
       ...headers,
       ...(options.auth && {
         Authorization: await options.auth.retrieveAuthorizationHeader(
@@ -193,6 +196,8 @@ async function createRequestInit(options: FetchOptions): Promise<RequestInit> {
       }),
       'User-Agent': userAgentHeader,
       'X-Box-UA': xBoxUaHeader,
+      // Additional headers will override the default headers
+      ...options.networkSession?.additionalHeaders,
     },
     body,
     signal: options.cancellationToken as RequestInit['signal'],
@@ -361,17 +366,6 @@ async function calculateMD5Hash(data: string | Buffer): Promise<string> {
   return createHash('sha1').update(data).digest('hex');
 }
 
-async function readStream(fileStream: Readable): Promise<Buffer> {
-  return new Promise((resolve, reject) => {
-    const chunks: any[] = [];
-    fileStream.on('data', (chunk: Buffer) => chunks.push(chunk));
-    fileStream.on('end', () => {
-      resolve(Buffer.concat(chunks));
-    });
-    fileStream.on('error', (err: Error) => reject(err));
-  });
-}
-
 function constructBoxUAHeader() {
   const analyticsIdentifiers = {
     agent: `box-javascript-generated-sdk/${sdkVersion}`,