Merge branch 'server_refactor' of https://github.com/browngraphicslab/Dash-Web into server_refactor

1 files changed, 21 insertions, 15 deletions

diff --git a/src/server/ApiManagers/UtilManager.ts b/src/server/ApiManagers/UtilManager.ts
index a3f802b20..61cda2e9b 100644
--- a/src/server/ApiManagers/UtilManager.ts
+++ b/src/server/ApiManagers/UtilManager.ts
@@ -10,13 +10,16 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/pull",
-            onValidation: ({ res }) => {
-                exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', err => {
-                    if (err) {
-                        res.send(err.message);
-                        return;
-                    }
-                    res.redirect("/");
+            onValidation: async ({ res }) => {
+                return new Promise<void>(resolve => {
+                    exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', err => {
+                        if (err) {
+                            res.send(err.message);
+                            return;
+                        }
+                        res.redirect("/");
+                        resolve();
+                    });
                 });
             }
         });
@@ -24,14 +27,14 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/buxton",
-            onValidation: ({ res }) => {
+            onValidation: async ({ res }) => {
                 let cwd = '../scraping/buxton';
 
                 let onResolved = (stdout: string) => { console.log(stdout); res.redirect("/"); };
                 let onRejected = (err: any) => { console.error(err.message); res.send(err); };
                 let tryPython3 = () => command_line('python3 scraper.py', cwd).then(onResolved, onRejected);
 
-                command_line('python scraper.py', cwd).then(onResolved, tryPython3);
+                return command_line('python scraper.py', cwd).then(onResolved, tryPython3);
             },
         });
 
@@ -39,12 +42,15 @@ export default class UtilManager extends ApiManager {
             method: Method.GET,
             subscription: "/version",
             onValidation: ({ res }) => {
-                exec('"C:\\Program Files\\Git\\bin\\git.exe" rev-parse HEAD', (err, stdout) => {
-                    if (err) {
-                        res.send(err.message);
-                        return;
-                    }
-                    res.send(stdout);
+                return new Promise<void>(resolve => {
+                    exec('"C:\\Program Files\\Git\\bin\\git.exe" rev-parse HEAD', (err, stdout) => {
+                        if (err) {
+                            res.send(err.message);
+                            return;
+                        }
+                        res.send(stdout);
+                    });
+                    resolve();
                 });
             }
         });