merge with master

1 files changed, 29 insertions, 58 deletions

diff --git a/src/server/ApiManagers/DeleteManager.ts b/src/server/ApiManagers/DeleteManager.ts
index 9e70af2eb..7fbb37658 100644
--- a/src/server/ApiManagers/DeleteManager.ts
+++ b/src/server/ApiManagers/DeleteManager.ts
@@ -1,12 +1,12 @@
 import ApiManager, { Registration } from "./ApiManager";
-import { Method, _permission_denied, PublicHandler } from "../RouteManager";
-import { WebSocket } from "../Websocket/Websocket";
+import { Method, _permission_denied } from "../RouteManager";
+import { WebSocket } from "../websocket";
 import { Database } from "../database";
 import rimraf = require("rimraf");
-import { pathToDirectory, Directory } from "./UploadManager";
 import { filesDirectory } from "..";
 import { DashUploadUtils } from "../DashUploadUtils";
 import { mkdirSync } from "fs";
+import RouteSubscriber from "../RouteSubscriber";
 
 export default class DeleteManager extends ApiManager {
 
@@ -14,68 +14,39 @@ export default class DeleteManager extends ApiManager {
 
         register({
             method: Method.GET,
-            subscription: "/delete",
-            secureHandler: async ({ res, isRelease }) => {
+            subscription: new RouteSubscriber("delete").add("target?"),
+            secureHandler: async ({ req, res, isRelease }) => {
                 if (isRelease) {
-                    return _permission_denied(res, deletionPermissionError);
+                    return _permission_denied(res, "Cannot perform a delete operation outside of the development environment!");
                 }
-                await WebSocket.deleteFields();
-                res.redirect("/home");
-            }
-        });
 
-        register({
-            method: Method.GET,
-            subscription: "/deleteAll",
-            secureHandler: async ({ res, isRelease }) => {
-                if (isRelease) {
-                    return _permission_denied(res, deletionPermissionError);
+                const { target } = req.params;
+                const { doDelete } = WebSocket;
+
+                if (!target) {
+                    await doDelete();
+                } else {
+                    let all = false;
+                    switch (target) {
+                        case "all":
+                            all = true;
+                        case "database":
+                            await doDelete(false);
+                            if (!all) break;
+                        case "files":
+                            rimraf.sync(filesDirectory);
+                            mkdirSync(filesDirectory);
+                            await DashUploadUtils.buildFileDirectories();
+                            break;
+                        default:
+                            await Database.Instance.dropSchema(target);
+                    }
                 }
-                await WebSocket.deleteAll();
-                res.redirect("/home");
-            }
-        });
 
-        register({
-            method: Method.GET,
-            subscription: "/deleteAssets",
-            secureHandler: async ({ res, isRelease }) => {
-                if (isRelease) {
-                    return _permission_denied(res, deletionPermissionError);
-                }
-                rimraf.sync(filesDirectory);
-                mkdirSync(filesDirectory);
-                await DashUploadUtils.buildFileDirectories();
-                res.redirect("/delete");
-            }
-        });
-
-        register({
-            method: Method.GET,
-            subscription: "/deleteWithAux",
-            secureHandler: async ({ res, isRelease }) => {
-                if (isRelease) {
-                    return _permission_denied(res, deletionPermissionError);
-                }
-                await Database.Auxiliary.DeleteAll();
-                res.redirect("/delete");
-            }
-        });
-
-        register({
-            method: Method.GET,
-            subscription: "/deleteWithGoogleCredentials",
-            secureHandler: async ({ res, isRelease }) => {
-                if (isRelease) {
-                    return _permission_denied(res, deletionPermissionError);
-                }
-                await Database.Auxiliary.GoogleAuthenticationToken.DeleteAll();
-                res.redirect("/delete");
+                res.redirect("/home");
             }
         });
 
     }
 
-}
-
-const deletionPermissionError = "Cannot perform a delete operation outside of the development environment!";
+}
\ No newline at end of file