Merge branch 'master' into UI_Update_Eric_Ma

1 files changed, 11 insertions, 6 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 117981a7c..e5e15ce99 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -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;
         /**