Merge branch 'master' into james-azure-image

1 files changed, 10 insertions, 7 deletions

diff --git a/src/client/Network.ts b/src/client/Network.ts
index d606b9854..39bf69e32 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -5,7 +5,7 @@ import { Upload } from '../server/SharedMediaTypes';
 /**
  * Networking is repsonsible for connecting the client to the server. Networking
  * mainly provides methods that the client can use to begin the process of
- * interacting with the server, such as fetching or uploading files. 
+ * interacting with the server, such as fetching or uploading files.
  */
 export namespace Networking {
     export async function FetchFromServer(relativeRoute: string) {
@@ -25,9 +25,9 @@ export namespace Networking {
     /**
      * FileGuidPair attaches a guid to a file that is being uploaded,
      * allowing the client to track the upload progress.
-     * 
+     *
      * When files are dragged to the canvas, the overWriteDoc's ID is
-     * used as the guid. Otherwise, a new guid is generated. 
+     * used as the guid. Otherwise, a new guid is generated.
      */
     export interface FileGuidPair {
         file: File;
@@ -38,9 +38,10 @@ export namespace Networking {
      * with the mapping of guid to files as parameters.
      *
      * @param fileguidpairs the files and corresponding guids to be uploaded to the server
+     * @param browndash whether the endpoint should be invoked on the browndash server
      * @returns the response as a json from the server
      */
-    export async function UploadFilesToServer<T extends Upload.FileInformation = Upload.FileInformation>(fileguidpairs: FileGuidPair | FileGuidPair[]): Promise<Upload.FileResponse<T>[]> {
+    export async function UploadFilesToServer<T extends Upload.FileInformation = Upload.FileInformation>(fileguidpairs: FileGuidPair | FileGuidPair[], browndash?: boolean): Promise<Upload.FileResponse<T>[]> {
         const formData = new FormData();
         if (Array.isArray(fileguidpairs)) {
             if (!fileguidpairs.length) {
@@ -57,17 +58,19 @@ export namespace Networking {
                     ])
                 );
             }
-            // If the fileguidpair has a guid to use (From the overwriteDoc) use that guid. Otherwise, generate a new guid. 
+            // If the fileguidpair has a guid to use (From the overwriteDoc) use that guid. Otherwise, generate a new guid.
             fileguidpairs.forEach(fileguidpair => formData.append(fileguidpair.guid ?? Utils.GenerateGuid(), fileguidpair.file));
         } else {
-            // Handle the case where fileguidpairs is a single file. 
+            // Handle the case where fileguidpairs is a single file.
             formData.append(fileguidpairs.guid ?? Utils.GenerateGuid(), fileguidpairs.file);
         }
         const parameters = {
             method: 'POST',
             body: formData,
         };
-        const response = await fetch('/uploadFormData', parameters);
+
+        const endpoint = browndash ? '[insert endpoint allowing local => browndash]' : '/uploadFormData';
+        const response = await fetch(endpoint, parameters);
         return response.json();
     }