2 files changed, 15 insertions, 13 deletions
diff --git a/src/server/database.ts b/src/server/database.ts
index 99b13805e..73affdb15 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -32,11 +32,13 @@ export class Database {
         }
     }
 
-    public deleteAll(collectionName: string = 'documents') {
-        if (this.db) {
-            let collection = this.db.collection(collectionName);
-            collection.deleteMany({});
-        }
+    public deleteAll(collectionName: string = 'documents'): Promise<any> {
+        return new Promise(res => {
+            if (this.db) {
+                let collection = this.db.collection(collectionName);
+                collection.deleteMany({}, res);
+            }
+        })
     }
 
     public insert(kvpairs: any) {
diff --git a/src/server/index.ts b/src/server/index.ts
index 16304f1c5..17d7432e0 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -223,13 +223,11 @@ app.use(RouteStore.corsProxy, (req, res) => {
 });
 
 app.get(RouteStore.delete, (req, res) => {
-    deleteFields();
-    res.redirect(RouteStore.home);
+    deleteFields().then(() => res.redirect(RouteStore.home));
 });
 
 app.get(RouteStore.deleteAll, (req, res) => {
-    deleteAll();
-    res.redirect(RouteStore.home);
+    deleteAll().then(() => res.redirect(RouteStore.home));
 });
 
 app.use(wdm(compiler, {
@@ -262,13 +260,15 @@ server.on("connection", function (socket: Socket) {
 })
 
 function deleteFields() {
-    Database.Instance.deleteAll();
+    return Database.Instance.deleteAll();
 }
 
 function deleteAll() {
-    Database.Instance.deleteAll();
-    Database.Instance.deleteAll('sessions');
-    Database.Instance.deleteAll('users');
+    return Database.Instance.deleteAll().then(() => {
+        return Database.Instance.deleteAll('sessions')
+    }).then(() => {
+        return Database.Instance.deleteAll('users')
+    });
 }
 
 function barReceived(guid: String) {