Merge branch 'master' into secondpropertiesmenu-emily

1 files changed, 12 insertions, 7 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 337bb812f..e5e15ce99 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -99,7 +99,7 @@ export namespace DashUploadUtils {
             merge
                 .input(textFilePath)
                 .inputOptions(['-f concat', '-safe 0'])
-                .outputOptions('-c copy')
+                // .outputOptions('-c copy')
                 //.videoCodec("copy")
                 .save(outputFilePath)
                 .on('error', (err: any) => {
@@ -383,13 +383,18 @@ export namespace DashUploadUtils {
         if ((rawMatches = /^data:image\/([a-z]+);base64,(.*)/.exec(source)) !== null) {
             const [ext, data] = rawMatches.slice(1, 3);
             const resolved = (filename = `upload_${Utils.GenerateGuid()}.${ext}`);
-            const error = await new Promise<Error | null>(resolve => {
-                writeFile(serverPathToFile(Directory.images, resolved), data, 'base64', resolve);
-            });
-            if (error !== null) {
-                return error;
+            if (usingAzure()) {
+                const response = await AzureManager.UploadBase64ImageBlob(resolved, data);
+                source =  `${AzureManager.BASE_STRING}/${resolved}`;
+            } else {
+                const error = await new Promise<Error | null>(resolve => {
+                    writeFile(serverPathToFile(Directory.images, resolved), data, 'base64', resolve);
+                });
+                if (error !== null) {
+                    return error;
+                }
+                source = `${resolvedServerUrl}${clientPathToFile(Directory.images, resolved)}`;
             }
-            source = `${resolvedServerUrl}${clientPathToFile(Directory.images, resolved)}`;
         }
         let resolvedUrl: string;
         /**